diff --git a/Assets/Game/Prefabs/Core/BallCameraHost.prefab b/Assets/Game/Prefabs/Core/BallCameraHost.prefab index 4427f645..214f2985 100644 --- a/Assets/Game/Prefabs/Core/BallCameraHost.prefab +++ b/Assets/Game/Prefabs/Core/BallCameraHost.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.7019978, y: 25.36515, z: 0.9452644} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7268144508564371184} m_RootOrder: 1 @@ -106,15 +107,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7268144508564371185} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.08045985, z: 0, w: 0.99675786} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7268144510246012001} - {fileID: 4411409349751524585} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -9.23, z: 0} --- !u!114 &6010533765124808931 MonoBehaviour: m_ObjectHideFlags: 0 @@ -164,6 +166,7 @@ Transform: m_LocalRotation: {x: 0.30614272, y: -0.63739836, z: 0.30614272, w: 0.63739836} m_LocalPosition: {x: 22, y: 35, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7268144508564371184} m_RootOrder: 0 diff --git a/Assets/Game/Prefabs/Core/BallManager.prefab b/Assets/Game/Prefabs/Core/BallManager.prefab index 54bae890..eb7fd06f 100644 --- a/Assets/Game/Prefabs/Core/BallManager.prefab +++ b/Assets/Game/Prefabs/Core/BallManager.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 7535936831251616713} - component: {fileID: 7959914609618781773} - component: {fileID: 4260214080853077572} - - component: {fileID: 9043713421500448424} - - component: {fileID: 2793028411480287867} m_Layer: 0 m_Name: Ball_Paper_piece14 m_TagString: Untagged @@ -85,163 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9043713421500448424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111057497618915963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -5556432626603105353, guid: 8023a9d32ec27904ab35311950bb4d54, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2793028411480287867 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111057497618915963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.08 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &219679653008563965 GameObject: m_ObjectHideFlags: 0 @@ -253,8 +94,6 @@ GameObject: - component: {fileID: 1303716345710816972} - component: {fileID: 514533200109954277} - component: {fileID: 2986924686334007696} - - component: {fileID: 3887412292191746911} - - component: {fileID: 3905256403572995020} m_Layer: 0 m_Name: Ball_Wood_piece10 m_TagString: Untagged @@ -327,163 +166,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3887412292191746911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219679653008563965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6830611582895501885, guid: 73a7270d4810a034595dd33e7ae6e3a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3905256403572995020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219679653008563965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &326655268505304375 GameObject: m_ObjectHideFlags: 0 @@ -495,8 +177,6 @@ GameObject: - component: {fileID: 6514622199557453686} - component: {fileID: 2617010731720771753} - component: {fileID: 8462449217177723342} - - component: {fileID: 7138117915534640315} - - component: {fileID: 1560098597822718936} m_Layer: 0 m_Name: Ball_Paper_piece06 m_TagString: Untagged @@ -569,163 +249,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7138117915534640315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326655268505304375} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7188613470725210680, guid: 7bf878bd74162404097ad2288997ca69, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1560098597822718936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326655268505304375} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.08 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &374080751309605317 GameObject: m_ObjectHideFlags: 0 @@ -877,8 +400,6 @@ GameObject: - component: {fileID: 2181694362207157128} - component: {fileID: 7257548751690224666} - component: {fileID: 4983490145933939886} - - component: {fileID: 1325386236060531983} - - component: {fileID: 2131619569356913708} m_Layer: 0 m_Name: Ball_Stone_piece11 m_TagString: Untagged @@ -951,163 +472,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1325386236060531983 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 520578985895899807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4084994576177616166, guid: b68c90f77bd301d409c9577511b319a8, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2131619569356913708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 520578985895899807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &662649410594567003 GameObject: m_ObjectHideFlags: 0 @@ -1119,8 +483,6 @@ GameObject: - component: {fileID: 9039201874168961235} - component: {fileID: 3992574574787344530} - component: {fileID: 8173875323880865630} - - component: {fileID: 242034776131088110} - - component: {fileID: 3193592808031821984} m_Layer: 0 m_Name: Ball_Stone_piece04 m_TagString: Untagged @@ -1193,163 +555,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &242034776131088110 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 662649410594567003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 721485066968256853, guid: 9bdf065a01c18dc4193f293cf7487ddb, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3193592808031821984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 662649410594567003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &894153905963175777 GameObject: m_ObjectHideFlags: 0 @@ -1361,8 +566,6 @@ GameObject: - component: {fileID: 2661580242064709743} - component: {fileID: 5883750990244824117} - component: {fileID: 3721637439316803779} - - component: {fileID: 8504474122884858464} - - component: {fileID: 2434749818460645243} m_Layer: 0 m_Name: Ball_Stone_piece16 m_TagString: Untagged @@ -1435,163 +638,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8504474122884858464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 894153905963175777} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3837535005703273732, guid: 6e62d811274e29d40bf8495c14ab4c91, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2434749818460645243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 894153905963175777} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &933083797712109975 GameObject: m_ObjectHideFlags: 0 @@ -1603,8 +649,6 @@ GameObject: - component: {fileID: 6030897056315158826} - component: {fileID: 1955056425280059295} - component: {fileID: 8199725921768640180} - - component: {fileID: 7583622902600518215} - - component: {fileID: 5161980991419931369} m_Layer: 0 m_Name: Ball_Stone_piece02 m_TagString: Untagged @@ -1677,163 +721,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7583622902600518215 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 933083797712109975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6388047723426572682, guid: 3b34e97aa3d12e4458e67bef9b8d9b1c, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5161980991419931369 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 933083797712109975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &1125576233219688934 GameObject: m_ObjectHideFlags: 0 @@ -1902,8 +789,6 @@ GameObject: - component: {fileID: 1578484027752962003} - component: {fileID: 895301204087423795} - component: {fileID: 816006209661147449} - - component: {fileID: 5256431246074002480} - - component: {fileID: 6226369843752248838} m_Layer: 0 m_Name: Ball_Stone_piece13 m_TagString: Untagged @@ -1976,163 +861,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5256431246074002480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1312273526173642542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3198755849122229665, guid: 6118b07db40c6d94eaac3a32359807fc, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6226369843752248838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1312273526173642542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &1585231846016420582 GameObject: m_ObjectHideFlags: 0 @@ -2144,8 +872,6 @@ GameObject: - component: {fileID: 4000053658737886300} - component: {fileID: 6751602281327718261} - component: {fileID: 3469858124116084419} - - component: {fileID: 6460150483591192364} - - component: {fileID: 6106885281741343518} m_Layer: 0 m_Name: Ball_Wood_piece15 m_TagString: Untagged @@ -2218,163 +944,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6460150483591192364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1585231846016420582} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3778930868562878322, guid: 2b5c34a36258bfe4c822ca0b9b384c83, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6106885281741343518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1585231846016420582} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &1679991316622375360 GameObject: m_ObjectHideFlags: 0 @@ -2386,8 +955,6 @@ GameObject: - component: {fileID: 8469216782252632703} - component: {fileID: 4435614312143613554} - component: {fileID: 2141265807842990512} - - component: {fileID: 9008438074998940811} - - component: {fileID: 3515807552671032010} m_Layer: 0 m_Name: Ball_Wood_piece05 m_TagString: Untagged @@ -2460,163 +1027,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9008438074998940811 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679991316622375360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3086256861349407952, guid: 2ae6f1213b1dd6744a077407e15e4508, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3515807552671032010 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679991316622375360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &2300100167275902307 GameObject: m_ObjectHideFlags: 0 @@ -2628,8 +1038,6 @@ GameObject: - component: {fileID: 5417058418439110641} - component: {fileID: 5668802350476244841} - component: {fileID: 6570698876212884288} - - component: {fileID: 831594255969790129} - - component: {fileID: 3870317417756946107} m_Layer: 0 m_Name: Ball_Paper_piece12 m_TagString: Untagged @@ -2702,163 +1110,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &831594255969790129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2300100167275902307} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -9128403161289413849, guid: 1a658632ac3b7c549bce7c86343017af, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3870317417756946107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2300100167275902307} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.05 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 5 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &2551379028935815756 GameObject: m_ObjectHideFlags: 0 @@ -3289,8 +1540,6 @@ GameObject: - component: {fileID: 6610367083228202417} - component: {fileID: 2071976352915043185} - component: {fileID: 859162149891098961} - - component: {fileID: 7148908209118547605} - - component: {fileID: 7207870973247083613} m_Layer: 0 m_Name: Ball_Paper_piece16 m_TagString: Untagged @@ -3363,163 +1612,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7148908209118547605 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2759393009996085555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6472911843762810053, guid: a0219d2eae5772c459bf9dcda976f15f, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7207870973247083613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2759393009996085555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.07 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &2955111604560649750 GameObject: m_ObjectHideFlags: 0 @@ -3531,8 +1623,6 @@ GameObject: - component: {fileID: 2096320901235577042} - component: {fileID: 7917557614727000968} - component: {fileID: 4734683019823458379} - - component: {fileID: 424170771860109601} - - component: {fileID: 5060579556556565020} m_Layer: 0 m_Name: Ball_Stone_piece14 m_TagString: Untagged @@ -3605,165 +1695,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &424170771860109601 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2955111604560649750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8647287029377712854, guid: 48a6fc7e06c488547a5045d1679d8ad5, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5060579556556565020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2955111604560649750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &3127170422580914422 -GameObject: +--- !u!1 &3127170422580914422 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3773,8 +1706,6 @@ GameObject: - component: {fileID: 6162155965761588306} - component: {fileID: 8116404057600482480} - component: {fileID: 6775304145482329931} - - component: {fileID: 1657283756506396139} - - component: {fileID: 6165716750426594464} m_Layer: 0 m_Name: Ball_Paper_piece03 m_TagString: Untagged @@ -3847,163 +1778,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1657283756506396139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127170422580914422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -1133215689435445413, guid: 8b69ed2005b018541b9d083ea2954e43, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6165716750426594464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127170422580914422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.09 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3254018778215878806 GameObject: m_ObjectHideFlags: 0 @@ -4015,8 +1789,6 @@ GameObject: - component: {fileID: 5828622372712489921} - component: {fileID: 2992873708976301554} - component: {fileID: 7051148194541181758} - - component: {fileID: 7384843150046454928} - - component: {fileID: 8836317289840257885} m_Layer: 0 m_Name: Ball_Stone_piece17 m_TagString: Untagged @@ -4089,163 +1861,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7384843150046454928 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3254018778215878806} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -721877850667342451, guid: 768ce5a76df8c6f458f66334c74f6814, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8836317289840257885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3254018778215878806} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3342494631535360456 GameObject: m_ObjectHideFlags: 0 @@ -4257,8 +1872,6 @@ GameObject: - component: {fileID: 2535096045548407530} - component: {fileID: 26263784673204615} - component: {fileID: 2973395481447487595} - - component: {fileID: 512157869527809334} - - component: {fileID: 3434312867753558337} m_Layer: 0 m_Name: Ball_Wood_piece14 m_TagString: Untagged @@ -4331,163 +1944,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &512157869527809334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3342494631535360456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 2279808389334901857, guid: 0aa7a4473bceb5b4b82a686972377bbe, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3434312867753558337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3342494631535360456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3344784212308367392 GameObject: m_ObjectHideFlags: 0 @@ -4499,8 +1955,6 @@ GameObject: - component: {fileID: 8254046598219479532} - component: {fileID: 3022017599137661769} - component: {fileID: 1497621208071041304} - - component: {fileID: 1941720730333093211} - - component: {fileID: 2922585271912490871} - component: {fileID: 8475929799163367446} m_Layer: 0 m_Name: BallStone @@ -4574,163 +2028,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1941720730333093211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3344784212308367392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 1 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7112101587907866965, guid: 13c9d25f4b6f65e4b8698268fc8ca704, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 2 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2922585271912490871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3344784212308367392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 1 - m_CollidableQualityType: -1 - m_Mass: 18 - m_LinearDamping: 0.5 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.3 - m_Restitution: 0.1 - m_Layer: 1 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!114 &8475929799163367446 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5187,8 +2484,6 @@ GameObject: - component: {fileID: 213346501720224207} - component: {fileID: 8781710279751264992} - component: {fileID: 4144923296456171508} - - component: {fileID: 109729336391489334} - - component: {fileID: 3309894174782951301} m_Layer: 0 m_Name: Ball_Paper_piece11 m_TagString: Untagged @@ -5261,163 +2556,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &109729336391489334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3504439898332747722} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8279556039434216623, guid: 31518f311b598bf4fbec6154759ac767, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3309894174782951301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3504439898332747722} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.07 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 3 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3619143744023889358 GameObject: m_ObjectHideFlags: 0 @@ -5429,8 +2567,6 @@ GameObject: - component: {fileID: 2122838603427092513} - component: {fileID: 3474272786375424912} - component: {fileID: 57398539084827526} - - component: {fileID: 1581662279989146707} - - component: {fileID: 4047180009529094269} m_Layer: 0 m_Name: Ball_Paper_piece02 m_TagString: Untagged @@ -5503,163 +2639,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1581662279989146707 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3619143744023889358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 865974375164283520, guid: e560ec7e710572d489427fe58fbbec7e, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4047180009529094269 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3619143744023889358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.08 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3791580992569633773 GameObject: m_ObjectHideFlags: 0 @@ -5671,8 +2650,6 @@ GameObject: - component: {fileID: 5143775812793331688} - component: {fileID: 3885323560855404955} - component: {fileID: 3215292699347428596} - - component: {fileID: 3276478635769595117} - - component: {fileID: 5393492988340396847} m_Layer: 0 m_Name: Ball_Wood_piece06 m_TagString: Untagged @@ -5745,163 +2722,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3276478635769595117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3791580992569633773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -6657215477636198830, guid: ce2ad0aac30f9754c8e367c5b8be8f1a, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5393492988340396847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3791580992569633773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &3877958309039161025 GameObject: m_ObjectHideFlags: 0 @@ -5913,8 +2733,6 @@ GameObject: - component: {fileID: 4184823208481102573} - component: {fileID: 2762493403880482341} - component: {fileID: 9007042139262821756} - - component: {fileID: 4578484443573364128} - - component: {fileID: 493503498114718812} m_Layer: 0 m_Name: Ball_Paper_piece18 m_TagString: Untagged @@ -5987,163 +2805,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4578484443573364128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3877958309039161025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7784190868918901489, guid: f20d0fa9d7d742b438c020d3f1319b0c, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &493503498114718812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3877958309039161025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.08 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 4 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &4084024825177340269 GameObject: m_ObjectHideFlags: 0 @@ -6155,8 +2816,6 @@ GameObject: - component: {fileID: 4477099383824024427} - component: {fileID: 2175956257023930884} - component: {fileID: 818198892225898413} - - component: {fileID: 7793279252917796542} - - component: {fileID: 1509641079045105534} m_Layer: 0 m_Name: Ball_Stone_piece12 m_TagString: Untagged @@ -6229,163 +2888,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7793279252917796542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4084024825177340269} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3969967805968435226, guid: e756a9030ed85164d92491e14297ce79, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1509641079045105534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4084024825177340269} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &4329624348821282866 GameObject: m_ObjectHideFlags: 0 @@ -6397,8 +2899,6 @@ GameObject: - component: {fileID: 5362827582360918553} - component: {fileID: 128293487500904141} - component: {fileID: 1505433829962309841} - - component: {fileID: 6954719007221436806} - - component: {fileID: 927307123585319198} m_Layer: 0 m_Name: Ball_Wood_piece03 m_TagString: Untagged @@ -6471,163 +2971,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6954719007221436806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4329624348821282866} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8128276286396082021, guid: b7a87d5c61ce9f2498f4f94cbe3b897f, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &927307123585319198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4329624348821282866} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &4793876697556535989 GameObject: m_ObjectHideFlags: 0 @@ -7896,8 +4239,6 @@ GameObject: - component: {fileID: 3506930835434482284} - component: {fileID: 2188642884894666487} - component: {fileID: 1758240438742371604} - - component: {fileID: 5600233212348094377} - - component: {fileID: 6373060953848240316} m_Layer: 0 m_Name: Ball_Paper_piece05 m_TagString: Untagged @@ -7970,163 +4311,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5600233212348094377 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5282404375474170881} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7812086533289933107, guid: f7e1b1ca29bb9644580ad089a7dffa17, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6373060953848240316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5282404375474170881} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.06 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &5308330109732515694 GameObject: m_ObjectHideFlags: 0 @@ -8138,8 +4322,6 @@ GameObject: - component: {fileID: 771878864925962329} - component: {fileID: 4517089489467484941} - component: {fileID: 4641736573873451080} - - component: {fileID: 1068083550135831474} - - component: {fileID: 6662090999023468466} m_Layer: 0 m_Name: Ball_Stone_piece08 m_TagString: Untagged @@ -8212,165 +4394,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1068083550135831474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5308330109732515694} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3990990715021982765, guid: 67c83ae94cda61344857b73f46155a37, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6662090999023468466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5308330109732515694} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &5471120648298291357 -GameObject: +--- !u!1 &5471120648298291357 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8380,8 +4405,6 @@ GameObject: - component: {fileID: 6105974533745673394} - component: {fileID: 1584978255881763652} - component: {fileID: 4499604707149003992} - - component: {fileID: 6014505791880361848} - - component: {fileID: 7719699552793834419} m_Layer: 0 m_Name: Ball_Stone_piece05 m_TagString: Untagged @@ -8454,163 +4477,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6014505791880361848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5471120648298291357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -5026445629794398206, guid: 47d0d7c67d82bc7489bf8e5d7a05287b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7719699552793834419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5471120648298291357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &5652028914571371105 GameObject: m_ObjectHideFlags: 0 @@ -8622,8 +4488,6 @@ GameObject: - component: {fileID: 2791293062199633405} - component: {fileID: 3392112926062099837} - component: {fileID: 3809149502974832201} - - component: {fileID: 5974194168320823784} - - component: {fileID: 2974981094095411672} m_Layer: 0 m_Name: Ball_Stone_piece01 m_TagString: Untagged @@ -8696,163 +4560,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5974194168320823784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5652028914571371105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -452158168091208316, guid: 69452333e6d31104096b12d6f602a131, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2974981094095411672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5652028914571371105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &5717576820868040031 GameObject: m_ObjectHideFlags: 0 @@ -8864,8 +4571,6 @@ GameObject: - component: {fileID: 3206908434811248138} - component: {fileID: 7813152805218061374} - component: {fileID: 8873463200190246297} - - component: {fileID: 8781097479705357509} - - component: {fileID: 8926436153077861892} m_Layer: 0 m_Name: Ball_Stone_piece10 m_TagString: Untagged @@ -8938,163 +4643,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8781097479705357509 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717576820868040031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -6146092811422425381, guid: 0a1f28c2d23b6084bb7a4a58b265a944, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8926436153077861892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717576820868040031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &5804246795706321711 GameObject: m_ObjectHideFlags: 0 @@ -9106,8 +4654,6 @@ GameObject: - component: {fileID: 3883402696934847657} - component: {fileID: 3304592369820555766} - component: {fileID: 5384489900309552253} - - component: {fileID: 6732532232284797273} - - component: {fileID: 1443435743960048677} m_Layer: 0 m_Name: Ball_Paper_piece13 m_TagString: Untagged @@ -9180,163 +4726,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6732532232284797273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5804246795706321711} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7176302451669184896, guid: 40676a747468f44499826fd0c3e365f4, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1443435743960048677 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5804246795706321711} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.05 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 5 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &5836029952703412534 GameObject: m_ObjectHideFlags: 0 @@ -9442,8 +4831,6 @@ GameObject: - component: {fileID: 325778561971600298} - component: {fileID: 2242491170790323895} - component: {fileID: 9100973659083606856} - - component: {fileID: 3530655650093638744} - - component: {fileID: 3209031378867930247} m_Layer: 0 m_Name: Ball_Wood_piece11 m_TagString: Untagged @@ -9516,163 +4903,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3530655650093638744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5939950950547655677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7208856363533844945, guid: 0da54ad199984434a94bdf8762a6e221, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3209031378867930247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5939950950547655677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &6327197682923225555 GameObject: m_ObjectHideFlags: 0 @@ -9729,7 +4959,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6327197684400733755} - - component: {fileID: 8537021304311423136} m_Layer: 0 m_Name: BallPaperPieces m_TagString: Untagged @@ -9770,31 +4999,6 @@ Transform: m_Father: {fileID: 2892297330506721526} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8537021304311423136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6327197684400733756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a1624f4fefb6fd45aa49fe116903639, type: 3} - m_Name: - m_EditorClassIdentifier: - Name: BallPaperPiecesWind - LuaClassName: BallPaperPiecesWind - LuaFileName: Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind - LuaPackageName: core - LuaInitialVars: [] - LuaPublicVars: [] - ExecuteOrder: 0 - CreateStore: 0 - CreateActionStore: 0 - DebugLoadScript: 0 - ManualInputScript: 0 - UpdateDelta: 0 - FixUpdateDelta: 3 --- !u!1 &6327197684668924974 GameObject: m_ObjectHideFlags: 0 @@ -9806,8 +5010,6 @@ GameObject: - component: {fileID: 6327197684668924973} - component: {fileID: 6978804646917677640} - component: {fileID: 1491338485814939100} - - component: {fileID: 1144963209979754006} - - component: {fileID: 5839408306386708207} - component: {fileID: 7229525657330439329} m_Layer: 0 m_Name: BallPaper @@ -9881,163 +5083,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1144963209979754006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6327197684668924974} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -6949797262673582555, guid: f000bae89657bc8439f14527497e6738, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5839408306386708207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6327197684668924974} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 1 - m_CollidableQualityType: -1 - m_Mass: 0.4 - m_LinearDamping: 2.7 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.5 - m_Layer: 1 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!114 &7229525657330439329 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10542,8 +5587,6 @@ GameObject: - component: {fileID: 726958122576457467} - component: {fileID: 6109144095611239035} - component: {fileID: 540809507308710380} - - component: {fileID: 8632102613951156777} - - component: {fileID: 4999082748775153787} m_Layer: 0 m_Name: Ball_Paper_piece09 m_TagString: Untagged @@ -10616,163 +5659,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8632102613951156777 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6404155419835604588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -1776702922847350901, guid: 80468efe56bc5764fa24ff8e8f283fa4, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4999082748775153787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6404155419835604588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.05 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 4 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &6836484517777099705 GameObject: m_ObjectHideFlags: 0 @@ -10784,8 +5670,6 @@ GameObject: - component: {fileID: 4760637705283883083} - component: {fileID: 3291241870700807526} - component: {fileID: 6599068713197346830} - - component: {fileID: 6609533177359332264} - - component: {fileID: 2401828875381525730} m_Layer: 0 m_Name: Ball_Paper_piece01 m_TagString: Untagged @@ -10858,163 +5742,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6609533177359332264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6836484517777099705} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8473886193133409326, guid: cf57d38ebe54a3542b10ddc211669899, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2401828875381525730 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6836484517777099705} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.05 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 4 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &6977890673710919265 GameObject: m_ObjectHideFlags: 0 @@ -11026,8 +5753,6 @@ GameObject: - component: {fileID: 6560727814970213515} - component: {fileID: 4123351402153007695} - component: {fileID: 689839535978218012} - - component: {fileID: 4175190881279680254} - - component: {fileID: 3380580433849214936} m_Layer: 0 m_Name: Ball_Wood_piece12 m_TagString: Untagged @@ -11100,163 +5825,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4175190881279680254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6977890673710919265} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 8201911869009444674, guid: 48d87baa54c2f504498613dca876cd81, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3380580433849214936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6977890673710919265} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7123148697167565329 GameObject: m_ObjectHideFlags: 0 @@ -11268,8 +5836,6 @@ GameObject: - component: {fileID: 3256234554635531333} - component: {fileID: 7360963501384666937} - component: {fileID: 8145388246422711521} - - component: {fileID: 6360563528484289769} - - component: {fileID: 662712547299446353} m_Layer: 0 m_Name: Ball_Stone_piece03 m_TagString: Untagged @@ -11342,163 +5908,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6360563528484289769 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7123148697167565329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7617184587431434989, guid: 70d64b5b9a8141d428335d29a72e25e5, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &662712547299446353 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7123148697167565329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7206836674265043214 GameObject: m_ObjectHideFlags: 0 @@ -11510,8 +5919,6 @@ GameObject: - component: {fileID: 3364024451687842816} - component: {fileID: 3133270828320456848} - component: {fileID: 120490422079556452} - - component: {fileID: 8637859953029243577} - - component: {fileID: 8602073232692740035} - component: {fileID: 7594207142973122758} m_Layer: 0 m_Name: BallWood @@ -11585,7 +5992,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8637859953029243577 +--- !u!114 &7594207142973122758 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11594,164 +6001,7 @@ MonoBehaviour: m_GameObject: {fileID: 7206836674265043214} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 1 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4684047213573381340, guid: f21c48f116b0136419136aefcbfc7aea, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 2 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8602073232692740035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7206836674265043214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 1 - m_CollidableQualityType: -1 - m_Mass: 1.9 - m_LinearDamping: 1.3 - m_AngularDamping: 0.5 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.8 - m_Restitution: 0.5 - m_Layer: 1 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &7594207142973122758 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7206836674265043214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a1624f4fefb6fd45aa49fe116903639, type: 3} + m_Script: {fileID: 11500000, guid: 4a1624f4fefb6fd45aa49fe116903639, type: 3} m_Name: m_EditorClassIdentifier: Name: Ball_Wood @@ -12281,8 +6531,6 @@ GameObject: - component: {fileID: 5478615816037945564} - component: {fileID: 1865687311005350472} - component: {fileID: 8545857170736249304} - - component: {fileID: 3691574862884169543} - - component: {fileID: 1476819995383734934} m_Layer: 0 m_Name: Ball_Wood_piece04 m_TagString: Untagged @@ -12355,163 +6603,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3691574862884169543 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7618900324462032038} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7111966104710212824, guid: 9fe1e4c4eb48ba44e9a05416737f524b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1476819995383734934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7618900324462032038} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7659934097277963421 GameObject: m_ObjectHideFlags: 0 @@ -12523,8 +6614,6 @@ GameObject: - component: {fileID: 9012606278700885292} - component: {fileID: 2631022334418387543} - component: {fileID: 7900940222281313988} - - component: {fileID: 8250355044947382814} - - component: {fileID: 5610562772243282027} m_Layer: 0 m_Name: Ball_Stone_piece07 m_TagString: Untagged @@ -12597,163 +6686,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8250355044947382814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7659934097277963421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 2309858317139499908, guid: 4682497ac43052d4eb8238218995327b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5610562772243282027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7659934097277963421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7697854858821287985 GameObject: m_ObjectHideFlags: 0 @@ -12765,8 +6697,6 @@ GameObject: - component: {fileID: 2270511408177022377} - component: {fileID: 7037422916667303119} - component: {fileID: 4785078169747917372} - - component: {fileID: 7682946915079765329} - - component: {fileID: 7139977018164794258} m_Layer: 0 m_Name: Ball_Wood_piece07 m_TagString: Untagged @@ -12839,163 +6769,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7682946915079765329 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7697854858821287985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2634796472990037323, guid: 96de5063d80675c46a4f48dcf99b9025, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7139977018164794258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7697854858821287985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7698333013415957228 GameObject: m_ObjectHideFlags: 0 @@ -13007,8 +6780,6 @@ GameObject: - component: {fileID: 2589284916925991943} - component: {fileID: 1454403313150754744} - component: {fileID: 8991997780606987486} - - component: {fileID: 6672006244575585161} - - component: {fileID: 528849032254810902} m_Layer: 0 m_Name: Ball_Stone_piece06 m_TagString: Untagged @@ -13081,163 +6852,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6672006244575585161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7698333013415957228} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3837540868867745206, guid: 14ae3ed55b6d3924a8cfa7ad0cce6013, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &528849032254810902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7698333013415957228} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7711795052512440116 GameObject: m_ObjectHideFlags: 0 @@ -13249,8 +6863,6 @@ GameObject: - component: {fileID: 2914626969313757450} - component: {fileID: 7644889107795942055} - component: {fileID: 913785540366360151} - - component: {fileID: 6978673675600227909} - - component: {fileID: 6375330872766701857} m_Layer: 0 m_Name: Ball_Wood_piece09 m_TagString: Untagged @@ -13323,163 +6935,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6978673675600227909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7711795052512440116} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2461252583377704188, guid: 8d4bde6afddd7014c98ab897c056f31d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6375330872766701857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7711795052512440116} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7749961677175350724 GameObject: m_ObjectHideFlags: 0 @@ -13491,8 +6946,6 @@ GameObject: - component: {fileID: 1703575220136076491} - component: {fileID: 6399682902599123802} - component: {fileID: 3329695405110031386} - - component: {fileID: 8714553470573044795} - - component: {fileID: 2693021005341687403} m_Layer: 0 m_Name: Ball_Stone_piece15 m_TagString: Untagged @@ -13565,163 +7018,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8714553470573044795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7749961677175350724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8664988843339621907, guid: b28c6c2998a390842a3b537ec58ac0ef, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2693021005341687403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7749961677175350724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7753876277514698126 GameObject: m_ObjectHideFlags: 0 @@ -13733,8 +7029,6 @@ GameObject: - component: {fileID: 3572157173951561921} - component: {fileID: 6221038490420091148} - component: {fileID: 4280013890339930562} - - component: {fileID: 9087108678026870519} - - component: {fileID: 2904868333946625197} m_Layer: 0 m_Name: Ball_Paper_piece04 m_TagString: Untagged @@ -13807,163 +7101,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9087108678026870519 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7753876277514698126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5452378255291640120, guid: 8dac634d4a32e7242a1eed31ce5348c5, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &2904868333946625197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7753876277514698126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.07 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 4 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7795944162072144911 GameObject: m_ObjectHideFlags: 0 @@ -13975,8 +7112,6 @@ GameObject: - component: {fileID: 3918705889017233810} - component: {fileID: 1148586283618977961} - component: {fileID: 2941890319166198879} - - component: {fileID: 4677497317311113129} - - component: {fileID: 5546131720158669717} m_Layer: 0 m_Name: Ball_Paper_piece17 m_TagString: Untagged @@ -14049,163 +7184,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4677497317311113129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795944162072144911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7784190868918901489, guid: f20d0fa9d7d742b438c020d3f1319b0c, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5546131720158669717 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795944162072144911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.09 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &7806506264467073957 GameObject: m_ObjectHideFlags: 0 @@ -14217,8 +7195,6 @@ GameObject: - component: {fileID: 6858866432088054225} - component: {fileID: 5344440631399893908} - component: {fileID: 402516192662813637} - - component: {fileID: 4637015756570896812} - - component: {fileID: 7913115960698298849} m_Layer: 0 m_Name: Ball_Wood_piece08 m_TagString: Untagged @@ -14291,163 +7267,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4637015756570896812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7806506264467073957} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7853432270459280399, guid: bd10c06167cf24d4d81349e6609261e1, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7913115960698298849 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7806506264467073957} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8211123400995636813 GameObject: m_ObjectHideFlags: 0 @@ -14459,8 +7278,6 @@ GameObject: - component: {fileID: 3953829065561302830} - component: {fileID: 5307067293890825278} - component: {fileID: 7278734959990276040} - - component: {fileID: 7348381743401502700} - - component: {fileID: 6783403953758623951} m_Layer: 0 m_Name: Ball_Wood_piece13 m_TagString: Untagged @@ -14533,163 +7350,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7348381743401502700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8211123400995636813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3427839922472415978, guid: 407a738470feba744a34368cfd391d64, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6783403953758623951 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8211123400995636813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8238253496500619855 GameObject: m_ObjectHideFlags: 0 @@ -14701,8 +7361,6 @@ GameObject: - component: {fileID: 745875125319554830} - component: {fileID: 2201190563838982537} - component: {fileID: 1172036462365527455} - - component: {fileID: 4540255685705133710} - - component: {fileID: 8317119159047793479} m_Layer: 0 m_Name: Ball_Wood_piece16 m_TagString: Untagged @@ -14775,163 +7433,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4540255685705133710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8238253496500619855} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4310120654876150120, guid: 04d11eacde2b1be46a43041eea62db75, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8317119159047793479 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8238253496500619855} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8250066322243369288 GameObject: m_ObjectHideFlags: 0 @@ -14943,8 +7444,6 @@ GameObject: - component: {fileID: 32892468072880756} - component: {fileID: 8535842285438586812} - component: {fileID: 5741030800264034977} - - component: {fileID: 3412788835437268625} - - component: {fileID: 1478465568021570034} m_Layer: 0 m_Name: Ball_Paper_piece07 m_TagString: Untagged @@ -15017,163 +7516,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3412788835437268625 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8250066322243369288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3783372447430678206, guid: ab1aaf53fca471a4a81cc8c86229f10d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1478465568021570034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8250066322243369288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.09 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!114 &3948003021884908258 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15198,8 +7540,6 @@ GameObject: - component: {fileID: 5351033191781303683} - component: {fileID: 2415072251120501233} - component: {fileID: 5618004785195935082} - - component: {fileID: 4170685141358373795} - - component: {fileID: 4682784532584527150} m_Layer: 0 m_Name: Ball_Paper_piece15 m_TagString: Untagged @@ -15272,163 +7612,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4170685141358373795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8464449836755856869} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6472911843762810053, guid: a0219d2eae5772c459bf9dcda976f15f, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4682784532584527150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8464449836755856869} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.05 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8698372116864237530 GameObject: m_ObjectHideFlags: 0 @@ -15440,8 +7623,6 @@ GameObject: - component: {fileID: 7589461227579795465} - component: {fileID: 255302992017788365} - component: {fileID: 4298917778933556127} - - component: {fileID: 2614443691192498489} - - component: {fileID: 1850465764181899622} m_Layer: 0 m_Name: Ball_Wood_piece01 m_TagString: Untagged @@ -15514,163 +7695,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2614443691192498489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8698372116864237530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3257556394028559578, guid: 2dbb15dae79e2474180bf23b0fd3bdc4, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1850465764181899622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8698372116864237530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8709217047661635578 GameObject: m_ObjectHideFlags: 0 @@ -15682,8 +7706,6 @@ GameObject: - component: {fileID: 1536261513807016118} - component: {fileID: 9002457491749346539} - component: {fileID: 3255475103393095333} - - component: {fileID: 8652782252686809718} - - component: {fileID: 3656039436204525301} m_Layer: 0 m_Name: Ball_Stone_piece09 m_TagString: Untagged @@ -15756,163 +7778,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8652782252686809718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8709217047661635578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2276033283929049220, guid: bfa73ed6b937eaa4f8ead00ea1c82ffd, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3656039436204525301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8709217047661635578} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.8 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.6 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8860145151536495322 GameObject: m_ObjectHideFlags: 0 @@ -15924,8 +7789,6 @@ GameObject: - component: {fileID: 7769969247246100175} - component: {fileID: 5129339812948794081} - component: {fileID: 2367341702872793355} - - component: {fileID: 670753826671037676} - - component: {fileID: 6545593037933511237} m_Layer: 0 m_Name: Ball_Wood_piece02 m_TagString: Untagged @@ -15998,163 +7861,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &670753826671037676 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8860145151536495322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1226929747439321972, guid: 8190c7555e54349499daca74137bfee7, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6545593037933511237 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8860145151536495322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 1 - m_Restitution: 0.9 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &8871328996306216493 GameObject: m_ObjectHideFlags: 0 @@ -16166,8 +7872,6 @@ GameObject: - component: {fileID: 3307656002942325100} - component: {fileID: 2966365414680917925} - component: {fileID: 3027041743341018085} - - component: {fileID: 1787415292094522866} - - component: {fileID: 6869503320177317686} m_Layer: 0 m_Name: Ball_Paper_piece08 m_TagString: Untagged @@ -16240,163 +7944,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1787415292094522866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8871328996306216493} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5604502105514012343, guid: b0762aabdb4a1314c9889cce19f23a10, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6869503320177317686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8871328996306216493} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.07 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 3 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1 &9087422538200826029 GameObject: m_ObjectHideFlags: 0 @@ -16408,8 +7955,6 @@ GameObject: - component: {fileID: 1568074372823905354} - component: {fileID: 4553330149911165606} - component: {fileID: 6646559665540164904} - - component: {fileID: 4575039603805177179} - - component: {fileID: 8501588997265106426} m_Layer: 0 m_Name: Ball_Paper_piece10 m_TagString: Untagged @@ -16482,163 +8027,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4575039603805177179 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9087422538200826029} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -1849907655312032369, guid: 0ef28759e6b0cdb4c8b9329352018065, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8501588997265106426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9087422538200826029} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.09 - m_LinearDamping: 6 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 2 - m_Restitution: 0.84 - m_Layer: 2 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!1001 &3680314084049370854 PrefabInstance: m_ObjectHideFlags: 0 @@ -16973,15 +8361,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bbe911314b6a34f44b5a43edff36b35f, type: 3} ---- !u!1 &8251663411001110547 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3595842755733189623, guid: bbe911314b6a34f44b5a43edff36b35f, - type: 3} - m_PrefabInstance: {fileID: 4856344709312562148} - m_PrefabAsset: {fileID: 0} --- !u!4 &5664747479660183561 stripped Transform: m_CorrespondingSourceObject: {fileID: 1006565622060090349, guid: bbe911314b6a34f44b5a43edff36b35f, type: 3} m_PrefabInstance: {fileID: 4856344709312562148} m_PrefabAsset: {fileID: 0} +--- !u!1 &8251663411001110547 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3595842755733189623, guid: bbe911314b6a34f44b5a43edff36b35f, + type: 3} + m_PrefabInstance: {fileID: 4856344709312562148} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Game/Prefabs/Core/GamePlayManager.prefab b/Assets/Game/Prefabs/Core/GamePlayManager.prefab index de0f7693..8dd12254 100644 --- a/Assets/Game/Prefabs/Core/GamePlayManager.prefab +++ b/Assets/Game/Prefabs/Core/GamePlayManager.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5331684906923441551} - - component: {fileID: 3899668927272244580} + - component: {fileID: 1853510198437731142} m_Layer: 0 m_Name: GamePhysicsWorld m_TagString: Untagged @@ -27,11 +27,12 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1427975127086481328} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3899668927272244580 +--- !u!114 &1853510198437731142 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -40,19 +41,13 @@ MonoBehaviour: m_GameObject: {fileID: 3961040559385975238} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9545bef0f9b70a24ab689bb741fa2d08, type: 3} + m_Script: {fileID: 11500000, guid: 7bbea4a224cf01d40b1be8c7128814d3, type: 3} m_Name: m_EditorClassIdentifier: - Continuous: 0 - Gravity: {x: 0, y: -66, z: 0} - SolverIterationCount: 4 - BroadPhaseWorldSize: 4000 - CollisionTolerance: 0.01 - VisualDebugger: 1 - StableSolverOn: 1 - Simulating: 1 - AutoSyncTransforms: 1 - EnableProfiler: 1 + Gravity: {x: 0, y: -20, z: 0} + SimulationRate: 66 + DeleteAllSurfacesWhenDestroy: 1 + Simulate: 1 --- !u!1 &6175279464452074422 GameObject: m_ObjectHideFlags: 0 @@ -80,6 +75,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5331684906923441551} m_Father: {fileID: 0} diff --git a/Assets/Game/Prefabs/Moduls/PC_TwoFlames.prefab b/Assets/Game/Prefabs/Moduls/PC_TwoFlames.prefab index 2212ddea..c4a0b086 100644 --- a/Assets/Game/Prefabs/Moduls/PC_TwoFlames.prefab +++ b/Assets/Game/Prefabs/Moduls/PC_TwoFlames.prefab @@ -27,6 +27,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8987545620122118470} - {fileID: 8987545620664145689} @@ -331,12 +332,11 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsPhantom + componentClassVal: Ballance2.Game.TiggerTester LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 CreateActionStore: 0 - DebugScript: DebugLoadScript: 0 ManualInputScript: 0 UpdateDelta: 0 @@ -350,7 +350,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3433791696667959808} - - component: {fileID: 3433791696667959811} + - component: {fileID: 587399204375134970} + - component: {fileID: 968003862080909027} m_Layer: 0 m_Name: CheckPointTigger m_TagString: Untagged @@ -368,11 +369,12 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1077635805636035366} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3433791696667959811 +--- !u!114 &587399204375134970 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -381,15 +383,22 @@ MonoBehaviour: m_GameObject: {fileID: 3433791696667959809} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4479bf253979e394d9f9525083d66d81, type: 3} + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} m_Name: m_EditorClassIdentifier: - m_Type: 0 - m_Min: {x: -1, y: -0.17, z: -2} - m_Max: {x: 1, y: 7.63, z: 2} - m_Layer: 0 - m_EnableListener: 1 - m_DoNotAutoCreateAtAwake: 0 +--- !u!65 &968003862080909027 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3433791696667959809} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4, y: 10, z: 4} + m_Center: {x: 0, y: 5, z: 0} --- !u!1001 &3433791696123532545 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Game/Prefabs/Moduls/PE_Balloon.prefab b/Assets/Game/Prefabs/Moduls/PE_Balloon.prefab index 31e9f7ac..28d4706d 100644 --- a/Assets/Game/Prefabs/Moduls/PE_Balloon.prefab +++ b/Assets/Game/Prefabs/Moduls/PE_Balloon.prefab @@ -1,267 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &275065140243705495 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6637315084699976363} - - component: {fileID: 2413815582987455883} - - component: {fileID: 275065140243705499} - - component: {fileID: 275065140243705494} - - component: {fileID: 275065140243705496} - - component: {fileID: 2853583798373864629} - m_Layer: 0 - m_Name: PE_Balloon_Col_04_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6637315084699976363 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: -0.23, y: 0.13, z: -0.025278583} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!33 &2413815582987455883 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_Mesh: {fileID: -3325323711760762291, guid: 3b46a3b4074c83040b8c0f8d0a10499b, type: 3} ---- !u!114 &275065140243705499 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.5 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 1 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 3 - m_SubSystemDontCollideWith: 2 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &275065140243705494 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3325323711760762291, guid: 3b46a3b4074c83040b8c0f8d0a10499b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &275065140243705496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fee107a256660d440a06e996298540d2, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 1292572827298755139} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 7030926385719267457} - Stabilized: 0 ---- !u!23 &2853583798373864629 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 275065140243705495} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9f46222f3acbf0245b8f20819a33f5b8, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &450275747258543179 GameObject: m_ObjectHideFlags: 0 @@ -273,9 +11,8 @@ GameObject: - component: {fileID: 5605830536327320586} - component: {fileID: 2021418453383796402} - component: {fileID: 4216940109578973159} - - component: {fileID: 450275747258543180} - - component: {fileID: 450275747258543178} - - component: {fileID: 450275747258543181} + - component: {fileID: 5025925975578976061} + - component: {fileID: 7079002469912671074} m_Layer: 0 m_Name: PE_Balloon_Platte04 m_TagString: Untagged @@ -293,9 +30,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 14.401615, y: -0.30791593, z: 0.2219547} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &2021418453383796402 MeshFilter: @@ -347,116 +85,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &450275747258543180 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450275747258543179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6183434723145479376, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &450275747258543178 +--- !u!114 &5025925975578976061 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -465,46 +94,42 @@ MonoBehaviour: m_GameObject: {fileID: 450275747258543179} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 7 - m_SubSystemDontCollideWith: 6 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &450275747258543181 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &7079002469912671074 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -513,18 +138,11 @@ MonoBehaviour: m_GameObject: {fileID: 450275747258543179} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 768580478379977958} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926385430142518} - AxisRef: {fileID: 7030926385430142518} - Stabilized: 1 + HingeRef: {fileID: 2244183727102102797} + Other: {fileID: 5276747765924193981} --- !u!1 &768580478379977959 GameObject: m_ObjectHideFlags: 0 @@ -536,9 +154,8 @@ GameObject: - component: {fileID: 8385385294138055703} - component: {fileID: 6765405961012758259} - component: {fileID: 2820523844879298643} - - component: {fileID: 768580478379977960} - - component: {fileID: 768580478379977958} - - component: {fileID: 768580478379977961} + - component: {fileID: 5276747765924193981} + - component: {fileID: 7270586509920590684} m_Layer: 0 m_Name: PE_Balloon_Platte05 m_TagString: Untagged @@ -556,9 +173,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 16.040304, y: -0.30791593, z: 0.14012298} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &6765405961012758259 MeshFilter: @@ -610,116 +228,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &768580478379977960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 768580478379977959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 9088010694572087235, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &768580478379977958 +--- !u!114 &5276747765924193981 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -728,46 +237,42 @@ MonoBehaviour: m_GameObject: {fileID: 768580478379977959} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 8 - m_SubSystemDontCollideWith: 7 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &768580478379977961 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &7270586509920590684 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -776,257 +281,11 @@ MonoBehaviour: m_GameObject: {fileID: 768580478379977959} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 3534020416391495700} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926385245078667} - AxisRef: {fileID: 7030926385245078667} - Stabilized: 1 ---- !u!1 &1106876256206392447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1617334296433737722} - - component: {fileID: 161529622135597048} - - component: {fileID: 1106876256206392446} - - component: {fileID: 360707302587952665} - m_Layer: 0 - m_Name: PE_Balloon_Col_01_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1617334296433737722 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106876256206392447} - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.23000002, y: 0.05, z: -0.025278583} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!33 &161529622135597048 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106876256206392447} - m_Mesh: {fileID: 4099240240961608778, guid: c5abef20113fe5247b10bf7dcdbd4607, type: 3} ---- !u!114 &1106876256206392446 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106876256206392447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4099240240961608778, guid: c5abef20113fe5247b10bf7dcdbd4607, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &360707302587952665 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106876256206392447} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1292572826193174496 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1292572826193174499} - - component: {fileID: 1292572826193174498} - m_Layer: 0 - m_Name: PE_Balloon_Ballon_Host - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1292572826193174499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292572826193174496} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 8, y: 8, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} ---- !u!54 &1292572826193174498 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292572826193174496} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 + HingeRef: {fileID: 2244183727085868976} + Other: {fileID: 418927004136736404} --- !u!1 &1292572827298755137 GameObject: m_ObjectHideFlags: 0 @@ -1036,12 +295,15 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1292572827298755136} - - component: {fileID: 1292572827298755138} - - component: {fileID: 1292572827298755139} - - component: {fileID: 1292572827298755140} - - component: {fileID: 5460074240357383625} - component: {fileID: 4578032048192499889} - - component: {fileID: 7897465192451299290} + - component: {fileID: 688254854851051291} + - component: {fileID: 8428815068132297870} + - component: {fileID: 2583239269984093677} + - component: {fileID: 953777078753243109} + - component: {fileID: 2492121858053519384} + - component: {fileID: 9116460403174883827} + - component: {fileID: 8710460260175506318} + - component: {fileID: 4670297650368888585} m_Layer: 0 m_Name: PE_Balloon_Platform m_TagString: Untagged @@ -1056,28 +318,22 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1292572827298755137} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1292572826193174499} - {fileID: 289327339764519660} - {fileID: 2909210441761047478} - {fileID: 3037485738132171553} - {fileID: 8506663611785632401} - {fileID: 7918625993337882122} - - {fileID: 1617334296433737722} - - {fileID: 4514692641839686735} - - {fileID: 4612007545598674455} - - {fileID: 6637315084699976363} - - {fileID: 380106908967249807} - - {fileID: 677187852442701035} - - {fileID: 1714204744874301653} - {fileID: 2040506277254001284} + - {fileID: 4765093357749632511} m_Father: {fileID: 8033781843446112824} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1292572827298755138 + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!114 &4578032048192499889 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1086,106 +342,16 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: da01f917c0a99684facd39f526aabe86, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1292572827298755139 + Object1: {fileID: 7523259433248234574} + Object2: {fileID: 0} + Diatance: 200 + CheckEnabled: 0 + CheckTickMin: 60 + CheckTickMax: 600 +--- !u!114 &688254854851051291 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1194,46 +360,48 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 10 - m_LinearDamping: 2 - m_AngularDamping: 2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -5, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.6 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Mass: 4 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 2 - m_SubSystemDontCollideWith: 1 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &1292572827298755140 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: + - {fileID: 4099240240961608778, guid: c5abef20113fe5247b10bf7dcdbd4607, type: 3} + - {fileID: 1775602695744518269, guid: 90a8b1ce8248e484a98e646f18a4a900, type: 3} + - {fileID: 8780479040226762615, guid: 2a426e0b9bef050489236f1a429b0ec5, type: 3} + - {fileID: -3325323711760762291, guid: 3b46a3b4074c83040b8c0f8d0a10499b, type: 3} + - {fileID: 2423014812101515031, guid: 6f2e92a3652a7ff4c8971cd1b3bd5ca3, type: 3} + - {fileID: 2235035295902700654, guid: 61811ac0610073546a24cfca57d5d577, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &8428815068132297870 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1242,19 +410,20 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: efb668054c1bb70428b8bba9f606dbfb, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 6931793308048622636} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 7030926385719267457} - AxisRef: {fileID: 7030926385719267457} - Stabilized: 1 ---- !u!114 &5460074240357383625 + HingeRef: {fileID: 7523259433248234574} + Other: {fileID: 0} + force_factor: 1 + damp_factor: 1 + translation_limit: -1 + translation_freedom_min: {x: 0, y: -2, z: 0} + translation_freedom_max: {x: 0, y: 2, z: 0} + rotation_limit: -1 + rotation_freedom_min: {x: 0, y: 0, z: 0} + rotation_freedom_max: {x: 0, y: 0, z: 0} +--- !u!114 &2583239269984093677 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1263,19 +432,18 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d04d5e98edbbdd44ca040e617f545102, type: 3} + m_Script: {fileID: 11500000, guid: 0180900f7b300684ca073e031c5d1576, type: 3} m_Name: m_EditorClassIdentifier: - m_PovitA: {fileID: 2244183726677087568} - m_PovitB: {fileID: 2244183726677087568} - m_DoNotAutoCreateAtAwake: 0 - springStrength: 500 - springDamping: 3 - springRestLength: 1 - onCompression: 1 - onExtension: 1 - ConnectedBody: {fileID: 3665619465525756436} ---- !u!114 &4578032048192499889 + Position1Ref: {fileID: 7523259433248234574} + Position2Ref: {fileID: 4929241578712818688} + Other: {fileID: 4119830675842878732} + length: 15 + constant: 20 + spring_damping: 0.6 + global_damping: 1 + use_stiff_spring: 0 +--- !u!114 &953777078753243109 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1284,16 +452,12 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: da01f917c0a99684facd39f526aabe86, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - Object1: {fileID: 7523259433248234574} - Object2: {fileID: 0} - Diatance: 200 - CheckEnabled: 0 - CheckTickMin: 60 - CheckTickMax: 600 ---- !u!114 &7897465192451299290 + HingeRef: {fileID: 5414282640635101395} + Other: {fileID: 2046680466212800000} +--- !u!114 &2492121858053519384 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1302,224 +466,53 @@ MonoBehaviour: m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b4dbf91eabc0cd4d9821807996e50ad, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 3665619465525756436} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - motorEnable: 0 - motorSpring: 0 - motorTau: 0.2 - motorDamping: 0.2 - motorProportionalRecoveryVelocity: 0 - motorConstantRecoveryVelocity: 0 - motorMinForce: -1000000 - motorMaxForce: 1000000 - motorSpringConstant: 0 - motorSpringDamping: 0.3 - PovitRef: {fileID: 1644328325138616181} - AxisRef: {fileID: 1644328325138616181} - AllowRotationAroundAxis: 0 - MaxLinearLimit: 7 - MinLinearLimit: -6 - MaxFrictionForce: 0 - Stabilized: 1 ---- !u!1 &1580483554479688818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 677187852442701035} - - component: {fileID: 3177133477679241066} - - component: {fileID: 1580483554479688821} - - component: {fileID: 2609497770417699164} - m_Layer: 0 - m_Name: PE_Balloon_Col_06_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &677187852442701035 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580483554479688818} - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.23000002, y: 0.05, z: -0.025278583} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!33 &3177133477679241066 -MeshFilter: + HingeRef: {fileID: 4849579494648616909} + Other: {fileID: 2379127249858198256} +--- !u!114 &9116460403174883827 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580483554479688818} - m_Mesh: {fileID: 2235035295902700654, guid: 61811ac0610073546a24cfca57d5d577, type: 3} ---- !u!114 &1580483554479688821 + m_GameObject: {fileID: 1292572827298755137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 5130037182696664896} + Other: {fileID: 301208326762999528} +--- !u!114 &8710460260175506318 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580483554479688818} + m_GameObject: {fileID: 1292572827298755137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 2235035295902700654, guid: 61811ac0610073546a24cfca57d5d577, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &2609497770417699164 -MeshRenderer: + HingeRef: {fileID: 3420655804697142034} + Other: {fileID: 7441504572859291289} +--- !u!114 &4670297650368888585 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580483554479688818} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} + m_GameObject: {fileID: 1292572827298755137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 2244183727417181114} + Other: {fileID: 5187647493509846287} --- !u!1 &2362326026555378565 GameObject: m_ObjectHideFlags: 0 @@ -1531,9 +524,7 @@ GameObject: - component: {fileID: 3818736291196667783} - component: {fileID: 6967267885951810930} - component: {fileID: 661979493783722668} - - component: {fileID: 2362326026555378564} - - component: {fileID: 2362326026555378566} - - component: {fileID: 2362326026555378567} + - component: {fileID: 2379127249858198256} m_Layer: 0 m_Name: PE_Balloon_Ballon02 m_TagString: Untagged @@ -1551,9 +542,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: -10.91461, y: 6.668769, z: -10.836088} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &6967267885951810930 MeshFilter: @@ -1605,70 +597,50 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &2362326026555378564 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2362326026555378565} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 1 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!75 &2362326026555378566 -ConstantForce: +--- !u!114 &2379127249858198256 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2362326026555378565} m_Enabled: 1 - m_Force: {x: 0, y: 50, z: 0} - m_RelativeForce: {x: 0, y: 0, z: 0} - m_Torque: {x: 0, y: 0, z: 0} - m_RelativeTorque: {x: 0, y: 0, z: 0} ---- !u!59 &2362326026555378567 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2362326026555378565} - m_ConnectedBody: {fileID: 2610614390081181922} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: -2.2} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.4253316, y: -2.4332345, z: 2.627263} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 1, z: 0} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &2610614390081181923 GameObject: m_ObjectHideFlags: 0 @@ -1680,8 +652,8 @@ GameObject: - component: {fileID: 5582578418317674704} - component: {fileID: 869497688205778135} - component: {fileID: 3669717861349290488} - - component: {fileID: 2610614390081181922} - - component: {fileID: 2610614390081181925} + - component: {fileID: 6003420625713407597} + - component: {fileID: 3013646957924526791} m_Layer: 0 m_Name: PE_Balloon_Ballon_Seil02 m_TagString: Untagged @@ -1699,9 +671,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: -8.489279, y: 1.8415058, z: -8.402854} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &869497688205778135 MeshFilter: @@ -1753,58 +726,64 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &2610614390081181922 -Rigidbody: +--- !u!114 &6003420625713407597 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2610614390081181923} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &2610614390081181925 -HingeJoint: + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 4 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0.2} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 8033781843446112824} +--- !u!114 &3013646957924526791 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2610614390081181923} - m_ConnectedBody: {fileID: 1292572826193174498} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: -2.31, y: 2.12, z: -1.5} - m_Axis: {x: 1, y: 1.1, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.77241004, y: -0.7853569, z: 0.34150648} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 1 - m_Limits: - min: 0 - max: 89.231895 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 8004747030137234203} + Other: {fileID: 2379127249858198256} --- !u!1 &3444340451058903273 GameObject: m_ObjectHideFlags: 0 @@ -1830,13 +809,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3444340451058903273} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalRotation: {x: -0.7071068, y: 0.0000020191073, z: 0.0000020191073, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.18000007, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1292572827298755136} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &7942828302900449138 MeshFilter: m_ObjectHideFlags: 0 @@ -1912,13 +892,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3509821451689361485} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalRotation: {x: -0.7071068, y: 0.0000020191073, z: 0.0000020191073, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.18000007, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1292572827298755136} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &523631591070347894 MeshFilter: m_ObjectHideFlags: 0 @@ -1980,9 +961,8 @@ GameObject: - component: {fileID: 7317390176499606403} - component: {fileID: 8959104865536189117} - component: {fileID: 6232257982303577334} - - component: {fileID: 3534020416391495702} - - component: {fileID: 3534020416391495700} - - component: {fileID: 3534020416391495703} + - component: {fileID: 418927004136736404} + - component: {fileID: 899251534143098255} m_Layer: 0 m_Name: PE_Balloon_Platte06 m_TagString: Untagged @@ -2000,9 +980,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 17.72112, y: -0.30791593, z: 0.16116759} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &8959104865536189117 MeshFilter: @@ -2054,116 +1035,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3534020416391495702 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3534020416391495701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -544405255794644158, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3534020416391495700 +--- !u!114 &418927004136736404 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2172,46 +1044,42 @@ MonoBehaviour: m_GameObject: {fileID: 3534020416391495701} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 9 - m_SubSystemDontCollideWith: 8 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3534020416391495703 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &899251534143098255 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2220,210 +1088,11 @@ MonoBehaviour: m_GameObject: {fileID: 3534020416391495701} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 5222043008859044848} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926384169061972} - AxisRef: {fileID: 7030926384169061972} - Stabilized: 1 ---- !u!1 &3627663775244267396 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 380106908967249807} - - component: {fileID: 8178017108881886061} - - component: {fileID: 3627663775244267399} - - component: {fileID: 1043097064196991379} - m_Layer: 0 - m_Name: PE_Balloon_Col_05_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &380106908967249807 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3627663775244267396} - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.67, y: 0.05, z: -0.025278583} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!33 &8178017108881886061 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3627663775244267396} - m_Mesh: {fileID: 2423014812101515031, guid: 6f2e92a3652a7ff4c8971cd1b3bd5ca3, type: 3} ---- !u!114 &3627663775244267399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3627663775244267396} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 1.59, y: 0.33, z: -0.020449996} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 2423014812101515031, guid: 6f2e92a3652a7ff4c8971cd1b3bd5ca3, - type: 3} - m_ShapeSize: {x: 2.2159703, y: 2.5, z: 7.3541603} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &1043097064196991379 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3627663775244267396} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} + HingeRef: {fileID: 2244183728157859183} + Other: {fileID: 2015180431162068129} --- !u!1 &3665619465525756438 GameObject: m_ObjectHideFlags: 0 @@ -2433,12 +1102,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3665619465525756439} - - component: {fileID: 3665619465525756437} - - component: {fileID: 3665619465525756436} - component: {fileID: 4944603600625665980} - component: {fileID: 5705013668656200807} - - component: {fileID: 2899202551806224086} - - component: {fileID: 6165824682453478475} + - component: {fileID: 4119830675842878732} + - component: {fileID: 7702553553243962171} m_Layer: 0 m_Name: PE_Balloon_BoxSlide m_TagString: Untagged @@ -2456,167 +1123,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 20, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 8 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3665619465525756437 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3665619465525756438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3040728458797265100, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3665619465525756436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3665619465525756438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 10 - m_LinearDamping: 2 - m_AngularDamping: 2 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0 - m_Restitution: 0 - m_Layer: 4 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 3 - m_SubSystemDontCollideWith: 2 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!33 &4944603600625665980 MeshFilter: m_ObjectHideFlags: 0 @@ -2667,7 +1178,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2899202551806224086 +--- !u!114 &4119830675842878732 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2676,33 +1187,42 @@ MonoBehaviour: m_GameObject: {fileID: 3665619465525756438} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b4dbf91eabc0cd4d9821807996e50ad, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - motorEnable: 0 - motorSpring: 0 - motorTau: 0.2 - motorDamping: 0.2 - motorProportionalRecoveryVelocity: 0 - motorConstantRecoveryVelocity: 0 - motorMinForce: -1000000 - motorMaxForce: 1000000 - motorSpringConstant: 0 - motorSpringDamping: 0.3 - PovitRef: {fileID: 7030926385918166635} - AxisRef: {fileID: 7030926385918166635} - AllowRotationAroundAxis: 0 - MaxLinearLimit: 30000 - MinLinearLimit: -2 - MaxFrictionForce: 0 - Stabilized: 1 ---- !u!114 &6165824682453478475 + m_Mass: 4 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 0 + m_AutoControlActive: 1 + m_EnableConstantForce: 0 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: -1, y: 0, z: 0} + m_StaticConstantForce: 0.2 + m_ConstantForceDirectionRef: {fileID: 8033781843446112824} +--- !u!114 &7702553553243962171 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2711,12 +1231,19 @@ MonoBehaviour: m_GameObject: {fileID: 3665619465525756438} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d37bc038a9cc7a47ad3deae0dcf48d4, type: 3} + m_Script: {fileID: 11500000, guid: efb668054c1bb70428b8bba9f606dbfb, type: 3} m_Name: m_EditorClassIdentifier: - Force: 200 - Enable: 0 - ForceRef: {fileID: 2244183728512559037} + HingeRef: {fileID: 2244183726677087568} + Other: {fileID: 0} + force_factor: 1 + damp_factor: 1 + translation_limit: -1 + translation_freedom_min: {x: -5, y: 0, z: 0} + translation_freedom_max: {x: 1000, y: 0, z: 0} + rotation_limit: -1 + rotation_freedom_min: {x: 0, y: 0, z: 0} + rotation_freedom_max: {x: 0, y: 0, z: 0} --- !u!1 &4132478282347952386 GameObject: m_ObjectHideFlags: 0 @@ -2728,8 +1255,8 @@ GameObject: - component: {fileID: 7588713304412146221} - component: {fileID: 8029036209207047134} - component: {fileID: 4388943220980778093} - - component: {fileID: 4132478282347952389} - - component: {fileID: 4132478282347952388} + - component: {fileID: 301208326762999528} + - component: {fileID: 3328450893882065067} m_Layer: 0 m_Name: PE_Balloon_Ballon_Seil03 m_TagString: Untagged @@ -2747,9 +1274,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: -8.449324, y: 1.841502, z: 8.52082} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &8029036209207047134 MeshFilter: @@ -2801,58 +1329,64 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &4132478282347952389 -Rigidbody: +--- !u!114 &301208326762999528 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4132478282347952386} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &4132478282347952388 -HingeJoint: - m_ObjectHideFlags: 0 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 4 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: -0.2} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 8033781843446112824} +--- !u!114 &3328450893882065067 +MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4132478282347952386} - m_ConnectedBody: {fileID: 1292572826193174498} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: -2.78, y: -2.51, z: -1.79} - m_Axis: {x: 1, y: -1.07, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.7086655, y: 0.75135255, z: 0.051501274} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 1 - m_Limits: - min: -80.86276 - max: 5.603197 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 4662550618435944660} + Other: {fileID: 8144258902779012090} --- !u!1 &4788550101576267535 GameObject: m_ObjectHideFlags: 0 @@ -2864,9 +1398,7 @@ GameObject: - component: {fileID: 5654286406522957958} - component: {fileID: 926747439750223273} - component: {fileID: 2629817749999928522} - - component: {fileID: 4788550101576267534} - - component: {fileID: 4788550101576267536} - - component: {fileID: 4788550101576267537} + - component: {fileID: 8144258902779012090} m_Layer: 0 m_Name: PE_Balloon_Ballon03 m_TagString: Untagged @@ -2884,9 +1416,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: -10.882872, y: 6.668765, z: 10.945847} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &926747439750223273 MeshFilter: @@ -2938,70 +1471,50 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &4788550101576267534 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4788550101576267535} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 1 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!75 &4788550101576267536 -ConstantForce: +--- !u!114 &8144258902779012090 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4788550101576267535} m_Enabled: 1 - m_Force: {x: 0, y: 50, z: 0} - m_RelativeForce: {x: 0, y: 0, z: 0} - m_Torque: {x: 0, y: 0, z: 0} - m_RelativeTorque: {x: 0, y: 0, z: 0} ---- !u!59 &4788550101576267537 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4788550101576267535} - m_ConnectedBody: {fileID: 4132478282347952389} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: -2.2} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.4335485, y: 2.425027, z: 2.6272628} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 1, z: 0} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &4851329935767574105 GameObject: m_ObjectHideFlags: 0 @@ -3027,13 +1540,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4851329935767574105} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalRotation: {x: -0.7071068, y: 0.0000020191073, z: 0.0000020191073, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.18000007, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1292572827298755136} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &771381102530277821 MeshFilter: m_ObjectHideFlags: 0 @@ -3095,9 +1609,8 @@ GameObject: - component: {fileID: 5080951808029049872} - component: {fileID: 1843363258633017850} - component: {fileID: 2080902685048147127} - - component: {fileID: 5111216448853400814} - - component: {fileID: 5111216448853400812} - - component: {fileID: 5111216448853400815} + - component: {fileID: 8952465038807292128} + - component: {fileID: 5760784960114644850} m_Layer: 0 m_Name: PE_Balloon_Platte03 m_TagString: Untagged @@ -3115,9 +1628,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 12.762636, y: -0.30791593, z: 0.1683914} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &1843363258633017850 MeshFilter: @@ -3169,116 +1683,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5111216448853400814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5111216448853400813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2726381436958080171, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5111216448853400812 +--- !u!114 &8952465038807292128 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3287,46 +1692,42 @@ MonoBehaviour: m_GameObject: {fileID: 5111216448853400813} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 6 - m_SubSystemDontCollideWith: 5 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &5111216448853400815 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &5760784960114644850 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3335,18 +1736,11 @@ MonoBehaviour: m_GameObject: {fileID: 5111216448853400813} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 450275747258543178} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926384519596454} - AxisRef: {fileID: 7030926384519596454} - Stabilized: 1 + HingeRef: {fileID: 2244183728348224157} + Other: {fileID: 5025925975578976061} --- !u!1 &5222043008859044849 GameObject: m_ObjectHideFlags: 0 @@ -3358,9 +1752,8 @@ GameObject: - component: {fileID: 545128191222972645} - component: {fileID: 4900668645366928910} - component: {fileID: 5072650337934256213} - - component: {fileID: 5222043008859044850} - - component: {fileID: 5222043008859044848} - - component: {fileID: 5222043008859044851} + - component: {fileID: 2015180431162068129} + - component: {fileID: 905122088549499125} m_Layer: 0 m_Name: PE_Balloon_Platte07 m_TagString: Untagged @@ -3378,9 +1771,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 19.318193, y: -0.30791593, z: 0.16049635} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &4900668645366928910 MeshFilter: @@ -3432,116 +1826,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5222043008859044850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5222043008859044849} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3293106381809522752, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5222043008859044848 +--- !u!114 &2015180431162068129 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3550,46 +1835,42 @@ MonoBehaviour: m_GameObject: {fileID: 5222043008859044849} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 10 - m_SubSystemDontCollideWith: 9 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &5222043008859044851 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &905122088549499125 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3598,210 +1879,11 @@ MonoBehaviour: m_GameObject: {fileID: 5222043008859044849} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 8157607035814951440} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926386085672218} - AxisRef: {fileID: 7030926386085672218} - Stabilized: 1 ---- !u!1 &6312155475290963425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1714204744874301653} - - component: {fileID: 558106074972864935} - - component: {fileID: 7967637084769342849} - - component: {fileID: 2989491799876211074} - m_Layer: 0 - m_Name: PE_Balloon_Col_07_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1714204744874301653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312155475290963425} - m_LocalRotation: {x: -0.21915689, y: -0.97568965, z: -0, w: 0} - m_LocalPosition: {x: 7.08, y: -0.63, z: 0.1355} - m_LocalScale: {x: 2.8725643, y: 0.3843, z: 4.685531} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 25.319} ---- !u!33 &558106074972864935 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312155475290963425} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &7967637084769342849 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312155475290963425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1775602695744518269, guid: 90a8b1ce8248e484a98e646f18a4a900, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &2989491799876211074 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6312155475290963425} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} + HingeRef: {fileID: 2244183726710892065} + Other: {fileID: 6553840825304645997} --- !u!1 &6374896977184566236 GameObject: m_ObjectHideFlags: 0 @@ -3813,8 +1895,8 @@ GameObject: - component: {fileID: 7203325162286132864} - component: {fileID: 6015885393843385029} - component: {fileID: 2080932819774318524} - - component: {fileID: 6374896977184566239} - - component: {fileID: 6374896977184566238} + - component: {fileID: 7441504572859291289} + - component: {fileID: 2234583765719065808} m_Layer: 0 m_Name: PE_Balloon_Ballon_Seil04 m_TagString: Untagged @@ -3832,9 +1914,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 3.1139338, y: 1.841502, z: 11.5928545} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &6015885393843385029 MeshFilter: @@ -3886,58 +1969,64 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &6374896977184566239 -Rigidbody: +--- !u!114 &7441504572859291289 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6374896977184566236} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &6374896977184566238 -HingeJoint: + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 4 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: -0.2} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 8033781843446112824} +--- !u!114 &2234583765719065808 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6374896977184566236} - m_ConnectedBody: {fileID: 1292572826193174498} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 1.02, y: -3.03, z: -1.31} - m_Axis: {x: 1, y: 0.23, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.26174176, y: 1.070357, z: 0.53150177} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 1 - m_Limits: - min: -106.28427 - max: 6.0919113 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 3215374694459476767} + Other: {fileID: 236753759820084260} --- !u!1 &6429393848950522154 GameObject: m_ObjectHideFlags: 0 @@ -3949,8 +2038,8 @@ GameObject: - component: {fileID: 520408013467828481} - component: {fileID: 1318753761460842807} - component: {fileID: 2432254117434903253} - - component: {fileID: 6429393848950522157} - - component: {fileID: 6429393848950522156} + - component: {fileID: 2046680466212800000} + - component: {fileID: 4431918086376863840} m_Layer: 0 m_Name: PE_Balloon_Ballon_Seil01 m_TagString: Untagged @@ -3968,9 +2057,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 3.0817873, y: 1.8415058, z: -11.605758} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &1318753761460842807 MeshFilter: @@ -4022,58 +2112,64 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &6429393848950522157 -Rigidbody: +--- !u!114 &2046680466212800000 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6429393848950522154} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &6429393848950522156 -HingeJoint: + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 4 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0.2} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 8033781843446112824} +--- !u!114 &4431918086376863840 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6429393848950522154} - m_ConnectedBody: {fileID: 1292572826193174498} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0.71, y: 3.32, z: -1.85} - m_Axis: {x: 1, y: -0.27, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.29647347, y: -1.0357196, z: -0.008494377} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 1 - m_Limits: - min: -10.863756 - max: 81.89805 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 7886347810581047547} + Other: {fileID: 3151265666231633555} --- !u!1 &6931793308048622637 GameObject: m_ObjectHideFlags: 0 @@ -4085,9 +2181,8 @@ GameObject: - component: {fileID: 1741054794038093514} - component: {fileID: 5839662496793767224} - component: {fileID: 2334185719936792920} - - component: {fileID: 6931793308048622638} - - component: {fileID: 6931793308048622636} - - component: {fileID: 6931793308048622639} + - component: {fileID: 5187647493509846287} + - component: {fileID: 5968077175917405676} m_Layer: 0 m_Name: PE_Balloon_Platte01 m_TagString: Untagged @@ -4105,9 +2200,10 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 9.459475, y: -0.3079178, z: 0.13283427} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &5839662496793767224 MeshFilter: @@ -4159,116 +2255,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6931793308048622638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6931793308048622637} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 8446205222223162861, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6931793308048622636 +--- !u!114 &5187647493509846287 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4277,275 +2264,55 @@ MonoBehaviour: m_GameObject: {fileID: 6931793308048622637} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 4 - m_SubSystemDontCollideWith: 2 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &6931793308048622639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6931793308048622637} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 8394247453393352217} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926384458629557} - AxisRef: {fileID: 7030926384458629557} - Stabilized: 1 ---- !u!1 &7034153580821665929 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3520041953459535068} - - component: {fileID: 8335051104163508014} - - component: {fileID: 837567674448693657} - - component: {fileID: 173756133675649987} - m_Layer: 0 - m_Name: PE_Balloon_Platform_Tigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3520041953459535068 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7034153580821665929} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.61, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8033781843446112824} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8335051104163508014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7034153580821665929} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 1 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 1.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &837567674448693657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7034153580821665929} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.5 - m_Restitution: 0.4 + m_EnableConstantForce: 1 m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 1 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 - m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 1 + m_SystemGroupName: + m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &173756133675649987 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &5968077175917405676 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7034153580821665929} + m_GameObject: {fileID: 6931793308048622637} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fee107a256660d440a06e996298540d2, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 1292572827298755139} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 7030926385719267457} - Stabilized: 0 + HingeRef: {fileID: 2244183728404959886} + Other: {fileID: 2464638716736100931} --- !u!1 &7035945379688416616 GameObject: m_ObjectHideFlags: 0 @@ -4571,13 +2338,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7035945379688416616} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalRotation: {x: -0.7071068, y: 0.0000020191073, z: 0.0000020191073, w: 0.7071068} m_LocalPosition: {x: -0.0100000035, y: 0.18000007, z: 0.009999998} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1292572827298755136} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &234464623230637972 MeshFilter: m_ObjectHideFlags: 0 @@ -4658,7 +2426,10 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3665619465525756439} + - {fileID: 1292572827298755136} - {fileID: 2127139185565467768} - {fileID: 5654286406522957958} - {fileID: 3818736291196667783} @@ -4667,9 +2438,6 @@ Transform: - {fileID: 7588713304412146221} - {fileID: 5582578418317674704} - {fileID: 520408013467828481} - - {fileID: 3665619465525756439} - - {fileID: 1292572827298755136} - - {fileID: 3520041953459535068} - {fileID: 1741054794038093514} - {fileID: 3563180066598801275} - {fileID: 5080951808029049872} @@ -4699,8 +2467,78 @@ MonoBehaviour: LuaFileName: Assets/Game/Scripts/Moduls/PE_Balloon LuaPackageName: core LuaInitialVars: + - Type: 15 + Name: PE_Balloon_BallRefPos + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 7324786546304512854} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: PhysicsRT.PhysicsForce - Type: 16 - Name: PE_Balloon_Platform_ColTest + Name: PE_Balloon_BoxSlide vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -4761,16 +2599,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 275065140243705495} + gameObjectVal: {fileID: 3665619465525756438} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platform_HingeJoint + Name: PE_Balloon_Platform vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -4838,9 +2676,9 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.HingeConstraint + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_BoxSide + Name: PE_Balloon_Ballon04 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -4901,16 +2739,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 3665619465525756438} + gameObjectVal: {fileID: 8110506288192367252} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platform + Name: PE_Balloon_Ballon03 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -4971,16 +2809,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 1292572827298755137} + gameObjectVal: {fileID: 4788550101576267535} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte01 + Name: PE_Balloon_Ballon02 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5041,16 +2879,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 6931793308048622637} + gameObjectVal: {fileID: 2362326026555378565} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte02 + Name: PE_Balloon_Ballon01 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5111,16 +2949,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 8394247453393352214} + gameObjectVal: {fileID: 7871962679667589744} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte03 + Name: PE_Balloon_Ballon_Seil04 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5181,16 +3019,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 5111216448853400813} + gameObjectVal: {fileID: 6374896977184566236} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte04 + Name: PE_Balloon_Ballon_Seil03 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5251,16 +3089,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 450275747258543179} + gameObjectVal: {fileID: 4132478282347952386} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte05 + Name: PE_Balloon_Ballon_Seil02 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5321,16 +3159,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 768580478379977959} + gameObjectVal: {fileID: 2610614390081181923} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte06 + Name: PE_Balloon_Ballon_Seil01 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5391,16 +3229,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 3534020416391495701} + gameObjectVal: {fileID: 6429393848950522154} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte07 + Name: PE_Balloon_Platte01 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5461,16 +3299,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 5222043008859044849} + gameObjectVal: {fileID: 6931793308048622637} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platte08 + Name: PE_Balloon_Platte02 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5531,16 +3369,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 8157607035814951441} + gameObjectVal: {fileID: 8394247453393352214} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platform_Tigger + Name: PE_Balloon_Platte03 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5601,16 +3439,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 7034153580821665929} + gameObjectVal: {fileID: 5111216448853400813} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: PE_Balloon_Platform_Force + Name: PE_Balloon_Platte04 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5671,16 +3509,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 3665619465525756438} + gameObjectVal: {fileID: 450275747258543179} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsForce - - Type: 15 - Name: PE_Balloon_BallRefPos + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: PE_Balloon_Platte05 vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -5741,158 +3579,438 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 7324786546304512854} + gameObjectVal: {fileID: 768580478379977959} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsForce - LuaPublicVars: [] - ExecuteOrder: 0 - CreateStore: 0 - CreateActionStore: 0 - DebugLoadScript: 0 - ManualInputScript: 0 - UpdateDelta: 0 - FixUpdateDelta: 0 ---- !u!1 &7324786546304512854 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2040506277254001284} - - component: {fileID: 4191746868240926529} - - component: {fileID: 5454366170927742722} - m_Layer: 0 - m_Name: PE_Balloon_BallRefPos - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2040506277254001284 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324786546304512854} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4, y: 4, z: 4} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4191746868240926529 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324786546304512854} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5454366170927742722 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324786546304512854} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7871962679667589744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8583055642140723263} - - component: {fileID: 630411585311093173} - - component: {fileID: 8056150433844408081} - - component: {fileID: 7871962679667589747} - - component: {fileID: 7871962679667589749} - - component: {fileID: 7871962679667589746} - m_Layer: 0 - m_Name: PE_Balloon_Ballon01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8583055642140723263 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7871962679667589744} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 3.9694846, y: 6.668771, z: -14.911797} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8033781843446112824} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} ---- !u!33 &630411585311093173 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7871962679667589744} - m_Mesh: {fileID: 3436598775918141354, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} ---- !u!23 &8056150433844408081 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7871962679667589744} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: PE_Balloon_Platte06 + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 3534020416391495701} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: PE_Balloon_Platte07 + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 5222043008859044849} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: PE_Balloon_Platte08 + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 8157607035814951441} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: PE_Balloon_Platform_HingeJoint + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 1292572827298755137} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: BallancePhysics.Wapper.PhysicsHinge:4 + LuaPublicVars: [] + ExecuteOrder: 0 + CreateStore: 0 + CreateActionStore: 0 + DebugLoadScript: 0 + ManualInputScript: 0 + UpdateDelta: 0 + FixUpdateDelta: 0 +--- !u!1 &7324786546304512854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040506277254001284} + - component: {fileID: 4191746868240926529} + - component: {fileID: 5454366170927742722} + m_Layer: 0 + m_Name: PE_Balloon_BallRefPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2040506277254001284 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7324786546304512854} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029504295} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1292572827298755136} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} +--- !u!33 &4191746868240926529 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7324786546304512854} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5454366170927742722 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7324786546304512854} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d921b07632a08fe4c98c9007ecf32828, type: 2} + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7871962679667589744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8583055642140723263} + - component: {fileID: 630411585311093173} + - component: {fileID: 8056150433844408081} + - component: {fileID: 3151265666231633555} + m_Layer: 0 + m_Name: PE_Balloon_Ballon01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8583055642140723263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7871962679667589744} + m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 3.9694846, y: 6.668771, z: -14.911797} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8033781843446112824} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} +--- !u!33 &630411585311093173 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7871962679667589744} + m_Mesh: {fileID: 3436598775918141354, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} +--- !u!23 &8056150433844408081 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7871962679667589744} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 @@ -5924,70 +4042,50 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &7871962679667589747 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7871962679667589744} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 1 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!75 &7871962679667589749 -ConstantForce: +--- !u!114 &3151265666231633555 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7871962679667589744} m_Enabled: 1 - m_Force: {x: 0, y: 50, z: 0} - m_RelativeForce: {x: 0, y: 0, z: 0} - m_Torque: {x: 0, y: 0, z: 0} - m_RelativeTorque: {x: 0, y: 0, z: 0} ---- !u!59 &7871962679667589746 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7871962679667589744} - m_ConnectedBody: {fileID: 6429393848950522157} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: -2.2} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.88769746, y: -3.3060396, z: 2.6272655} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 1, z: 0} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &8037180738140357764 GameObject: m_ObjectHideFlags: 0 @@ -6014,9 +4112,9 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2244183727417181114} - - {fileID: 2244183728512559037} - {fileID: 2244183728404959886} - {fileID: 2244183728392049528} - {fileID: 2244183728348224157} @@ -6025,10 +4123,19 @@ Transform: - {fileID: 2244183728157859183} - {fileID: 2244183726710892065} - {fileID: 2244183727092857573} + - {fileID: 5414282640635101395} + - {fileID: 7886347810581047547} + - {fileID: 4849579494648616909} + - {fileID: 8004747030137234203} + - {fileID: 5130037182696664896} + - {fileID: 4662550618435944660} + - {fileID: 3420655804697142034} + - {fileID: 3215374694459476767} - {fileID: 2244183726677087568} - {fileID: 7523259433248234574} + - {fileID: 4929241578712818688} m_Father: {fileID: 8033781843446112824} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8110506288192367252 GameObject: @@ -6041,9 +4148,7 @@ GameObject: - component: {fileID: 2127139185565467768} - component: {fileID: 6744408764174537919} - component: {fileID: 3399645514643884714} - - component: {fileID: 8110506288192367255} - - component: {fileID: 8110506288192367257} - - component: {fileID: 8110506288192367254} + - component: {fileID: 236753759820084260} m_Layer: 0 m_Name: PE_Balloon_Ballon04 m_TagString: Untagged @@ -6061,9 +4166,10 @@ Transform: m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 4.012886, y: 6.668763, z: 14.896176} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &6744408764174537919 MeshFilter: @@ -6115,70 +4221,50 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!54 &8110506288192367255 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8110506288192367252} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 1 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!75 &8110506288192367257 -ConstantForce: +--- !u!114 &236753759820084260 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8110506288192367252} m_Enabled: 1 - m_Force: {x: 0, y: 50, z: 0} - m_RelativeForce: {x: 0, y: 0, z: 0} - m_Torque: {x: 0, y: 0, z: 0} - m_RelativeTorque: {x: 0, y: 0, z: 0} ---- !u!59 &8110506288192367254 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8110506288192367252} - m_ConnectedBody: {fileID: 6374896977184566239} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: -2.2} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.8989525, y: 3.303322, z: 2.6272607} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.2 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 1, z: 0} + m_StaticConstantForce: 0.3 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &8157607035814951441 GameObject: m_ObjectHideFlags: 0 @@ -6190,9 +4276,8 @@ GameObject: - component: {fileID: 7470084891900081818} - component: {fileID: 3179960587875470822} - component: {fileID: 811182344731627449} - - component: {fileID: 8157607035814951442} - - component: {fileID: 8157607035814951440} - - component: {fileID: 8157607035814951443} + - component: {fileID: 6553840825304645997} + - component: {fileID: 8434459302414980998} m_Layer: 0 m_Name: PE_Balloon_Platte08 m_TagString: Untagged @@ -6210,9 +4295,10 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: 20.957033, y: -0.30791593, z: 0.15739828} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8033781843446112824} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} --- !u!33 &3179960587875470822 MeshFilter: @@ -6220,16 +4306,300 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8157607035814951441} - m_Mesh: {fileID: -3040728458797265100, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} ---- !u!23 &811182344731627449 + m_GameObject: {fileID: 8157607035814951441} + m_Mesh: {fileID: -3040728458797265100, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} +--- !u!23 &811182344731627449 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8157607035814951441} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 891bfc9e02b6f5749a7fb9b76d6d7c6b, type: 2} + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6553840825304645997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8157607035814951441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.5 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &8434459302414980998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8157607035814951441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 2244183727092857573} + Other: {fileID: 0} +--- !u!1 &8394247453393352214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3563180066598801275} + - component: {fileID: 7610433956006852870} + - component: {fileID: 8383352872050981767} + - component: {fileID: 2464638716736100931} + - component: {fileID: 2335120178236823523} + m_Layer: 0 + m_Name: PE_Balloon_Platte02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3563180066598801275 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8394247453393352214} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 11.12368, y: -0.30791593, z: 0.12930736} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8033781843446112824} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} +--- !u!33 &7610433956006852870 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8394247453393352214} + m_Mesh: {fileID: 3051136705456621065, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} +--- !u!23 &8383352872050981767 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8394247453393352214} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 891bfc9e02b6f5749a7fb9b76d6d7c6b, type: 2} + 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2464638716736100931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8394247453393352214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 0.5 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &2335120178236823523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8394247453393352214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} + m_Name: + m_EditorClassIdentifier: + HingeRef: {fileID: 2244183728392049528} + Other: {fileID: 8952465038807292128} +--- !u!1 &8560517709751689187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4765093357749632511} + - component: {fileID: 1216601549312521937} + - component: {fileID: 109243961586178951} + m_Layer: 0 + m_Name: PE_Balloon_BallTigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4765093357749632511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560517709751689187} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029504295} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1292572827298755136} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} +--- !u!33 &1216601549312521937 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560517709751689187} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &109243961586178951 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8157607035814951441} - m_Enabled: 1 + m_GameObject: {fileID: 8560517709751689187} + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -6242,7 +4612,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 891bfc9e02b6f5749a7fb9b76d6d7c6b, type: 2} + - {fileID: 2100000, guid: d921b07632a08fe4c98c9007ecf32828, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6264,185 +4634,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8157607035814951442 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8157607035814951441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3040728458797265100, guid: 1ed9136d759f3b84c9acc71d2b58b14d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8157607035814951440 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8157607035814951441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 5 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 - m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 11 - m_SubSystemDontCollideWith: 10 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &8157607035814951443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8157607035814951441} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926385435306462} - AxisRef: {fileID: 7030926385435306462} - Stabilized: 1 ---- !u!1 &8394247453393352214 +--- !u!1 &8967739682849560157 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6450,48 +4642,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3563180066598801275} - - component: {fileID: 7610433956006852870} - - component: {fileID: 8383352872050981767} - - component: {fileID: 8394247453393352219} - - component: {fileID: 8394247453393352217} - - component: {fileID: 8394247453393352216} + - component: {fileID: 3037485738132171553} + - component: {fileID: 8649436454999870726} + - component: {fileID: 7834817954675453578} m_Layer: 0 - m_Name: PE_Balloon_Platte02 + m_Name: PE_Balloon_Platform_03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3563180066598801275 +--- !u!4 &3037485738132171553 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 11.12368, y: -0.30791593, z: 0.12930736} + m_GameObject: {fileID: 8967739682849560157} + m_LocalRotation: {x: -0.7071068, y: 0.0000020191073, z: 0.0000020191073, w: 0.7071068} + m_LocalPosition: {x: 0.010000007, y: 0.18000007, z: 0.009999996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8033781843446112824} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} ---- !u!33 &7610433956006852870 + m_Father: {fileID: 1292572827298755136} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &8649436454999870726 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} - m_Mesh: {fileID: 3051136705456621065, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} ---- !u!23 &8383352872050981767 + m_GameObject: {fileID: 8967739682849560157} + m_Mesh: {fileID: 9061452113942156259, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} +--- !u!23 &7834817954675453578 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} + m_GameObject: {fileID: 8967739682849560157} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -6505,7 +4695,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 891bfc9e02b6f5749a7fb9b76d6d7c6b, type: 2} + - {fileID: 2100000, guid: 4dd95ce4655c32e4f918b0a286b3564b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6527,651 +4717,767 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8394247453393352219 -MonoBehaviour: +--- !u!1001 &1292572825800784974 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.69 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platform_Povit + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183727417181114 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 1292572825800784974} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3051136705456621065, guid: 1ed9136d759f3b84c9acc71d2b58b14d, +--- !u!1001 &1292572826121831697 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.89 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.49 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit08 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183727092857573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8394247453393352217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 - m_AutoControlActive: 1 - m_SystemGroupName: PE_Balloon - m_SubSystemId: 5 - m_SubSystemDontCollideWith: 4 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &8394247453393352216 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 1292572826121831697} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8394247453393352214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 5111216448853400812} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 7030926384404561987} - AxisRef: {fileID: 7030926384404561987} - Stabilized: 1 ---- !u!1 &8557966583813998468 -GameObject: +--- !u!1001 &1292572826131657465 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4514692641839686735} - - component: {fileID: 5483172719532151811} - - component: {fileID: 8557966583813998471} - - component: {fileID: 3027350001761504175} - m_Layer: 0 - m_Name: PE_Balloon_Col_02_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4514692641839686735 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.16 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.03999999 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit04 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183727102102797 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8557966583813998468} - m_LocalRotation: {x: -0, y: -0, z: 0.113213025, w: 0.99357074} - m_LocalPosition: {x: 4.35, y: -0.73, z: 0.08} - m_LocalScale: {x: 4.27, y: 0.9, z: 4.33} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.001} ---- !u!33 &5483172719532151811 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8557966583813998468} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &8557966583813998471 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8557966583813998468} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1775602695744518269, guid: 90a8b1ce8248e484a98e646f18a4a900, + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &3027350001761504175 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 1292572826131657465} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8557966583813998468} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &8678237130486516270 -GameObject: +--- !u!1001 &1292572826283157572 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4612007545598674455} - - component: {fileID: 8252094985599513590} - - component: {fileID: 8678237130486516273} - - component: {fileID: 8620271783154333512} - m_Layer: 0 - m_Name: PE_Balloon_Col_03_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4612007545598674455 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 16.807 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.03999999 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit05 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183727085868976 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8678237130486516270} - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.23000002, y: 0.05, z: -0.025278583} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!33 &8252094985599513590 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 1292572826283157572} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8678237130486516270} - m_Mesh: {fileID: 8780479040226762615, guid: 2a426e0b9bef050489236f1a429b0ec5, type: 3} ---- !u!114 &8678237130486516273 -MonoBehaviour: +--- !u!1001 &1292572826503797205 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8678237130486516270} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 8780479040226762615, guid: 2a426e0b9bef050489236f1a429b0ec5, + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 20.107 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.04 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit07 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183726710892065 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!23 &8620271783154333512 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 1292572826503797205} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8678237130486516270} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &8967739682849560157 -GameObject: +--- !u!1001 &1292572826670770852 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3037485738132171553} - - component: {fileID: 8649436454999870726} - - component: {fileID: 7834817954675453578} - m_Layer: 0 - m_Name: PE_Balloon_Platform_03 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3037485738132171553 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Slideframe_close + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183726677087568 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 1292572826670770852} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8967739682849560157} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 0.010000007, y: 0.18000007, z: 0.009999996} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1292572827298755136} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} ---- !u!33 &8649436454999870726 -MeshFilter: +--- !u!1001 &1292572827033806185 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.53 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.03999999 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit03 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183728348224157 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 1292572827033806185} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8967739682849560157} - m_Mesh: {fileID: 9061452113942156259, guid: 1ed9136d759f3b84c9acc71d2b58b14d, type: 3} ---- !u!23 &7834817954675453578 -MeshRenderer: +--- !u!1001 &1292572827090578810 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7158373251878301962} + m_Modifications: + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.247 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.03999999 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_Name + value: PE_Balloon_Platte_Povit01 + objectReference: {fileID: 0} + - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} +--- !u!4 &2244183728404959886 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 1292572827090578810} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8967739682849560157} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 4dd95ce4655c32e4f918b0a286b3564b, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1001 &1292572825800784974 +--- !u!1001 &1292572827119086732 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7181,7 +5487,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7201,12 +5507,12 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 8.69 + value: 11.837 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.1 + value: 0.03999999 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7251,7 +5557,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platform_Povit + value: PE_Balloon_Platte_Povit02 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7260,19 +5566,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926385719267457 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572825800784974} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183727417181114 stripped +--- !u!4 &2244183728392049528 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572825800784974} + m_PrefabInstance: {fileID: 1292572827119086732} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572826121831697 +--- !u!1001 &1292572827354653339 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7282,7 +5582,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7302,12 +5602,12 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 21.89 + value: 18.497 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: -0.49 + value: 0.03999999 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7352,7 +5652,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit08 + value: PE_Balloon_Platte_Povit06 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7361,19 +5661,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &2244183727092857573 stripped +--- !u!4 &2244183728157859183 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572826121831697} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7030926385435306462 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572826121831697} + m_PrefabInstance: {fileID: 1292572827354653339} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572826131657465 +--- !u!1001 &2426394847106407654 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7383,42 +5677,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 5 + value: 15 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 15.16 + value: 2.1567 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 0.2519 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: 7.9766 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.7745895 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7428,7 +5722,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.6324643 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7438,22 +5732,22 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 101.536 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -180 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit04 + value: PE_Balloon_Ballon04_hinge_a objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7462,19 +5756,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926385430142518 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572826131657465} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183727102102797 stripped +--- !u!4 &3420655804697142034 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572826131657465} + m_PrefabInstance: {fileID: 2426394847106407654} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572826283157572 +--- !u!1001 &2471239421078140139 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7484,42 +5772,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 6 + value: 16 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 16.807 + value: 4.013 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 4.506 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: 14.882 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.8743188 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7529,7 +5817,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.4853522 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7539,22 +5827,22 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 121.929 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -180 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit05 + value: PE_Balloon_Ballon04_hinge_b objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7563,19 +5851,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926385245078667 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572826283157572} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183727085868976 stripped +--- !u!4 &3215374694459476767 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572826283157572} + m_PrefabInstance: {fileID: 2471239421078140139} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572826503797205 +--- !u!1001 &5041692331399118631 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7585,42 +5867,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 20.107 + value: 2.1324 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.04 + value: 0.2519 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: -7.9887 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.5924587 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7630,7 +5912,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.8056008 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7645,7 +5927,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 252.663 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7655,7 +5937,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit07 + value: PE_Balloon_Ballon01_hinge_a objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7664,19 +5946,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926386085672218 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572826503797205} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183726710892065 stripped +--- !u!4 &5414282640635101395 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572826503797205} + m_PrefabInstance: {fileID: 5041692331399118631} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572826670770852 +--- !u!1001 &5324759671203582132 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7686,42 +5962,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 10 + value: 13 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -5.842 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 20 + value: 0.2519 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 5.8493 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.89342517 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7731,7 +6007,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: 0.44921213 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7746,7 +6022,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 53.386 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7756,7 +6032,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Slideframe_close + value: PE_Balloon_Ballon03_hinge_a objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7765,19 +6041,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926385918166635 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572826670770852} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183726677087568 stripped +--- !u!4 &5130037182696664896 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572826670770852} + m_PrefabInstance: {fileID: 5324759671203582132} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572827005196361 +--- !u!1001 &5385454200048524276 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7787,22 +6057,22 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 1 + value: 19 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7812,7 +6082,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -6.421 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7827,27 +6097,27 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7857,7 +6127,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platform_ForceRef + value: PE_Balloon_Slideframe_low objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7866,13 +6136,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &2244183728512559037 stripped +--- !u!4 &4929241578712818688 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572827005196361} + m_PrefabInstance: {fileID: 5385454200048524276} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572827033806185 +--- !u!1001 &5591781670635759673 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7882,42 +6152,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 4 + value: 11 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 13.53 + value: -5.8416 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 0.2519 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: -5.8486 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.3869247 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7927,7 +6197,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.92211133 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7942,7 +6212,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 134.473 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7952,7 +6222,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit03 + value: PE_Balloon_Ballon02_hinge_a objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -7961,19 +6231,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &2244183728348224157 stripped +--- !u!4 &4849579494648616909 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572827033806185} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7030926384519596454 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572827033806185} + m_PrefabInstance: {fileID: 5591781670635759673} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572827090578810 +--- !u!1001 &5647619499602706208 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -7983,57 +6247,57 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 2 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 10.247 + value: -10.877 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 4.506 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: 10.91 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.84225297 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.0777723 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.5182529 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.12639391 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8043,17 +6307,17 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 63.209 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -17.069 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit01 + value: PE_Balloon_Ballon03_hinge_b objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8062,19 +6326,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926384458629557 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572827090578810} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183728404959886 stripped +--- !u!4 &4662550618435944660 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572827090578810} + m_PrefabInstance: {fileID: 5647619499602706208} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572827119086732 +--- !u!1001 &7044269827119455471 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8084,42 +6342,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 3 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 11.837 + value: -10.877 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 4.506 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: -10.872 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.49228942 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8129,7 +6387,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.87043154 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8144,7 +6402,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 121.018 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8154,7 +6412,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit02 + value: PE_Balloon_Ballon02_hinge_b objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8163,19 +6421,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &2244183728392049528 stripped +--- !u!4 &8004747030137234203 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572827119086732} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7030926384404561987 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572827119086732} + m_PrefabInstance: {fileID: 7044269827119455471} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1292572827354653339 +--- !u!1001 &7180209615816660751 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8185,42 +6437,42 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.x - value: 18.497 + value: 4.013 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0.03999999 + value: 4.506 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -0.35 + value: -14.926 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.47923356 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8230,7 +6482,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.87768745 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8245,7 +6497,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -122.729 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8255,7 +6507,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Platte_Povit06 + value: PE_Balloon_Ballon01_hinge_b objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8264,17 +6516,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7030926384169061972 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1292572827354653339} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2244183728157859183 stripped +--- !u!4 &7886347810581047547 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} - m_PrefabInstance: {fileID: 1292572827354653339} + m_PrefabInstance: {fileID: 7180209615816660751} m_PrefabAsset: {fileID: 0} --- !u!1001 &7400304304920880058 PrefabInstance: @@ -8286,22 +6532,22 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_RootOrder - value: 11 + value: 18 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8311,7 +6557,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 7.0018 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8356,7 +6602,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: PE_Balloon_Slideframe_updown + value: PE_Balloon_Slideframe_high objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -8365,12 +6611,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &1644328325138616181 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 7400304304920880058} - m_PrefabAsset: {fileID: 0} --- !u!4 &7523259433248234574 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Ball_Paper.prefab b/Assets/Game/Prefabs/Moduls/P_Ball_Paper.prefab index b3729f3a..7b1826e8 100644 --- a/Assets/Game/Prefabs/Moduls/P_Ball_Paper.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Ball_Paper.prefab @@ -12,8 +12,7 @@ GameObject: - component: {fileID: 1300828165197587028} - component: {fileID: 3748225458641366415} - component: {fileID: 6739363268183128160} - - component: {fileID: 1130734195420087568} - - component: {fileID: 6934722005532638579} + - component: {fileID: 7875554090901726670} m_Layer: 0 m_Name: P_Ball_Paper m_TagString: Untagged @@ -31,6 +30,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -54,6 +54,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -97,8 +98,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: ModulPhysics + LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics LuaPackageName: core LuaInitialVars: [] LuaPublicVars: [] @@ -109,7 +110,7 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!114 &1130734195420087568 +--- !u!114 &7875554090901726670 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -118,164 +119,35 @@ MonoBehaviour: m_GameObject: {fileID: 4496237636056940438} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4562164109846000059, guid: a230a675e7aacf54ebc47afc51891726, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 2.0047 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6934722005532638579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4496237636056940438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.2 - m_LinearDamping: 1.5 - m_AngularDamping: 0.4 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.65 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Mass: 1 + m_Friction: 0.5 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1.5 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 1 m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Ball_Stone.prefab b/Assets/Game/Prefabs/Moduls/P_Ball_Stone.prefab index 69f8b021..b3fa2efc 100644 --- a/Assets/Game/Prefabs/Moduls/P_Ball_Stone.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Ball_Stone.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 2873869804108775930} - component: {fileID: 4885395225710462828} - component: {fileID: 5452954490768442402} - - component: {fileID: 1248524720811792416} - - component: {fileID: 5196517732025580207} - component: {fileID: 2543814461289034148} + - component: {fileID: 4125898331568450969} m_Layer: 0 m_Name: P_Ball_Stone m_TagString: Untagged @@ -86,163 +85,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1248524720811792416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736762836638913147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 1 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4833375622428085556, guid: 379cb27d642a61e458c804534499fbdc, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 2 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5196517732025580207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736762836638913147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 10 - m_LinearDamping: 0.2 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.2 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!114 &2543814461289034148 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,8 +98,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: ModulPhysics + LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics LuaPackageName: core LuaInitialVars: - Type: 19 @@ -338,3 +180,44 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 +--- !u!114 &4125898331568450969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736762836638913147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 10 + m_Friction: 0.7 + m_Elasticity: 0.1 + m_LinearSpeedDamping: 0.2 + m_RotSpeedDamping: 0.1 + m_BallRadius: 2 + m_UseBall: 1 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Ball_Wood.prefab b/Assets/Game/Prefabs/Moduls/P_Ball_Wood.prefab index c0c9a2bf..fdde9203 100644 --- a/Assets/Game/Prefabs/Moduls/P_Ball_Wood.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Ball_Wood.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 951786937871482939} - component: {fileID: 7573661921481803437} - component: {fileID: 7024398564261365219} - - component: {fileID: 4288767078062103009} - - component: {fileID: 7118740932595874670} - component: {fileID: 691889369596670053} + - component: {fileID: 4153522144582505577} m_Layer: 0 m_Name: P_Ball_Wood m_TagString: Untagged @@ -86,163 +85,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4288767078062103009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3660684224596906938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 1 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4833375622428085556, guid: 379cb27d642a61e458c804534499fbdc, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 2 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7118740932595874670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3660684224596906938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1.6 - m_LinearDamping: 0.2 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.3 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 --- !u!114 &691889369596670053 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,8 +98,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: ModulPhysics + LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics LuaPackageName: core LuaInitialVars: - Type: 19 @@ -338,3 +180,44 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 +--- !u!114 &4153522144582505577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3660684224596906938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mass: 2 + m_Friction: 0.6 + m_Elasticity: 0.2 + m_LinearSpeedDamping: 0.6 + m_RotSpeedDamping: 0.1 + m_BallRadius: 2 + m_UseBall: 1 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Box.prefab b/Assets/Game/Prefabs/Moduls/P_Box.prefab index dafe7a82..6e5220ee 100644 --- a/Assets/Game/Prefabs/Moduls/P_Box.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Box.prefab @@ -12,8 +12,7 @@ GameObject: - component: {fileID: 7804571611213770} - component: {fileID: 8941135753225104278} - component: {fileID: 6519714479909359510} - - component: {fileID: 6519714479909359511} - - component: {fileID: 6519714479909359512} + - component: {fileID: 5989035339265933752} m_Layer: 0 m_Name: P_Box m_TagString: Untagged @@ -31,6 +30,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -98,8 +98,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: ModulPhysics + LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics LuaPackageName: core LuaInitialVars: - Type: 19 @@ -180,7 +180,7 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!114 &6519714479909359511 +--- !u!114 &5989035339265933752 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -189,151 +189,35 @@ MonoBehaviour: m_GameObject: {fileID: 6519714479909359513} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7976238961420933267, guid: bf05fcf2f0de452409dbaef610e2ed16, - type: 3} - m_ShapeSize: {x: 5, y: 5, z: 5} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6519714479909359512 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6519714479909359513} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1.3 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 1 m_Friction: 0.7 - m_Restitution: 0.3 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.3 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 1 m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: -1 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Dome.prefab b/Assets/Game/Prefabs/Moduls/P_Dome.prefab index 37b95fc4..f4e4416c 100644 --- a/Assets/Game/Prefabs/Moduls/P_Dome.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Dome.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2817780382731864806} m_RootOrder: 1 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108,6 +110,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6620505928575796075} - {fileID: 5675685144478858755} @@ -127,8 +130,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: ModulPhysics + LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics LuaPackageName: core LuaInitialVars: - Type: 16 @@ -200,7 +203,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: UnityEngine.Transform - Type: 19 Name: _PhysicsBodyCustomLayerName vector2: {x: 0, y: 0} @@ -290,8 +293,7 @@ GameObject: - component: {fileID: 6620505928575796075} - component: {fileID: 3676244038431396527} - component: {fileID: 6372051260111189822} - - component: {fileID: 7161730320402169464} - - component: {fileID: 6391634819875393423} + - component: {fileID: 1509217266938034518} m_Layer: 0 m_Name: P_Dome_MF m_TagString: Phys_Dome @@ -309,6 +311,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.110000014, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2817780382731864806} m_RootOrder: 0 @@ -332,6 +335,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -362,7 +366,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7161730320402169464 +--- !u!114 &1509217266938034518 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -371,165 +375,35 @@ MonoBehaviour: m_GameObject: {fileID: 9164961188946199463} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3271433332175982023, guid: b9e4da7176336634683c8e89cc5d7fb4, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6391634819875393423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9164961188946199463} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 4 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.2 m_Friction: 0.2 - m_Restitution: 0.8 - m_Layer: 3 - m_InertiaTensor: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_Elasticity: 0.8 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab index 320b877f..e2c50a6e 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_01.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &749401962493576432 +--- !u!1 &444649925622995438 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3827176536750962311} - - component: {fileID: 1134842813418709218} - - component: {fileID: 6935360916475198214} - - component: {fileID: 8049677950771758728} + - component: {fileID: 7628223768377642253} + - component: {fileID: 6460563111805415990} + - component: {fileID: 1779098252727335305} m_Layer: 0 - m_Name: P_Modul_01_Pusher_03 + m_Name: P_Modul_01_Pusher_05 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3827176536750962311 +--- !u!4 &7628223768377642253 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749401962493576432} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: -7.74, y: -0.11763692, z: 0.23} + m_GameObject: {fileID: 444649925622995438} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -2.51, y: 3.77, z: -0.04} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5512762197593442553} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &1134842813418709218 + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &6460563111805415990 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749401962493576432} - m_Mesh: {fileID: -5763145690257994919, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &6935360916475198214 + m_GameObject: {fileID: 444649925622995438} + m_Mesh: {fileID: 6373829177390789223, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &1779098252727335305 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749401962493576432} + m_GameObject: {fileID: 444649925622995438} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +61,6 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: b65fcb5ffd6b96f4981a0338416de5f4, type: 2} - {fileID: 2100000, guid: fd1446349f2c7b64884130372538a657, type: 2} m_StaticBatchInfo: firstSubMesh: 0 @@ -85,115 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8049677950771758728 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749401962493576432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 3 - m_Wrap: 2 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 90, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -5763145690257994919, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 1.8117528 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 0.502204 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &1321858018271194677 GameObject: m_ObjectHideFlags: 0 @@ -203,8 +92,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6919012574700268237} - - component: {fileID: 6159944391541422431} - - component: {fileID: 1305564753945615287} + - component: {fileID: 6671010326961105191} m_Layer: 0 m_Name: P_Modul_01_Rinne m_TagString: Untagged @@ -219,126 +107,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1321858018271194677} - m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: -3.99, y: -0.38, z: -2.09} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.66, y: -1.34, z: -4.83} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4692209700225779499} - - {fileID: 8495146565889061880} - - {fileID: 1774743645897764290} + m_Children: [] m_Father: {fileID: 8569134679282989642} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &6159944391541422431 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1321858018271194677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 9 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1305564753945615287 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &6671010326961105191 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -347,46 +124,42 @@ MonoBehaviour: m_GameObject: {fileID: 1321858018271194677} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 4 - m_CollidableQualityType: -1 m_Mass: 1 - m_LinearDamping: 0.1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.5 - m_Restitution: 0 - m_Layer: 4 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 1 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 1 m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 5 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &1981940089964866356 + m_Convex: + - {fileID: 1272418157679549381, guid: 40024545627d731498833686a83c8a30, type: 3} + - {fileID: -1096761022812701064, guid: 78dad0ab41e303840ac92940793ba4ad, type: 3} + - {fileID: -2586835716769308704, guid: 6dfe2f45c4fe90d488cabd4bb8f34d87, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 +--- !u!1 &1866175489965466434 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -394,47 +167,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4486831504765097653} - - component: {fileID: 3239904003670881804} - - component: {fileID: 582704255308600375} - - component: {fileID: 2733725166272846346} + - component: {fileID: 723187608966567591} + - component: {fileID: 2835180011407790659} + - component: {fileID: 1809017286714605049} m_Layer: 0 - m_Name: P_Modul_01_Pusher_02 + m_Name: P_Modul_01_Pusher_01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4486831504765097653 +--- !u!4 &723187608966567591 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1981940089964866356} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: -2.41, y: 2.57, z: 0.25} + m_GameObject: {fileID: 1866175489965466434} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 1.91, y: 1.1, z: -0.19} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5512762197593442553} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &3239904003670881804 + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &2835180011407790659 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1981940089964866356} - m_Mesh: {fileID: -3175155509547992859, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &582704255308600375 + m_GameObject: {fileID: 1866175489965466434} + m_Mesh: {fileID: 6578423814647087604, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &1809017286714605049 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1981940089964866356} + m_GameObject: {fileID: 1866175489965466434} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -448,6 +220,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: + - {fileID: 2100000, guid: 3028659a9fb811a4091ed09bdf0524c2, type: 2} - {fileID: 2100000, guid: fd1446349f2c7b64884130372538a657, type: 2} m_StaticBatchInfo: firstSubMesh: 0 @@ -470,115 +243,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2733725166272846346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1981940089964866356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3175155509547992859, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &2604288966960491397 GameObject: m_ObjectHideFlags: 0 @@ -588,8 +252,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5512762197593442553} - - component: {fileID: 4627527017473193679} - - component: {fileID: 5144451874022612524} + - component: {fileID: 3771035212191812593} m_Layer: 0 m_Name: P_Modul_01_Pusher m_TagString: Untagged @@ -604,129 +267,21 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2604288966960491397} - m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: 0.45, y: -0.39, z: -2.4} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.6, y: -1.58, z: -2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6440465291092072985} - - {fileID: 4486831504765097653} - - {fileID: 3827176536750962311} - - {fileID: 2273993583383825033} - - {fileID: 4230150375547290035} - - {fileID: 6402543335461695814} + - {fileID: 723187608966567591} + - {fileID: 7866674985952221707} + - {fileID: 7382730796142705209} + - {fileID: 5541326806045443639} + - {fileID: 7628223768377642253} + - {fileID: 842737723307539960} m_Father: {fileID: 8569134679282989642} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &4627527017473193679 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2604288966960491397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5144451874022612524 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &3771035212191812593 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -735,46 +290,42 @@ MonoBehaviour: m_GameObject: {fileID: 2604288966960491397} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 3.8 - m_LinearDamping: 0.1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 5} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.88 - m_Restitution: 0.4 - m_Layer: 5 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Mass: 3 + m_Friction: 0.6 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: -0.45, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 5 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &2931210374251968101 + m_Convex: + - {fileID: 4916011592379981366, guid: 7f432e5c7b7d8c44fafdd34a4551f697, type: 3} + - {fileID: -2525289050585519006, guid: 587643162bc1eff44a76a07084b9555a, type: 3} + - {fileID: 1893949128589018545, guid: 16a42b1e9f5cef0419191b95dc409963, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 +--- !u!1 &5253768105185388426 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -782,47 +333,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6402543335461695814} - - component: {fileID: 1875767315803515255} - - component: {fileID: 3388332846820987109} - - component: {fileID: 3152959734043976212} + - component: {fileID: 7866674985952221707} + - component: {fileID: 9195811428488395442} + - component: {fileID: 6592786265033873545} m_Layer: 0 - m_Name: P_Modul_01_Pusher_06 + m_Name: P_Modul_01_Pusher_02 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6402543335461695814 +--- !u!4 &7866674985952221707 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2931210374251968101} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: -0, y: 2.57, z: 0.27} + m_GameObject: {fileID: 5253768105185388426} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 2.3, y: 3.77, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5512762197593442553} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &1875767315803515255 + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &9195811428488395442 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2931210374251968101} - m_Mesh: {fileID: 7765912733768231732, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &3388332846820987109 + m_GameObject: {fileID: 5253768105185388426} + m_Mesh: {fileID: -3175155509547992859, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &6592786265033873545 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2931210374251968101} + m_GameObject: {fileID: 5253768105185388426} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -858,116 +408,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3152959734043976212 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2931210374251968101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7765912733768231732, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &3226543724842591636 +--- !u!1 &6417083415816112206 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -975,349 +416,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2273993583383825033} - - component: {fileID: 4872919805463850041} - - component: {fileID: 4656194106901030681} - - component: {fileID: 5976335817925288285} + - component: {fileID: 7382730796142705209} + - component: {fileID: 6689995841946922076} + - component: {fileID: 3699491870826411960} m_Layer: 0 - m_Name: P_Modul_01_Pusher_04 + m_Name: P_Modul_01_Pusher_03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2273993583383825033 +--- !u!4 &7382730796142705209 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3226543724842591636} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: -0, y: -0.86763644, z: 0.26} + m_GameObject: {fileID: 6417083415816112206} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 7.63, y: 1.08, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5512762197593442553} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &4872919805463850041 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3226543724842591636} - m_Mesh: {fileID: 351774723973020656, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &4656194106901030681 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3226543724842591636} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 3028659a9fb811a4091ed09bdf0524c2, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5976335817925288285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3226543724842591636} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: -0.000000029802322, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 351774723973020656, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 5.199998, y: 1.199997, z: 2.500001} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &4922714296474419588 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1774743645897764290} - - component: {fileID: 2808534905540287143} - - component: {fileID: 6452729149930398775} - - component: {fileID: 7522578501751703695} - m_Layer: 0 - m_Name: P_Modul_01_RinneRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1774743645897764290 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4922714296474419588} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.81, y: -1.0466, z: 5.74} - m_LocalScale: {x: 12, y: 2.4064622, z: 0.7969342} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6919012574700268237} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2808534905540287143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4922714296474419588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!33 &6452729149930398775 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &6689995841946922076 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4922714296474419588} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7522578501751703695 + m_GameObject: {fileID: 6417083415816112206} + m_Mesh: {fileID: -5763145690257994919, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &3699491870826411960 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4922714296474419588} - m_Enabled: 0 + m_GameObject: {fileID: 6417083415816112206} + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1330,7 +469,8 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} + - {fileID: 2100000, guid: b65fcb5ffd6b96f4981a0338416de5f4, type: 2} + - {fileID: 2100000, guid: fd1446349f2c7b64884130372538a657, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1352,7 +492,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &5372120333925134332 +--- !u!1 &8918717212959079131 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1360,47 +500,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6440465291092072985} - - component: {fileID: 8372459376951418621} - - component: {fileID: 5364506101016834375} - - component: {fileID: 881977976643839233} + - component: {fileID: 842737723307539960} + - component: {fileID: 5287355894528320969} + - component: {fileID: 8965998934814202971} m_Layer: 0 - m_Name: P_Modul_01_Pusher_01 + m_Name: P_Modul_01_Pusher_06 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6440465291092072985 +--- !u!4 &842737723307539960 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5372120333925134332} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: -2.02, y: -0.09851444, z: 0.39} + m_GameObject: {fileID: 8918717212959079131} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.11, y: 3.77, z: -0.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5512762197593442553} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &8372459376951418621 + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &5287355894528320969 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5372120333925134332} - m_Mesh: {fileID: 6578423814647087604, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &5364506101016834375 + m_GameObject: {fileID: 8918717212959079131} + m_Mesh: {fileID: 7765912733768231732, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &8965998934814202971 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5372120333925134332} + m_GameObject: {fileID: 8918717212959079131} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1414,7 +553,6 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 3028659a9fb811a4091ed09bdf0524c2, type: 2} - {fileID: 2100000, guid: fd1446349f2c7b64884130372538a657, type: 2} m_StaticBatchInfo: firstSubMesh: 0 @@ -1437,500 +575,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &881977976643839233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5372120333925134332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 3 - m_Wrap: 2 - m_Translation: {x: 0, y: -0.13, z: -0.11} - m_Rotation: {x: 0, y: 90, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6578423814647087604, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.30704147 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 11.011063 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &5717691862794501185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4692209700225779499} - - component: {fileID: 3194928581282867361} - - component: {fileID: 3723029716940071500} - - component: {fileID: 932995769900124233} - m_Layer: 0 - m_Name: P_Modul_01_RinneBottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4692209700225779499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717691862794501185} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.7617, y: -2.55, z: 4.5728} - m_LocalScale: {x: 11.9362755, y: 0.69494003, z: 3.1283774} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6919012574700268237} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3194928581282867361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717691862794501185} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!33 &3723029716940071500 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717691862794501185} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &932995769900124233 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5717691862794501185} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &5725465207870130090 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8495146565889061880} - - component: {fileID: 3939601508896399259} - - component: {fileID: 6772620097675439084} - - component: {fileID: 8841526498140306118} - m_Layer: 0 - m_Name: P_Modul_01_RinneLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8495146565889061880 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725465207870130090} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.81, y: -1.0247, z: 3.49} - m_LocalScale: {x: 12, y: 2.395317, z: 0.9256138} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6919012574700268237} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3939601508896399259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725465207870130090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!33 &6772620097675439084 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725465207870130090} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8841526498140306118 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725465207870130090} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 422eae182693c7a4ea23e672fa89299a, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6143983578788500816 +--- !u!1 &8920195196793702193 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1938,191 +583,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4230150375547290035} - - component: {fileID: 774867251563822728} - - component: {fileID: 5465336040430023991} - - component: {fileID: 7189356730679103744} + - component: {fileID: 5726074623311512373} + - component: {fileID: 987503715913152514} m_Layer: 0 - m_Name: P_Modul_01_Pusher_05 + m_Name: P_Modul_01_Filter m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4230150375547290035 +--- !u!4 &5726074623311512373 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6143983578788500816} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: 2.4, y: 2.57, z: 0.26} + m_GameObject: {fileID: 8920195196793702193} + m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 0.65, y: -0.21, z: -2.39} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5512762197593442553} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!33 &774867251563822728 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6143983578788500816} - m_Mesh: {fileID: 6373829177390789223, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} ---- !u!23 &5465336040430023991 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6143983578788500816} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fd1446349f2c7b64884130372538a657, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7189356730679103744 + m_Father: {fileID: 8569134679282989642} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0} +--- !u!114 &987503715913152514 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6143983578788500816} + m_GameObject: {fileID: 8920195196793702193} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6373829177390789223, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 1 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 1 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 0 + m_AutoMassCenter: 1 + m_AutoControlActive: 1 + m_SetForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: + - {fileID: -7402325741564597146, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 --- !u!1 &9052374040560591088 GameObject: m_ObjectHideFlags: 0 @@ -2132,7 +658,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8569134679282989642} - - component: {fileID: 3545978876325299464} + - component: {fileID: 452642355214470689} m_Layer: 0 m_Name: P_Modul_01 m_TagString: Untagged @@ -2154,10 +680,11 @@ Transform: m_Children: - {fileID: 6919012574700268237} - {fileID: 5512762197593442553} + - {fileID: 5726074623311512373} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3545978876325299464 +--- !u!114 &452642355214470689 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2170,12 +697,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulComplexPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics + LuaClassName: P_Modul_01 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_01 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody1 + Name: P_Modul_01_Rinne vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -2236,16 +763,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 2604288966960491397} + gameObjectVal: {fileID: 1321858018271194677} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: _PhysicsBody2 + Name: P_Modul_01_Filter vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -2306,16 +833,16 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 1321858018271194677} + gameObjectVal: {fileID: 8920195196793702193} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBody1CustomLayerName + componentClassVal: BallancePhysics.Wapper.PhysicsObject + - Type: 16 + Name: P_Modul_01_Pusher vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -2376,14 +903,14 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 1321858018271194677} + gameObjectVal: {fileID: 2604288966960491397} longVal: 0 - stringVal: WoodOnlyHit + stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -2392,3 +919,86 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 +--- !u!1 &9200460617132943658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5541326806045443639} + - component: {fileID: 1209340734462713991} + - component: {fileID: 1438470849407904679} + m_Layer: 0 + m_Name: P_Modul_01_Pusher_04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5541326806045443639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200460617132943658} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.11, y: 0.33, z: -0.05} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5512762197593442553} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &1209340734462713991 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200460617132943658} + m_Mesh: {fileID: 351774723973020656, guid: ab9c1533a97446f4c9e0ffeaaf0c6a49, type: 3} +--- !u!23 &1438470849407904679 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9200460617132943658} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3028659a9fb811a4091ed09bdf0524c2, type: 2} + 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_03.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_03.prefab index 6b54edd6..251a3369 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_03.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_03.prefab @@ -1,154 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &223858923663416539 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1972904980750525475} - - component: {fileID: 5078565783798651189} - - component: {fileID: 223858923663416538} - m_Layer: 0 - m_Name: P_Modul_03_Gate_Coll03_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1972904980750525475 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 223858923663416539} - m_LocalRotation: {x: -0, y: 0.38268274, z: -0, w: 0.9238798} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9193494787900633666} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!33 &5078565783798651189 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 223858923663416539} - m_Mesh: {fileID: 4238026182132440352, guid: 1cd63bc5cb6f0994a98c81539471fb89, type: 3} ---- !u!114 &223858923663416538 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 223858923663416539} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4238026182132440352, guid: 1cd63bc5cb6f0994a98c81539471fb89, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &569910388933886888 GameObject: m_ObjectHideFlags: 0 @@ -160,10 +11,9 @@ GameObject: - component: {fileID: 3571393709594280166} - component: {fileID: 4708123583178547192} - component: {fileID: 5526921824895565375} - - component: {fileID: 569910388933886892} - - component: {fileID: 569910388933886893} - - component: {fileID: 569910388933886894} - - component: {fileID: 569910388933886895} + - component: {fileID: 1885451467504443127} + - component: {fileID: 5695068882713172971} + - component: {fileID: 4002546727539578696} m_Layer: 0 m_Name: P_Modul_03_Floor m_TagString: Untagged @@ -181,6 +31,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -9.02, z: -0.0000047683716} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 2 @@ -235,7 +86,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &569910388933886892 +--- !u!114 &1885451467504443127 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -244,155 +95,42 @@ MonoBehaviour: m_GameObject: {fileID: 569910388933886888} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 3 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4310226365347024128, guid: a937aaea60a78524c97ad87ea91c61bd, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 10 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &569910388933886893 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 569910388933886888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 3 - m_LinearDamping: 1 - m_AngularDamping: 10 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.7 - m_Restitution: 0.2 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 5 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &569910388933886894 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &5695068882713172971 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -401,33 +139,20 @@ MonoBehaviour: m_GameObject: {fileID: 569910388933886888} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b4dbf91eabc0cd4d9821807996e50ad, type: 3} + m_Script: {fileID: 11500000, guid: efb668054c1bb70428b8bba9f606dbfb, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - motorEnable: 0 - motorSpring: 0 - motorTau: 0.2 - motorDamping: 0.2 - motorProportionalRecoveryVelocity: 0 - motorConstantRecoveryVelocity: 0 - motorMinForce: -1000000 - motorMaxForce: 1000000 - motorSpringConstant: 0 - motorSpringDamping: 0.3 - PovitRef: {fileID: 979785190632361840} - AxisRef: {fileID: 979785190632361840} - AllowRotationAroundAxis: 0 - MaxLinearLimit: 23 - MinLinearLimit: -5 - MaxFrictionForce: 5 - Stabilized: 1 ---- !u!114 &569910388933886895 + HingeRef: {fileID: 0} + Other: {fileID: 0} + force_factor: 1 + damp_factor: 1 + translation_limit: -1 + translation_freedom_min: {x: 0, y: -30, z: 0} + translation_freedom_max: {x: 0, y: 30, z: 0} + rotation_limit: -1 + rotation_freedom_min: {x: 0, y: 0, z: 0} + rotation_freedom_max: {x: 0, y: 0, z: 0} +--- !u!114 &4002546727539578696 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -436,18 +161,17 @@ MonoBehaviour: m_GameObject: {fileID: 569910388933886888} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d04d5e98edbbdd44ca040e617f545102, type: 3} + m_Script: {fileID: 11500000, guid: 0180900f7b300684ca073e031c5d1576, type: 3} m_Name: m_EditorClassIdentifier: - m_PovitA: {fileID: 8299793328896646219} - m_PovitB: {fileID: 8299793328904273053} - m_DoNotAutoCreateAtAwake: 0 - springStrength: 15 - springDamping: 0.1 - springRestLength: 0 - onCompression: 0 - onExtension: 1 - ConnectedBody: {fileID: 0} + Position1Ref: {fileID: 8299793328896646219} + Position2Ref: {fileID: 8299793328904273053} + Other: {fileID: 0} + length: 0 + constant: 15 + spring_damping: 0.1 + global_damping: 1 + use_stiff_spring: 0 --- !u!1 &2117202136982073962 GameObject: m_ObjectHideFlags: 0 @@ -475,6 +199,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8299793328904273053} - {fileID: 8299793328896646219} @@ -576,7 +301,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Gate vector2: {x: 0, y: 0} @@ -646,7 +371,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Floor vector2: {x: 0, y: 0} @@ -716,7 +441,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall01 vector2: {x: 0, y: 0} @@ -786,7 +511,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall02 vector2: {x: 0, y: 0} @@ -856,7 +581,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall07 vector2: {x: 0, y: 0} @@ -926,7 +651,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall03 vector2: {x: 0, y: 0} @@ -996,7 +721,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall04 vector2: {x: 0, y: 0} @@ -1066,7 +791,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_03_Wall05 vector2: {x: 0, y: 0} @@ -1136,7 +861,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: UnityEngine.Transform - Type: 16 Name: P_Modul_03_Wall06 vector2: {x: 0, y: 0} @@ -1206,7 +931,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -1226,8 +951,7 @@ GameObject: - component: {fileID: 7774935436305613454} - component: {fileID: 5939177239761109920} - component: {fileID: 1642271487515963415} - - component: {fileID: 3451661582725313502} - - component: {fileID: 3451661582725313503} + - component: {fileID: 6583931671331686972} m_Layer: 0 m_Name: P_Modul_03_Wall02 m_TagString: Untagged @@ -1245,6 +969,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.3826828, z: -0, w: 0.92387986} m_LocalPosition: {x: -8.506736, y: -5.3999996, z: -0.016755696} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 5 @@ -1299,7 +1024,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3451661582725313502 +--- !u!114 &6583931671331686972 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1308,303 +1033,42 @@ MonoBehaviour: m_GameObject: {fileID: 3451661582725313496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3451661582725313503 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3451661582725313496} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &3864859144689378738 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6325875379380144038} - - component: {fileID: 8704478410138521061} - - component: {fileID: 3864859144689378737} - m_Layer: 0 - m_Name: P_Modul_03_Gate_Coll01_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6325875379380144038 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3864859144689378738} - m_LocalRotation: {x: -0, y: 0.38268274, z: -0, w: 0.9238798} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9193494787900633666} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!33 &8704478410138521061 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3864859144689378738} - m_Mesh: {fileID: -8654337676499328588, guid: 63f617361451c9e41b881d183d1f84aa, type: 3} ---- !u!114 &3864859144689378737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3864859144689378738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8654337676499328588, guid: 63f617361451c9e41b881d183d1f84aa, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &4669525862547323324 GameObject: m_ObjectHideFlags: 0 @@ -1616,8 +1080,7 @@ GameObject: - component: {fileID: 4199333025676964775} - component: {fileID: 7272288625231538971} - component: {fileID: 304495912172422409} - - component: {fileID: 4669525862547323314} - - component: {fileID: 4669525862547323315} + - component: {fileID: 6097310237800996340} m_Layer: 0 m_Name: P_Modul_03_Wall01 m_TagString: Untagged @@ -1635,6 +1098,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} m_LocalPosition: {x: -6.0167503, y: -5.4, z: 5.9732504} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 4 @@ -1689,7 +1153,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4669525862547323314 +--- !u!114 &6097310237800996340 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1698,154 +1162,42 @@ MonoBehaviour: m_GameObject: {fileID: 4669525862547323324} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4669525862547323315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4669525862547323324} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &5961264656250132192 GameObject: m_ObjectHideFlags: 0 @@ -1857,8 +1209,7 @@ GameObject: - component: {fileID: 1198744958466981364} - component: {fileID: 4842174991794834408} - component: {fileID: 4583978995222416600} - - component: {fileID: 5961264656250132198} - - component: {fileID: 5961264656250132199} + - component: {fileID: 8392198030371202146} m_Layer: 0 m_Name: P_Modul_03_Wall03 m_TagString: Untagged @@ -1876,6 +1227,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.000000014901161, z: -0, w: 1} m_LocalPosition: {x: -6.0367227, y: -5.3999996, z: -6.02675} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 6 @@ -1930,7 +1282,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5961264656250132198 +--- !u!114 &8392198030371202146 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1939,154 +1291,42 @@ MonoBehaviour: m_GameObject: {fileID: 5961264656250132192} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5961264656250132199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5961264656250132192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &6011573242092910081 GameObject: m_ObjectHideFlags: 0 @@ -2098,8 +1338,7 @@ GameObject: - component: {fileID: 1453739485693819363} - component: {fileID: 3163119091880992184} - component: {fileID: 2311592463870609328} - - component: {fileID: 6011573242092910087} - - component: {fileID: 6011573242092910080} + - component: {fileID: 7641141658313171587} m_Layer: 0 m_Name: P_Modul_03_Wall06 m_TagString: Untagged @@ -2117,6 +1356,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.923881, z: -0, w: -0.38268006} m_LocalPosition: {x: 8.523265, y: -5.3999996, z: 0.05328232} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 9 @@ -2171,7 +1411,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6011573242092910087 +--- !u!114 &7641141658313171587 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2180,154 +1420,42 @@ MonoBehaviour: m_GameObject: {fileID: 6011573242092910081} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6011573242092910080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6011573242092910081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &7152397389625690178 GameObject: m_ObjectHideFlags: 0 @@ -2339,8 +1467,7 @@ GameObject: - component: {fileID: 7420972882489573908} - component: {fileID: 591267011337778672} - component: {fileID: 2485482619259646307} - - component: {fileID: 7152397389625690176} - - component: {fileID: 7152397389625690177} + - component: {fileID: 7003078305356904430} m_Layer: 0 m_Name: P_Modul_03_Wall05 m_TagString: Untagged @@ -2358,6 +1485,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.70710576, z: -0, w: 0.7071079} m_LocalPosition: {x: 5.983278, y: -5.3999996, z: -6.026723} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 8 @@ -2412,7 +1540,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7152397389625690176 +--- !u!114 &7003078305356904430 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2421,155 +1549,43 @@ MonoBehaviour: m_GameObject: {fileID: 7152397389625690178} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7152397389625690177 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7152397389625690178} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &7505708664736624404 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!1 &7267680405771963859 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2577,47 +1593,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2361018038986647289} - - component: {fileID: 2880853987778825722} - - component: {fileID: 1687424684969572816} - - component: {fileID: 7505708664736624426} - - component: {fileID: 7505708664736624427} + - component: {fileID: 8555071992651472992} + - component: {fileID: 3919293182599825192} + - component: {fileID: 7223484536158516590} m_Layer: 0 - m_Name: P_Modul_03_Wall04 + m_Name: P_Modul_03_Inner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2361018038986647289 +--- !u!4 &8555071992651472992 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7505708664736624404} - m_LocalRotation: {x: -0, y: -0.38268277, z: -0, w: 0.92387986} - m_LocalPosition: {x: -0.0667168, y: -5.3999996, z: -8.526737} + m_GameObject: {fileID: 7267680405771963859} + m_LocalRotation: {x: -0, y: -0.39532793, z: -0, w: 0.91854} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1597089622745409744} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} ---- !u!33 &2880853987778825722 + m_Father: {fileID: 9193494787900633666} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -46.573, z: 0} +--- !u!33 &3919293182599825192 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7505708664736624404} - m_Mesh: {fileID: -8589353510179971387, guid: de202dc8511949845bc38ce4881abcd5, type: 3} ---- !u!23 &1687424684969572816 + m_GameObject: {fileID: 7267680405771963859} + m_Mesh: {fileID: 3420798711519054601, guid: 1d8f587f13884244ca170222c888c543, type: 3} +--- !u!23 &7223484536158516590 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7505708664736624404} + m_GameObject: {fileID: 7267680405771963859} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -2653,164 +1668,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7505708664736624426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7505708664736624404} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7505708664736624427 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7505708664736624404} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 - m_AutoControlActive: 1 - m_SystemGroupName: - m_SubSystemId: 0 - m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!1 &8369144237683429335 +--- !u!1 &7505708664736624404 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2818,199 +1676,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 53765509855658434} - - component: {fileID: 1878663462347453379} - - component: {fileID: 8369144237683429334} + - component: {fileID: 2361018038986647289} + - component: {fileID: 2880853987778825722} + - component: {fileID: 1687424684969572816} + - component: {fileID: 4064214062752938674} m_Layer: 0 - m_Name: P_Modul_03_Gate_Coll02_Mesh + m_Name: P_Modul_03_Wall04 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &53765509855658434 +--- !u!4 &2361018038986647289 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8369144237683429335} - m_LocalRotation: {x: -0, y: 0.38268274, z: -0, w: 0.9238798} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 7505708664736624404} + m_LocalRotation: {x: -0, y: -0.38268277, z: -0, w: 0.92387986} + m_LocalPosition: {x: -0.0667168, y: -5.3999996, z: -8.526737} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9193494787900633666} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!33 &1878663462347453379 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8369144237683429335} - m_Mesh: {fileID: -4243943295184172444, guid: 3d465231f347dd444ac9d23e66c295ab, type: 3} ---- !u!114 &8369144237683429334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8369144237683429335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4243943295184172444, guid: 3d465231f347dd444ac9d23e66c295ab, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &8421179762802206968 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9193494787900633666} - - component: {fileID: 8421179762802206972} - - component: {fileID: 8421179762802206973} - - component: {fileID: 8421179762802206974} - - component: {fileID: 8421179762802206975} - m_Layer: 0 - m_Name: P_Modul_03_Gate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9193494787900633666 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8421179762802206968} - m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: 0.0032450631, y: -6.2896996, z: 8.510063} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1972904980750525475} - - {fileID: 6325875379380144038} - - {fileID: 53765509855658434} m_Father: {fileID: 1597089622745409744} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!33 &8421179762802206972 + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!33 &2880853987778825722 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8421179762802206968} - m_Mesh: {fileID: 3420798711519054601, guid: 1d8f587f13884244ca170222c888c543, type: 3} ---- !u!23 &8421179762802206973 + m_GameObject: {fileID: 7505708664736624404} + m_Mesh: {fileID: -8589353510179971387, guid: de202dc8511949845bc38ce4881abcd5, type: 3} +--- !u!23 &1687424684969572816 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8421179762802206968} + m_GameObject: {fileID: 7505708664736624404} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -3046,116 +1752,85 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8421179762802206974 +--- !u!114 &4064214062752938674 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8421179762802206968} + m_GameObject: {fileID: 7505708664736624404} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3420798711519054601, guid: 1d8f587f13884244ca170222c888c543, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8421179762802206975 + m_Mass: 2 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 0 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!1 &8421179762802206968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9193494787900633666} + - component: {fileID: 1379013918572560322} + m_Layer: 0 + m_Name: P_Modul_03_Gate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9193494787900633666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8421179762802206968} + m_LocalRotation: {x: 0, y: 0.93108773, z: 0, w: 0.3647955} + m_LocalPosition: {x: 0.1, y: -6.2896996, z: 8.46} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8555071992651472992} + m_Father: {fileID: 1597089622745409744} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 137.21, z: 0} +--- !u!114 &1379013918572560322 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3164,45 +1839,44 @@ MonoBehaviour: m_GameObject: {fileID: 8421179762802206968} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.4 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: + - {fileID: -8654337676499328588, guid: 63f617361451c9e41b881d183d1f84aa, type: 3} + - {fileID: -4243943295184172444, guid: 3d465231f347dd444ac9d23e66c295ab, type: 3} + - {fileID: 4238026182132440352, guid: 1cd63bc5cb6f0994a98c81539471fb89, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &8538119976526668965 GameObject: m_ObjectHideFlags: 0 @@ -3214,8 +1888,7 @@ GameObject: - component: {fileID: 5858475308503470017} - component: {fileID: 3204958158961033842} - component: {fileID: 3858009141547787473} - - component: {fileID: 8538119976526668987} - - component: {fileID: 8538119976526668964} + - component: {fileID: 1186538929330867897} m_Layer: 0 m_Name: P_Modul_03_Wall07 m_TagString: Untagged @@ -3233,6 +1906,7 @@ Transform: m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 6.1532516, y: -5.3999996, z: 5.983277} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1597089622745409744} m_RootOrder: 10 @@ -3287,7 +1961,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8538119976526668987 +--- !u!114 &1186538929330867897 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3296,154 +1970,42 @@ MonoBehaviour: m_GameObject: {fileID: 8538119976526668965} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 6 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.05 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8538119976526668964 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8538119976526668965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 2 - m_LinearDamping: 0.3 - m_AngularDamping: 0.6 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.4 + m_Elasticity: 0.01 + m_LinearSpeedDamping: 0.5 + m_RotSpeedDamping: 1.5 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: + - {fileID: -7103669719878876589, guid: 319ac6faf7cb6774382ba871be6ad1a0, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 0 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 1} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1001 &9077602188154012521 PrefabInstance: m_ObjectHideFlags: 0 @@ -3464,7 +2026,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 17 + value: 17.0788 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -3509,7 +2071,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: P_Modul_03_SpringPovit_1 + value: P_Modul_03_frame_high objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -3544,7 +2106,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: -6 + value: -6.1172 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -3589,7 +2151,7 @@ PrefabInstance: - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_Name - value: P_Modul_03_SpringPovit_0 + value: P_Modul_03_frame_low objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -3598,12 +2160,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &979785190632361840 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 9077602188155347903} - m_PrefabAsset: {fileID: 0} --- !u!4 &8299793328896646219 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_08.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_08.prefab index 722feb48..c14b735f 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_08.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_08.prefab @@ -1,455 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1285258002615886704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4149940593096340776} - - component: {fileID: 2016818615285118039} - - component: {fileID: 1285258002615886707} - m_Layer: 0 - m_Name: P_Modul_08_Col3_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4149940593096340776 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1285258002615886704} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2016818615285118039 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1285258002615886704} - m_Mesh: {fileID: 7548767598197690344, guid: 4180529fe68f904459a2e369995d24aa, type: 3} ---- !u!114 &1285258002615886707 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1285258002615886704} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7548767598197690344, guid: 4180529fe68f904459a2e369995d24aa, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &1906717830887259045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4991326402451874833} - - component: {fileID: 8713211961748621827} - - component: {fileID: 1906717830887259044} - m_Layer: 0 - m_Name: P_Modul_08_Col6_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4991326402451874833 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906717830887259045} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8713211961748621827 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906717830887259045} - m_Mesh: {fileID: -52996367703375614, guid: 80dccfd03f4cb094098569dcea9d8c4c, type: 3} ---- !u!114 &1906717830887259044 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906717830887259045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -52996367703375614, guid: 80dccfd03f4cb094098569dcea9d8c4c, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &2034896816246643564 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8506453148691402462} - - component: {fileID: 9085946943432537519} - - component: {fileID: 2034896816246643567} - m_Layer: 0 - m_Name: P_Modul_08_Col4_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8506453148691402462 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2034896816246643564} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &9085946943432537519 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2034896816246643564} - m_Mesh: {fileID: 1662855321027031501, guid: de769aa08f5b85e43bcf7170aa76432c, type: 3} ---- !u!114 &2034896816246643567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2034896816246643564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1662855321027031501, guid: de769aa08f5b85e43bcf7170aa76432c, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &3564127593018148470 GameObject: m_ObjectHideFlags: 0 @@ -534,156 +84,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &4125029411918045819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7155948661278013948} - - component: {fileID: 5902879354480142237} - - component: {fileID: 4125029411918045818} - m_Layer: 0 - m_Name: P_Modul_08_Col5_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7155948661278013948 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4125029411918045819} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5902879354480142237 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4125029411918045819} - m_Mesh: {fileID: 1579885550048305187, guid: bc7eade5feed1564a9002ff57529dac3, type: 3} ---- !u!114 &4125029411918045818 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4125029411918045819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1579885550048305187, guid: bc7eade5feed1564a9002ff57529dac3, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &4829323935290817531 GameObject: m_ObjectHideFlags: 0 @@ -695,10 +95,8 @@ GameObject: - component: {fileID: 2627139891906442269} - component: {fileID: 8011176449165245927} - component: {fileID: 2307199084284838738} - - component: {fileID: 4829323935290817532} - - component: {fileID: 4829323935290817533} - - component: {fileID: 4829323935290817530} - - component: {fileID: 4829323935290817535} + - component: {fileID: 3396108544480663978} + - component: {fileID: 3969841138521366990} m_Layer: 0 m_Name: P_Modul_08_Schaukel m_TagString: Untagged @@ -717,13 +115,7 @@ Transform: m_LocalPosition: {x: -0, y: -0.7755, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1307240454034145990} - - {fileID: 827577827122287854} - - {fileID: 4149940593096340776} - - {fileID: 8506453148691402462} - - {fileID: 7155948661278013948} - - {fileID: 4991326402451874833} + m_Children: [] m_Father: {fileID: 8454124386684465908} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -778,116 +170,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4829323935290817532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4829323935290817531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3422356328198277670, guid: 8c2f6eb37f80cf943b84f0844ef1b470, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4829323935290817533 +--- !u!114 &3396108544480663978 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -896,67 +179,48 @@ MonoBehaviour: m_GameObject: {fileID: 4829323935290817531} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 10 - m_LinearDamping: 0.4 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.4 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &4829323935290817530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4829323935290817531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 3418509896049905999} - AxisRef: {fileID: 3418509896049905999} - Stabilized: 1 ---- !u!114 &4829323935290817535 + m_Convex: + - {fileID: -7012902916465332716, guid: 0e14fefa25e56354e82c4b51b28be67a, type: 3} + - {fileID: 6044721969224989788, guid: 2ebab27625e9736428cadb763fc9428a, type: 3} + - {fileID: 7548767598197690344, guid: 4180529fe68f904459a2e369995d24aa, type: 3} + - {fileID: 1662855321027031501, guid: de769aa08f5b85e43bcf7170aa76432c, type: 3} + - {fileID: 1579885550048305187, guid: bc7eade5feed1564a9002ff57529dac3, type: 3} + - {fileID: -52996367703375614, guid: 80dccfd03f4cb094098569dcea9d8c4c, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 1.1 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &3969841138521366990 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -965,312 +229,11 @@ MonoBehaviour: m_GameObject: {fileID: 4829323935290817531} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d37bc038a9cc7a47ad3deae0dcf48d4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - Force: 15 - Enable: 0 - ForceRef: {fileID: 0} ---- !u!1 &5370743592680780119 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1307240454034145990} - - component: {fileID: 5672674333022228356} - - component: {fileID: 5370743592680780118} - m_Layer: 0 - m_Name: P_Modul_08_Col1_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1307240454034145990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5370743592680780119} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5672674333022228356 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5370743592680780119} - m_Mesh: {fileID: -7012902916465332716, guid: 0e14fefa25e56354e82c4b51b28be67a, type: 3} ---- !u!114 &5370743592680780118 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5370743592680780119} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7012902916465332716, guid: 0e14fefa25e56354e82c4b51b28be67a, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &7975804093965225187 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 827577827122287854} - - component: {fileID: 1566970323085695329} - - component: {fileID: 7975804093965225186} - m_Layer: 0 - m_Name: P_Modul_08_Col2_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &827577827122287854 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975804093965225187} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2627139891906442269} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1566970323085695329 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975804093965225187} - m_Mesh: {fileID: 6044721969224989788, guid: 2ebab27625e9736428cadb763fc9428a, type: 3} ---- !u!114 &7975804093965225186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975804093965225187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6044721969224989788, guid: 2ebab27625e9736428cadb763fc9428a, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.2 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + HingeRef: {fileID: 5892630108785099380} + Other: {fileID: 0} --- !u!1 &9086229929543805006 GameObject: m_ObjectHideFlags: 0 @@ -1325,76 +288,6 @@ MonoBehaviour: LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_08 LuaPackageName: core LuaInitialVars: - - Type: 16 - Name: P_Modul_08_Schaukel_Force - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 4829323935290817531} - longVal: 0 - stringVal: - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: PhysicsRT.PhysicsForce - Type: 16 Name: P_Modul_08_Schaukel vector2: {x: 0, y: 0} @@ -1464,7 +357,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_08_ForcePovit_1 vector2: {x: 0, y: 0} @@ -1534,7 +427,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: UnityEngine.Transform - Type: 16 Name: P_Modul_08_ForcePovit_2 vector2: {x: 0, y: 0} @@ -1687,18 +580,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &5892630109551717639 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6850545454344409843} - m_PrefabAsset: {fileID: 0} --- !u!1 &3418509895749074492 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} m_PrefabInstance: {fileID: 6850545454344409843} m_PrefabAsset: {fileID: 0} +--- !u!4 &5892630109551717639 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 6850545454344409843} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6850545455112928640 PrefabInstance: m_ObjectHideFlags: 0 @@ -1779,12 +672,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6850545455112928640} m_PrefabAsset: {fileID: 0} ---- !u!1 &3418509896049905999 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6850545455112928640} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6850545455666490699 PrefabInstance: m_ObjectHideFlags: 0 @@ -1859,15 +746,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!4 &5892630110379348671 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6850545455666490699} - m_PrefabAsset: {fileID: 0} --- !u!1 &3418509894388580740 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} m_PrefabInstance: {fileID: 6850545455666490699} m_PrefabAsset: {fileID: 0} +--- !u!4 &5892630110379348671 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, + type: 3} + m_PrefabInstance: {fileID: 6850545455666490699} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_17.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_17.prefab index 175560c2..d3613086 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_17.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_17.prefab @@ -1,197 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &159766660563796951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7879635186772851301} - - component: {fileID: 5436940041721809112} - - component: {fileID: 7469259498615574584} - - component: {fileID: 159766660563796948} - m_Layer: 0 - m_Name: P_Modul_17_Col03_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7879635186772851301 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 159766660563796951} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.02, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6363202737383216336} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5436940041721809112 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 159766660563796951} - m_Mesh: {fileID: -3704878275428407670, guid: bc0c1d0510af6bc4ab50c9eb193c45c6, type: 3} ---- !u!23 &7469259498615574584 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 159766660563796951} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &159766660563796948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 159766660563796951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -3704878275428407670, guid: bc0c1d0510af6bc4ab50c9eb193c45c6, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &1216697006565278208 GameObject: m_ObjectHideFlags: 0 @@ -203,10 +11,9 @@ GameObject: - component: {fileID: 6363202737383216336} - component: {fileID: 9152237965028194978} - component: {fileID: 8777319718865097344} - - component: {fileID: 1216697006565278220} - - component: {fileID: 1216697006565278223} - - component: {fileID: 1216697006565278209} - - component: {fileID: 1216697006565278222} + - component: {fileID: 976000186143089477} + - component: {fileID: 4510872548467807067} + - component: {fileID: 8915453614575428530} m_Layer: 0 m_Name: Modul17_Dreharme m_TagString: Untagged @@ -224,10 +31,8 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -2.99, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4258937835252701686} - - {fileID: 751084068957162832} - - {fileID: 7879635186772851301} + m_ConstrainProportionsScale: 0 + m_Children: [] m_Father: {fileID: 5695318596069911043} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -283,7 +88,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1216697006565278220 +--- !u!114 &976000186143089477 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -292,155 +97,45 @@ MonoBehaviour: m_GameObject: {fileID: 1216697006565278208} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1216937460003702347, guid: 68ae71422298972468d13c1876ab8b1a, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1216697006565278223 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1216697006565278208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 4 - m_LinearDamping: 0.1 - m_AngularDamping: 0.01 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.4 - m_Restitution: 0 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_Mass: 3 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 3 + m_RotSpeedDamping: 0.005 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 0 + m_AutoMassCenter: 1 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &1216697006565278209 + m_Convex: + - {fileID: -8803647446795273781, guid: 14ae4fb8fbc080d4286a8ee77d101608, type: 3} + - {fileID: -7891825441410466291, guid: ed04736e383790f4099a399f35687def, type: 3} + - {fileID: -3704878275428407670, guid: bc0c1d0510af6bc4ab50c9eb193c45c6, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &4510872548467807067 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -449,19 +144,12 @@ MonoBehaviour: m_GameObject: {fileID: 1216697006565278208} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 8770567984129242738} - AxisRef: {fileID: 8770567984129242738} - Stabilized: 0 ---- !u!114 &1216697006565278222 + HingeRef: {fileID: 504823595058455881} + Other: {fileID: 0} +--- !u!114 &8915453614575428530 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -470,18 +158,17 @@ MonoBehaviour: m_GameObject: {fileID: 1216697006565278208} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d04d5e98edbbdd44ca040e617f545102, type: 3} + m_Script: {fileID: 11500000, guid: 0180900f7b300684ca073e031c5d1576, type: 3} m_Name: m_EditorClassIdentifier: - m_PovitA: {fileID: 504823596275925866} - m_PovitB: {fileID: 504823595682621609} - m_DoNotAutoCreateAtAwake: 0 - springStrength: 0.6 - springDamping: 0.9 - springRestLength: 2 - onCompression: 0 - onExtension: 1 - ConnectedBody: {fileID: 0} + Position1Ref: {fileID: 504823595682621609} + Position2Ref: {fileID: 6363202737383216336} + Other: {fileID: 0} + length: 0 + constant: 0.32 + spring_damping: 0.1 + global_damping: 0.1 + use_stiff_spring: 0 --- !u!1 &4918501139308884153 GameObject: m_ObjectHideFlags: 0 @@ -509,6 +196,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 504823595058455881} - {fileID: 504823596275925866} @@ -530,82 +218,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_17 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_17 LuaPackageName: core LuaInitialVars: - - Type: 19 - Name: _PhysicsBodyCustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 0} - longVal: 0 - stringVal: WoodOnlyHit - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: - Type: 16 - Name: _PhysicsBody + Name: Modul17_Dreharme vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -673,7 +291,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -682,390 +300,6 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!1 &6109055792371595642 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4258937835252701686} - - component: {fileID: 8992978094407182102} - - component: {fileID: 2818406765665647285} - - component: {fileID: 6109055792371595643} - m_Layer: 0 - m_Name: P_Modul_17_Col01_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4258937835252701686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6109055792371595642} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.02, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6363202737383216336} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8992978094407182102 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6109055792371595642} - m_Mesh: {fileID: -8803647446795273781, guid: 14ae4fb8fbc080d4286a8ee77d101608, type: 3} ---- !u!23 &2818406765665647285 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6109055792371595642} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6109055792371595643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6109055792371595642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8803647446795273781, guid: 14ae4fb8fbc080d4286a8ee77d101608, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &7650399545436147632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 751084068957162832} - - component: {fileID: 1828115464794246733} - - component: {fileID: 3652983463334190338} - - component: {fileID: 7650399545436147633} - m_Layer: 0 - m_Name: P_Modul_17_Col02_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &751084068957162832 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7650399545436147632} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.02, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6363202737383216336} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1828115464794246733 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7650399545436147632} - m_Mesh: {fileID: -7891825441410466291, guid: ed04736e383790f4099a399f35687def, type: 3} ---- !u!23 &3652983463334190338 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7650399545436147632} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7650399545436147633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7650399545436147632} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7891825441410466291, guid: ed04736e383790f4099a399f35687def, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1001 &708661031313971037 PrefabInstance: m_ObjectHideFlags: 0 @@ -1101,37 +335,37 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: -3.09 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -12.12 + value: -4 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.w - value: 0.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.x - value: -0.5 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.y - value: 0.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalRotation.z - value: 0.5 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -1141,7 +375,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -1196,7 +430,7 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -3 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} @@ -1256,12 +490,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 708661031806016189} m_PrefabAsset: {fileID: 0} ---- !u!1 &8770567984129242738 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 708661031806016189} - m_PrefabAsset: {fileID: 0} --- !u!1001 &708661032713157790 PrefabInstance: m_ObjectHideFlags: 0 @@ -1297,12 +525,12 @@ PrefabInstance: - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.y - value: -2.87 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} propertyPath: m_LocalPosition.z - value: -3.26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab index d26c1a06..b63e7af8 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_18.prefab @@ -266,7 +266,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsPhantom + componentClassVal: Ballance2.Game.TiggerTester - Type: 16 Name: P_Modul_18_Rotor vector2: {x: 0, y: 0} @@ -615,7 +615,7 @@ MonoBehaviour: intVal: 0 doubleVal: 0 boolVal: 0 - floatVal: 50 + floatVal: 0.1 componentClassVal: UnityEngine.AudioSource LuaPublicVars: [] ExecuteOrder: 0 @@ -635,7 +635,8 @@ GameObject: m_Component: - component: {fileID: 8986970877920006922} - component: {fileID: 6326045603744362818} - - component: {fileID: 3197264412200521023} + - component: {fileID: 8742445457673812954} + - component: {fileID: 3619324921323826245} m_Layer: 0 m_Name: P_Modul_18_Kollisionsquader m_TagString: Untagged @@ -666,7 +667,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3197264412200521020} m_Mesh: {fileID: 1745261108831346517, guid: 6f489ebf196d0e14eb79ba3cce04a787, type: 3} ---- !u!114 &3197264412200521023 +--- !u!65 &8742445457673812954 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3197264412200521020} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 16, z: 2} + m_Center: {x: 0, y: 8, z: 0} +--- !u!114 &3619324921323826245 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -675,15 +689,9 @@ MonoBehaviour: m_GameObject: {fileID: 3197264412200521020} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4479bf253979e394d9f9525083d66d81, type: 3} + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} m_Name: m_EditorClassIdentifier: - m_Type: 0 - m_Min: {x: -1.00002, y: -0.0010509491, z: -0.99999905} - m_Max: {x: 1, y: 13.05, z: 1.06721} - m_Layer: 7 - m_EnableListener: 1 - m_DoNotAutoCreateAtAwake: 1 --- !u!1 &5484142357838056765 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_19.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_19.prefab index 8007dae2..7733f440 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_19.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_19.prefab @@ -47,12 +47,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_19 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_19 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody + Name: _P_Modul_19_Flaps vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -120,77 +120,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBodyCustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 1258189836623470669} - longVal: 0 - stringVal: Wood - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -199,199 +129,6 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!1 &354438144324771152 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7311197564076413953} - - component: {fileID: 8280430453476545255} - - component: {fileID: 7073152805084912690} - - component: {fileID: 354438144324771167} - m_Layer: 0 - m_Name: P_Modul_19_Col2_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7311197564076413953 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 354438144324771152} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8991330501278220766} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8280430453476545255 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 354438144324771152} - m_Mesh: {fileID: 188355067430909471, guid: 75768168d84bb574289f8b8d73b6ee80, type: 3} ---- !u!23 &7073152805084912690 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 354438144324771152} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &354438144324771167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 354438144324771152} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 188355067430909471, guid: 75768168d84bb574289f8b8d73b6ee80, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &1258189836623470669 GameObject: m_ObjectHideFlags: 0 @@ -403,9 +140,8 @@ GameObject: - component: {fileID: 8991330501278220766} - component: {fileID: 562714495000184498} - component: {fileID: 5048703637658393344} - - component: {fileID: 1258189836623470666} - - component: {fileID: 1258189836623470667} - - component: {fileID: 1258189836623470668} + - component: {fileID: 8699541932385134275} + - component: {fileID: 33178032297181733} m_Layer: 0 m_Name: P_Modul_19_Flaps m_TagString: Untagged @@ -426,10 +162,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8966504896123604458} - - {fileID: 5783366179003512229} - - {fileID: 7311197564076413953} - - {fileID: 3350596793075500018} - - {fileID: 425932499226121245} m_Father: {fileID: 660782468591241965} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -484,7 +216,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1258189836623470666 +--- !u!114 &8699541932385134275 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -493,155 +225,46 @@ MonoBehaviour: m_GameObject: {fileID: 1258189836623470669} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2214625615688077367, guid: 059b825d906e22142867b53583b53885, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1258189836623470667 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1258189836623470669} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 6 - m_LinearDamping: 1 - m_AngularDamping: 0.75 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 3 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 0.05 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: -2, y: 2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &1258189836623470668 + m_Convex: + - {fileID: 2850605203211501103, guid: fefa538582fccf047bbb33b01ab8d598, type: 3} + - {fileID: 188355067430909471, guid: 75768168d84bb574289f8b8d73b6ee80, type: 3} + - {fileID: -6623321993765504928, guid: d19c8bc63ae856b4e9a00badc6c5f80a, type: 3} + - {fileID: 5482444415042236898, guid: 687b2492f0701ea4091d3512887d9d1f, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &33178032297181733 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -650,18 +273,11 @@ MonoBehaviour: m_GameObject: {fileID: 1258189836623470669} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 3349958259146136828} - AxisRef: {fileID: 3349958259146136828} - Stabilized: 0 + HingeRef: {fileID: 5821850537197604807} + Other: {fileID: 0} --- !u!1 &2029249011480546106 GameObject: m_ObjectHideFlags: 0 @@ -745,585 +361,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &4728173293286670601 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3350596793075500018} - - component: {fileID: 4340108292781484429} - - component: {fileID: 1897808479128352392} - - component: {fileID: 4728173293286670600} - m_Layer: 0 - m_Name: P_Modul_19_Col3_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3350596793075500018 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728173293286670601} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8991330501278220766} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4340108292781484429 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728173293286670601} - m_Mesh: {fileID: -6623321993765504928, guid: d19c8bc63ae856b4e9a00badc6c5f80a, type: 3} ---- !u!23 &1897808479128352392 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728173293286670601} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4728173293286670600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4728173293286670601} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -6623321993765504928, guid: d19c8bc63ae856b4e9a00badc6c5f80a, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &8955681766470606339 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5783366179003512229} - - component: {fileID: 990550180493381435} - - component: {fileID: 6429755166458439080} - - component: {fileID: 8955681766470606338} - m_Layer: 0 - m_Name: P_Modul_19_Col1_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5783366179003512229 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8955681766470606339} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8991330501278220766} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &990550180493381435 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8955681766470606339} - m_Mesh: {fileID: 2850605203211501103, guid: fefa538582fccf047bbb33b01ab8d598, type: 3} ---- !u!23 &6429755166458439080 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8955681766470606339} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8955681766470606338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8955681766470606339} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 2850605203211501103, guid: fefa538582fccf047bbb33b01ab8d598, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &9082810735753610010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 425932499226121245} - - component: {fileID: 3876574284973981958} - - component: {fileID: 7958521829116211873} - - component: {fileID: 9082810735753610009} - m_Layer: 0 - m_Name: P_Modul_19_Col4_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &425932499226121245 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082810735753610010} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8991330501278220766} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3876574284973981958 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082810735753610010} - m_Mesh: {fileID: 5482444415042236898, guid: 687b2492f0701ea4091d3512887d9d1f, type: 3} ---- !u!23 &7958521829116211873 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082810735753610010} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9082810735753610009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082810735753610010} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5482444415042236898, guid: 687b2492f0701ea4091d3512887d9d1f, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1001 &6782292539544236083 PrefabInstance: m_ObjectHideFlags: 0 @@ -1419,9 +456,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6782292539544236083} m_PrefabAsset: {fileID: 0} ---- !u!1 &3349958259146136828 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6782292539544236083} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_25.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_25.prefab index 710fd4eb..6e1a0640 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_25.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_25.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4055629901672316584 +--- !u!1 &3359908843130858345 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2477785742751772852} - - component: {fileID: 7903838410053410242} - - component: {fileID: 3302121033234606251} + - component: {fileID: 5644919657473319195} + - component: {fileID: 1261931350422454234} + - component: {fileID: 7507816846676505152} m_Layer: 0 - m_Name: P_Modul_25_Col02_Mesh + m_Name: P_Modul_25_Innern m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2477785742751772852 +--- !u!4 &5644919657473319195 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4055629901672316584} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0.244, y: 0.36, z: -0.48000002} + m_GameObject: {fileID: 3359908843130858345} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 747190270621256938} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!33 &7903838410053410242 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.751} +--- !u!33 &1261931350422454234 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4055629901672316584} - m_Mesh: {fileID: 3475938936441067762, guid: 34e5d387ee87b544a9d25c26271cd5db, type: 3} ---- !u!23 &3302121033234606251 + m_GameObject: {fileID: 3359908843130858345} + m_Mesh: {fileID: -8382662882444581071, guid: 117475e1e53b56d47abeb77948380144, type: 3} +--- !u!23 &7507816846676505152 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4055629901672316584} - m_Enabled: 0 + m_GameObject: {fileID: 3359908843130858345} + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -61,7 +61,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 2100000, guid: d06e5bbd4a00a744b8560249a0694fdc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -176,11 +176,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 747190270621256938} - - component: {fileID: 6601820574366180137} - - component: {fileID: 6291076237613613620} - - component: {fileID: 6199908085955943669} - - component: {fileID: 6199908085955943670} - - component: {fileID: 6199908085955943671} + - component: {fileID: 4446373734406223580} + - component: {fileID: 3744220032845777227} m_Layer: 0 m_Name: P_Modul_25_Bridge m_TagString: Untagged @@ -195,176 +192,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6199908085955943664} - m_LocalRotation: {x: -0, y: -0, z: 0.024009038, w: 0.9997118} + m_LocalRotation: {x: 0.0006292737, y: 0.9999998, z: -0, w: 0} m_LocalPosition: {x: 0.66, y: -0.27, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2477785742751772852} - - {fileID: 7577880784453235717} + - {fileID: 5644919657473319195} m_Father: {fileID: 7341197199698023375} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.751} ---- !u!33 &6601820574366180137 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6199908085955943664} - m_Mesh: {fileID: -8382662882444581071, guid: 117475e1e53b56d47abeb77948380144, type: 3} ---- !u!23 &6291076237613613620 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6199908085955943664} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d06e5bbd4a00a744b8560249a0694fdc, type: 2} - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6199908085955943669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6199908085955943664} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0.028766997, y: 2.26, z: 0.02262497} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8382662882444581071, guid: 117475e1e53b56d47abeb77948380144, - type: 3} - m_ShapeSize: {x: 0.49992, y: 9.572652, z: 4.99999} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6199908085955943670 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0.072} +--- !u!114 &4446373734406223580 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -373,46 +210,44 @@ MonoBehaviour: m_GameObject: {fileID: 6199908085955943664} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 8 - m_LinearDamping: 0.9 - m_AngularDamping: 0.9 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: -0.2, y: -2, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 3 m_Friction: 0.7 - m_Restitution: 0.7 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 1 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 0.05 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0.8, y: 4, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &6199908085955943671 + m_Convex: + - {fileID: -2951738009949183512, guid: 81e918b3550124346a9c90a26535912a, type: 3} + - {fileID: 3475938936441067762, guid: 34e5d387ee87b544a9d25c26271cd5db, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &3744220032845777227 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -421,101 +256,11 @@ MonoBehaviour: m_GameObject: {fileID: 6199908085955943664} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 1821969949505725794} - AxisRef: {fileID: 1821969949505725794} - Stabilized: 1 ---- !u!1 &7577880784453235718 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7577880784453235717} - - component: {fileID: 2926281001030434873} - - component: {fileID: 8606389304637198357} - m_Layer: 0 - m_Name: P_Modul_25_Col01_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7577880784453235717 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577880784453235718} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 747190270621256938} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &2926281001030434873 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577880784453235718} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &8606389304637198357 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577880784453235718} - m_Mesh: {fileID: -2951738009949183512, guid: 81e918b3550124346a9c90a26535912a, type: 3} + HingeRef: {fileID: 7493672546855269977} + Other: {fileID: 0} --- !u!1 &7974462452713097589 GameObject: m_ObjectHideFlags: 0 @@ -564,82 +309,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_25 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_25 LuaPackageName: core LuaInitialVars: - - Type: 19 - Name: _PhysicsBodyCustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 0} - longVal: 0 - stringVal: Wood - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: - Type: 16 - Name: _PhysicsBody + Name: P_Modul_25_Bridge vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -707,7 +382,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -805,12 +480,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &1821969949505725794 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 7577880785485810093} - m_PrefabAsset: {fileID: 0} --- !u!4 &7493672546855269977 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_26.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_26.prefab index 48334c50..e404007a 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_26.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_26.prefab @@ -27,6 +27,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7138933054777598040} - {fileID: 7138933054782988447} @@ -55,76 +56,6 @@ MonoBehaviour: LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_26 LuaPackageName: core LuaInitialVars: - - Type: 16 - Name: P_Modul_26_SackForce - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 4720757091097104454} - longVal: 0 - stringVal: - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: PhysicsRT.PhysicsForce - Type: 16 Name: P_Modul_26_Sack vector2: {x: 0, y: 0} @@ -194,7 +125,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: UnityEngine.Transform - Type: 16 Name: P_Modul_26_Rope vector2: {x: 0, y: 0} @@ -264,7 +195,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: P_Modul_26_ForcePovit_1 vector2: {x: 0, y: 0} @@ -424,9 +355,8 @@ GameObject: - component: {fileID: 728204130983642822} - component: {fileID: 4135105443492435076} - component: {fileID: 6483662213058012585} - - component: {fileID: 1670388088102070900} - - component: {fileID: 1670388088102070898} - - component: {fileID: 1670388088102070899} + - component: {fileID: 5004559645206456640} + - component: {fileID: 2173612990033805644} m_Layer: 0 m_Name: P_Modul_26_Rope m_TagString: Untagged @@ -444,6 +374,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 8.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246129280946670888} m_RootOrder: 5 @@ -467,6 +398,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -497,7 +429,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1670388088102070900 +--- !u!114 &5004559645206456640 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -506,155 +438,42 @@ MonoBehaviour: m_GameObject: {fileID: 1670388088102070897} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6618313056370992711, guid: da34f3d2e6799e743a17ba5685f534fd, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1670388088102070898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1670388088102070897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 1 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 4 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 0 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul26 - m_SubSystemId: 1 + m_EnableConstantForce: 1 + m_Layer: 4 + m_SystemGroupName: + m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &1670388088102070899 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &2173612990033805644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -663,17 +482,11 @@ MonoBehaviour: m_GameObject: {fileID: 1670388088102070897} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c223b31efe9416348ab7543f174f4d1a, type: 3} + m_Script: {fileID: 11500000, guid: 1498114d555159047a304ac754f52cd7, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2136037406620398435} - Stabilized: 1 + JointPositionRef: {fileID: 7138933054777598040} + Other: {fileID: 0} --- !u!1 &4720757091097104454 GameObject: m_ObjectHideFlags: 0 @@ -685,10 +498,8 @@ GameObject: - component: {fileID: 4418426618083220119} - component: {fileID: 1773975331166908804} - component: {fileID: 3576496210181990669} - - component: {fileID: 4720757091097104473} - - component: {fileID: 4720757091097104472} - - component: {fileID: 4720757091097104455} - - component: {fileID: 4720757091097104474} + - component: {fileID: 3916882267904110189} + - component: {fileID: 4530675803302717031} m_Layer: 0 m_Name: P_Modul_26_Sack m_TagString: Untagged @@ -706,6 +517,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.54, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246129280946670888} m_RootOrder: 6 @@ -729,6 +541,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -759,7 +572,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4720757091097104473 +--- !u!114 &3916882267904110189 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -768,175 +581,42 @@ MonoBehaviour: m_GameObject: {fileID: 4720757091097104454} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -1942693896849172255, guid: 003a917db6cea72499ef3558e32c2ed7, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4720757091097104472 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4720757091097104454} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 10 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 4 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul26 - m_SubSystemId: 2 - m_SubSystemDontCollideWith: 1 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &4720757091097104455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4720757091097104454} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c223b31efe9416348ab7543f174f4d1a, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 1670388088102070898} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2136037406619235236} - Stabilized: 1 ---- !u!114 &4720757091097104474 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0.25 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &4530675803302717031 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -945,12 +625,11 @@ MonoBehaviour: m_GameObject: {fileID: 4720757091097104454} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d37bc038a9cc7a47ad3deae0dcf48d4, type: 3} + m_Script: {fileID: 11500000, guid: 1498114d555159047a304ac754f52cd7, type: 3} m_Name: m_EditorClassIdentifier: - Force: 10 - Enable: 0 - ForceRef: {fileID: 0} + JointPositionRef: {fileID: 7138933054782988447} + Other: {fileID: 5004559645206456640} --- !u!1 &5208700743225701326 GameObject: m_ObjectHideFlags: 0 @@ -979,6 +658,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0, y: 14.94, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246129280946670888} m_RootOrder: 4 @@ -1002,6 +682,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1222,12 +903,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &2136037406620398435 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 7910081111811973036} - m_PrefabAsset: {fileID: 0} --- !u!4 &7138933054777598040 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, @@ -1323,12 +998,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &2136037406619235236 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 7910081111825719147} - m_PrefabAsset: {fileID: 0} --- !u!4 &7138933054782988447 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_29.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_29.prefab index 35cab17e..9b669219 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_29.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_29.prefab @@ -137,7 +137,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte02 vector2: {x: 0, y: 0} @@ -207,7 +207,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte03 vector2: {x: 0, y: 0} @@ -277,7 +277,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte04 vector2: {x: 0, y: 0} @@ -347,7 +347,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte05 vector2: {x: 0, y: 0} @@ -417,7 +417,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte06 vector2: {x: 0, y: 0} @@ -487,7 +487,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte07 vector2: {x: 0, y: 0} @@ -557,7 +557,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: UnityEngine.Transform - Type: 16 Name: _P_Modul_29_Platte08 vector2: {x: 0, y: 0} @@ -627,7 +627,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte09 vector2: {x: 0, y: 0} @@ -697,7 +697,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 Name: _P_Modul_29_Platte05_HingeConstraint vector2: {x: 0, y: 0} @@ -767,7 +767,77 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.HingeConstraint + componentClassVal: BallancePhysics.Wapper.PhysicsHinge + - Type: 16 + Name: _P_Modul_29_Platte05_Tigger + vector2: {x: 0, y: 0} + vector2Int: {x: 0, y: 0} + vector3: {x: 0, y: 0, z: 0} + vector3Int: {x: 0, y: 0, z: 0} + vector4: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + rectInt: + x: 0 + y: 0 + width: 0 + height: 0 + gradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0, g: 0, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + layer: 0 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + color: {r: 0, g: 0, b: 0, a: 0} + boundsInt: + m_Position: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 0} + bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + objectVal: {fileID: 0} + gameObjectVal: {fileID: 3545022162283518167} + longVal: 0 + stringVal: + intVal: 0 + doubleVal: 0 + boolVal: 0 + floatVal: 0 + componentClassVal: Ballance2.Game.TiggerTester LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -787,9 +857,8 @@ GameObject: - component: {fileID: 7949043794388033046} - component: {fileID: 4548222663218127741} - component: {fileID: 6960336805530723521} - - component: {fileID: 3034983379820020140} - - component: {fileID: 3034983379820020143} - - component: {fileID: 3034983379820020142} + - component: {fileID: 3080507752115830481} + - component: {fileID: 5812873663588909182} m_Layer: 0 m_Name: P_Modul_29_Platte08 m_TagString: Untagged @@ -862,116 +931,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3034983379820020140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3034983379820020137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4587695435977987248, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3034983379820020143 +--- !u!114 &3080507752115830481 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -980,46 +940,42 @@ MonoBehaviour: m_GameObject: {fileID: 3034983379820020137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 8 - m_SubSystemDontCollideWith: 7 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3034983379820020142 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &5812873663588909182 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1028,18 +984,11 @@ MonoBehaviour: m_GameObject: {fileID: 3034983379820020137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 6450528011212008912} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682075887469942} - AxisRef: {fileID: 2868682075887469942} - Stabilized: 1 + HingeRef: {fileID: 6447382632934381133} + Other: {fileID: 145396544862412620} --- !u!1 &3043836787372207806 GameObject: m_ObjectHideFlags: 0 @@ -1051,9 +1000,8 @@ GameObject: - component: {fileID: 5280135014971197077} - component: {fileID: 6509945283345384634} - component: {fileID: 8318939878884196376} - - component: {fileID: 3043836787372207805} - - component: {fileID: 3043836787372207804} - - component: {fileID: 3043836787372207807} + - component: {fileID: 7271629087133587478} + - component: {fileID: 8659139698616826889} m_Layer: 0 m_Name: P_Modul_29_Platte01 m_TagString: Untagged @@ -1126,7 +1074,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3043836787372207805 +--- !u!114 &7271629087133587478 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1135,155 +1083,42 @@ MonoBehaviour: m_GameObject: {fileID: 3043836787372207806} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4930504063765610783, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3043836787372207804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3043836787372207806} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.86 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3043836787372207807 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &8659139698616826889 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1292,18 +1127,11 @@ MonoBehaviour: m_GameObject: {fileID: 3043836787372207806} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 2868682075763163826} - AxisRef: {fileID: 2868682075763163826} - Stabilized: 1 + HingeRef: {fileID: 6447382632794345865} + Other: {fileID: 0} --- !u!1 &3181741057578549275 GameObject: m_ObjectHideFlags: 0 @@ -1315,10 +1143,9 @@ GameObject: - component: {fileID: 851879129684111688} - component: {fileID: 96989778711022527} - component: {fileID: 6212936393874646266} - - component: {fileID: 3181741057578549279} - - component: {fileID: 3181741057578549278} - - component: {fileID: 3181741057578549273} - - component: {fileID: 3181741057578549272} + - component: {fileID: 4166006348506072238} + - component: {fileID: 2149460211439712856} + - component: {fileID: 3844603922849414036} m_Layer: 0 m_Name: P_Modul_29_Platte09 m_TagString: Untagged @@ -1391,7 +1218,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3181741057578549279 +--- !u!114 &4166006348506072238 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1400,155 +1227,42 @@ MonoBehaviour: m_GameObject: {fileID: 3181741057578549275} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -2258872700817327373, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3181741057578549278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3181741057578549275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 9 - m_SubSystemDontCollideWith: 8 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3181741057578549273 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &2149460211439712856 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1557,19 +1271,12 @@ MonoBehaviour: m_GameObject: {fileID: 3181741057578549275} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 3034983379820020143} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 3 - PovitRef: {fileID: 2868682076508068970} - AxisRef: {fileID: 2868682076508068970} - Stabilized: 1 ---- !u!114 &3181741057578549272 + HingeRef: {fileID: 6447382632313720657} + Other: {fileID: 3080507752115830481} +--- !u!114 &3844603922849414036 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1578,18 +1285,11 @@ MonoBehaviour: m_GameObject: {fileID: 3181741057578549275} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682075772668781} - AxisRef: {fileID: 2868682075772668781} - Stabilized: 0 + HingeRef: {fileID: 6447382632784975958} + Other: {fileID: 0} --- !u!1 &3545022162283518167 GameObject: m_ObjectHideFlags: 0 @@ -1601,9 +1301,10 @@ GameObject: - component: {fileID: 4364059290672560472} - component: {fileID: 3262997178361973562} - component: {fileID: 6409598800407760482} - - component: {fileID: 3545022162283518186} - - component: {fileID: 3545022162283518165} - - component: {fileID: 3545022162283518164} + - component: {fileID: 4551029262522626547} + - component: {fileID: 6328000014295885528} + - component: {fileID: 2674659347039449080} + - component: {fileID: 607939325575627115} m_Layer: 0 m_Name: P_Modul_29_Platte05 m_TagString: Untagged @@ -1676,7 +1377,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3545022162283518186 +--- !u!114 &4551029262522626547 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1685,107 +1386,42 @@ MonoBehaviour: m_GameObject: {fileID: 3545022162283518167} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 4460532491877653029, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &3545022162283518165 + m_Mass: 0.5 + m_Friction: 0.7 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} + m_DoNotAutoCreateAtAwake: 1 + m_AutoMassCenter: 0 + m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &6328000014295885528 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1794,46 +1430,25 @@ MonoBehaviour: m_GameObject: {fileID: 3545022162283518167} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 1 - m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 - m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 5 - m_SubSystemDontCollideWith: 4 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3545022162283518164 + HingeRef: {fileID: 6447382632868710233} + Other: {fileID: 3877864624815323852} +--- !u!65 &2674659347039449080 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3545022162283518167} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.7886739, y: 4.980875, z: 0.9834811} + m_Center: {x: -0.84370303, y: 0.046387672, z: 0.19174078} +--- !u!114 &607939325575627115 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1842,18 +1457,9 @@ MonoBehaviour: m_GameObject: {fileID: 3545022162283518167} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 6904479661856741769} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682075957335138} - AxisRef: {fileID: 2868682075957335138} - Stabilized: 1 --- !u!1 &5347548698452703295 GameObject: m_ObjectHideFlags: 0 @@ -1865,9 +1471,8 @@ GameObject: - component: {fileID: 6824411470818143780} - component: {fileID: 1798715629528865533} - component: {fileID: 4974317197468863001} - - component: {fileID: 5347548698452703282} - - component: {fileID: 5347548698452703293} - - component: {fileID: 5347548698452703292} + - component: {fileID: 7725679425181895336} + - component: {fileID: 7296719509269902859} m_Layer: 0 m_Name: P_Modul_29_Platte03 m_TagString: Untagged @@ -1940,116 +1545,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5347548698452703282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5347548698452703295} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 3327263387201802683, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &5347548698452703293 +--- !u!114 &7725679425181895336 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2058,46 +1554,42 @@ MonoBehaviour: m_GameObject: {fileID: 5347548698452703295} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 3 - m_SubSystemDontCollideWith: 2 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &5347548698452703292 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &7296719509269902859 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2106,18 +1598,11 @@ MonoBehaviour: m_GameObject: {fileID: 5347548698452703295} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 8620718251662660979} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682075910011708} - AxisRef: {fileID: 2868682075910011708} - Stabilized: 1 + HingeRef: {fileID: 6447382632848910343} + Other: {fileID: 3528046648502154204} --- !u!1 &6161002987506172945 GameObject: m_ObjectHideFlags: 0 @@ -2129,9 +1614,8 @@ GameObject: - component: {fileID: 2220000172929702839} - component: {fileID: 3669872204323384877} - component: {fileID: 1725117998913392031} - - component: {fileID: 6161002987506172948} - - component: {fileID: 6161002987506172951} - - component: {fileID: 6161002987506172950} + - component: {fileID: 3368745932583408540} + - component: {fileID: 4366482094980822261} m_Layer: 0 m_Name: P_Modul_29_Platte06 m_TagString: Untagged @@ -2204,7 +1688,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6161002987506172948 +--- !u!114 &3368745932583408540 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2213,155 +1697,42 @@ MonoBehaviour: m_GameObject: {fileID: 6161002987506172945} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -7088239758470072792, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6161002987506172951 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6161002987506172945} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 6 - m_SubSystemDontCollideWith: 5 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &6161002987506172950 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &4366482094980822261 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2370,18 +1741,11 @@ MonoBehaviour: m_GameObject: {fileID: 6161002987506172945} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 3545022162283518165} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682077207909806} - AxisRef: {fileID: 2868682077207909806} - Stabilized: 1 + HingeRef: {fileID: 6447382632083736213} + Other: {fileID: 4551029262522626547} --- !u!1 &6450528011212008914 GameObject: m_ObjectHideFlags: 0 @@ -2393,9 +1757,8 @@ GameObject: - component: {fileID: 8704728728051003463} - component: {fileID: 2650068545692182760} - component: {fileID: 5428495172111785416} - - component: {fileID: 6450528011212008913} - - component: {fileID: 6450528011212008912} - - component: {fileID: 6450528011212008915} + - component: {fileID: 145396544862412620} + - component: {fileID: 6491900820383711757} m_Layer: 0 m_Name: P_Modul_29_Platte07 m_TagString: Untagged @@ -2468,7 +1831,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6450528011212008913 +--- !u!114 &145396544862412620 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2477,155 +1840,42 @@ MonoBehaviour: m_GameObject: {fileID: 6450528011212008914} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5907490696153250157, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6450528011212008912 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6450528011212008914} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 7 - m_SubSystemDontCollideWith: 6 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &6450528011212008915 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &6491900820383711757 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2634,18 +1884,11 @@ MonoBehaviour: m_GameObject: {fileID: 6450528011212008914} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 6161002987506172951} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682076632836698} - AxisRef: {fileID: 2868682076632836698} - Stabilized: 1 + HingeRef: {fileID: 6447382632461564257} + Other: {fileID: 3368745932583408540} --- !u!1 &6904479661856741771 GameObject: m_ObjectHideFlags: 0 @@ -2657,9 +1900,8 @@ GameObject: - component: {fileID: 7967530967063934866} - component: {fileID: 7945448228244630501} - component: {fileID: 7625698969353904796} - - component: {fileID: 6904479661856741774} - - component: {fileID: 6904479661856741769} - - component: {fileID: 6904479661856741768} + - component: {fileID: 3877864624815323852} + - component: {fileID: 7289402197740133293} m_Layer: 0 m_Name: P_Modul_29_Platte04 m_TagString: Untagged @@ -2732,116 +1974,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6904479661856741774 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904479661856741771} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5179381327160100884, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &6904479661856741769 +--- !u!114 &3877864624815323852 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2850,46 +1983,42 @@ MonoBehaviour: m_GameObject: {fileID: 6904479661856741771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 4 - m_SubSystemDontCollideWith: 3 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &6904479661856741768 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &7289402197740133293 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2898,18 +2027,11 @@ MonoBehaviour: m_GameObject: {fileID: 6904479661856741771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 5347548698452703293} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682076603168119} - AxisRef: {fileID: 2868682076603168119} - Stabilized: 1 + HingeRef: {fileID: 6447382632424023628} + Other: {fileID: 7725679425181895336} --- !u!1 &8620718251662660989 GameObject: m_ObjectHideFlags: 0 @@ -2921,9 +2043,8 @@ GameObject: - component: {fileID: 2937849317648394010} - component: {fileID: 5943717118666692950} - component: {fileID: 4131909126250940689} - - component: {fileID: 8620718251662660976} - - component: {fileID: 8620718251662660979} - - component: {fileID: 8620718251662660978} + - component: {fileID: 3528046648502154204} + - component: {fileID: 2449901260692587957} m_Layer: 0 m_Name: P_Modul_29_Platte02 m_TagString: Untagged @@ -2996,116 +2117,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8620718251662660976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8620718251662660989} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -8462845987386878973, guid: 326d107ffef1d2e47a8497f54e96fc3d, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &8620718251662660979 +--- !u!114 &3528046648502154204 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3114,46 +2126,42 @@ MonoBehaviour: m_GameObject: {fileID: 8620718251662660989} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 0.3 - m_LinearDamping: 1 - m_AngularDamping: 0.8 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 0.5 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.3 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 - m_SystemGroupName: P_Modul29 - m_SubSystemId: 2 - m_SubSystemDontCollideWith: 1 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &8620718251662660978 + m_EnableConstantForce: 1 + m_Layer: 3 + m_SystemGroupName: + m_SubSystemId: 0 + m_SubSystemDontCollideWith: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &2449901260692587957 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3162,18 +2170,11 @@ MonoBehaviour: m_GameObject: {fileID: 8620718251662660989} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 3043836787372207804} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 2868682076192469078} - AxisRef: {fileID: 2868682076192469078} - Stabilized: 1 + HingeRef: {fileID: 6447382633103319917} + Other: {fileID: 7271629087133587478} --- !u!1001 &6317812842215016085 PrefabInstance: m_ObjectHideFlags: 0 @@ -3269,12 +2270,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812842215016085} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682076632836698 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812842215016085} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812842253539768 PrefabInstance: m_ObjectHideFlags: 0 @@ -3370,12 +2365,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812842253539768} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682076603168119 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812842253539768} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812842344050853 PrefabInstance: m_ObjectHideFlags: 0 @@ -3471,12 +2460,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812842344050853} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682076508068970 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812842344050853} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812842709629281 PrefabInstance: m_ObjectHideFlags: 0 @@ -3572,12 +2555,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812842709629281} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682077207909806 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812842709629281} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812843704032409 PrefabInstance: m_ObjectHideFlags: 0 @@ -3667,12 +2644,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &2868682076192469078 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812843704032409} - m_PrefabAsset: {fileID: 0} --- !u!4 &6447382633103319917 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, @@ -3768,12 +2739,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &2868682075957335138 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812843939756205} - m_PrefabAsset: {fileID: 0} --- !u!4 &6447382632868710233 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, @@ -3875,12 +2840,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812843978627059} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682075910011708 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812843978627059} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812844005419449 PrefabInstance: m_ObjectHideFlags: 0 @@ -3976,12 +2935,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812844005419449} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682075887469942 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812844005419449} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812844157970338 PrefabInstance: m_ObjectHideFlags: 0 @@ -4077,12 +3030,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812844157970338} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682075772668781 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812844157970338} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6317812844167343741 PrefabInstance: m_ObjectHideFlags: 0 @@ -4178,9 +3125,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6317812844167343741} m_PrefabAsset: {fileID: 0} ---- !u!1 &2868682075763163826 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 6317812844167343741} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_30.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_30.prefab index 0ac3fb5d..d41acf71 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_30.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_30.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 2951630886305554587} - component: {fileID: 7494032362282961839} - component: {fileID: 4577269511767769472} - - component: {fileID: 7280261033448493563} - - component: {fileID: 4446698301898842111} - - component: {fileID: 7231980243574484430} + - component: {fileID: 8320369250106636185} + - component: {fileID: 3554287636586585490} m_Layer: 0 m_Name: P_Modul_30_Wippe m_TagString: Untagged @@ -32,9 +31,7 @@ Transform: m_LocalPosition: {x: 0, y: 4.54, z: 0.38} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 283215269894236929} - - {fileID: 4691744929600720628} + m_Children: [] m_Father: {fileID: 6447641878197080472} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} @@ -89,115 +86,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7280261033448493563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 281133962125953534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &4446698301898842111 +--- !u!114 &8320369250106636185 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -206,46 +95,42 @@ MonoBehaviour: m_GameObject: {fileID: 281133962125953534} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 4 - m_LinearDamping: 0.7 - m_AngularDamping: 0.7 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 3 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -1, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &7231980243574484430 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &3554287636586585490 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -254,168 +139,11 @@ MonoBehaviour: m_GameObject: {fileID: 281133962125953534} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 7557556198609043695} - AxisRef: {fileID: 7557556198609043695} - Stabilized: 0 ---- !u!1 &4141845177163849300 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 283215269894236929} - - component: {fileID: 5348883450691866492} - - component: {fileID: 1406421442918532593} - m_Layer: 0 - m_Name: P_Modul_30_Col2_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &283215269894236929 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4141845177163849300} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2951630886305554587} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!33 &5348883450691866492 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4141845177163849300} - m_Mesh: {fileID: -6767502768494131842, guid: cde0b9a9c8ecc9e4e97b42f9a2f07ebf, type: 3} ---- !u!114 &1406421442918532593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4141845177163849300} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -6767502768494131842, guid: cde0b9a9c8ecc9e4e97b42f9a2f07ebf, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + HingeRef: {fileID: 1610030459934921684} + Other: {fileID: 0} --- !u!1 &5922638731943004962 GameObject: m_ObjectHideFlags: 0 @@ -463,12 +191,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_30 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_30 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody + Name: P_Modul_30_Wippe vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -536,77 +264,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBodyCustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 0} - longVal: 0 - stringVal: Wood - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -615,156 +273,6 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!1 &6792756490961398027 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4691744929600720628} - - component: {fileID: 4595885529959644420} - - component: {fileID: 4668864393842306727} - m_Layer: 0 - m_Name: P_Modul_30_Col1_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4691744929600720628 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6792756490961398027} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2951630886305554587} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!33 &4595885529959644420 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6792756490961398027} - m_Mesh: {fileID: 1122359797296144349, guid: 888b8cc21de41a54795f84865ecabee2, type: 3} ---- !u!114 &4668864393842306727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6792756490961398027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1122359797296144349, guid: 888b8cc21de41a54795f84865ecabee2, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1001 &1766307409086557216 PrefabInstance: m_ObjectHideFlags: 0 @@ -854,12 +362,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &7557556198609043695 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 1766307409086557216} - m_PrefabAsset: {fileID: 0} --- !u!4 &1610030459934921684 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_34.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_34.prefab index b397cc5a..71f6a02c 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_34.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_34.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 1544983484691587417} - component: {fileID: 3370889170497664138} - component: {fileID: 2944372322470959804} - - component: {fileID: 1547696244558699950} - - component: {fileID: 1547696244558699937} - - component: {fileID: 1547696244558699936} + - component: {fileID: 4026384979101584906} + - component: {fileID: 2681816587247716894} m_Layer: 0 m_Name: P_Modul_34_Schiebestein m_TagString: Untagged @@ -31,6 +30,7 @@ Transform: m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0.099995084, y: 2.296629, z: 7.70001} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3742572976002767231} m_RootOrder: 1 @@ -86,7 +86,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1547696244558699950 +--- !u!114 &4026384979101584906 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -95,155 +95,42 @@ MonoBehaviour: m_GameObject: {fileID: 1547696244558699939} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0.00000011920929} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -1799730409127487345, guid: b759e736e23a1d745abd0d14c718d695, - type: 3} - m_ShapeSize: {x: 5, y: 5, z: 5} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1547696244558699937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547696244558699939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 1 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.2 - m_Restitution: 0.2 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Mass: 1.6 + m_Friction: 0.5 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &1547696244558699936 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &2681816587247716894 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -252,32 +139,19 @@ MonoBehaviour: m_GameObject: {fileID: 1547696244558699939} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b4dbf91eabc0cd4d9821807996e50ad, type: 3} + m_Script: {fileID: 11500000, guid: efb668054c1bb70428b8bba9f606dbfb, type: 3} m_Name: m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - motorEnable: 0 - motorSpring: 0 - motorTau: 0.2 - motorDamping: 0.2 - motorProportionalRecoveryVelocity: 0 - motorConstantRecoveryVelocity: 0 - motorMinForce: -1000000 - motorMaxForce: 1000000 - motorSpringConstant: 0 - motorSpringDamping: 0.3 - PovitRef: {fileID: 5439690376818900071} - AxisRef: {fileID: 5439690376818900071} - AllowRotationAroundAxis: 0 - MaxLinearLimit: 100 - MinLinearLimit: -1000 - MaxFrictionForce: 0 - Stabilized: 0 + HingeRef: {fileID: 3876340260299911004} + Other: {fileID: 0} + force_factor: 1 + damp_factor: 1 + translation_limit: -1 + translation_freedom_min: {x: 0, y: -1000, z: 0} + translation_freedom_max: {x: 0, y: 2, z: 0} + rotation_limit: -1 + rotation_freedom_min: {x: 0, y: 0, z: 0} + rotation_freedom_max: {x: 0, y: 0, z: 0} --- !u!1 &4088031401384821701 GameObject: m_ObjectHideFlags: 0 @@ -287,7 +161,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3742572976002767231} - - component: {fileID: 4088031401384821698} + - component: {fileID: 1265756604937260245} m_Layer: 0 m_Name: P_Modul_34 m_TagString: Untagged @@ -305,6 +179,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1340682548826285024} - {fileID: 1544983484691587417} @@ -312,7 +187,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4088031401384821698 +--- !u!114 &1265756604937260245 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -325,12 +200,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulComplexPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics + LuaClassName: P_Modul_34 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_34 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody1 + Name: P_Modul_34_Kiste vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -398,9 +273,9 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject - Type: 16 - Name: _PhysicsBody2 + Name: P_Modul_34_Schiebestein vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -468,147 +343,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBody1CustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 1547696244558699939} - longVal: 0 - stringVal: WoodOnlyHit - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBody2CustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 1547696244558699939} - longVal: 0 - stringVal: StoneOnlyHit - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -628,8 +363,7 @@ GameObject: - component: {fileID: 1340682548826285024} - component: {fileID: 64751018227865034} - component: {fileID: 8218973542042741009} - - component: {fileID: 9175142106070903125} - - component: {fileID: 9175142106070903124} + - component: {fileID: 244039996087373597} m_Layer: 0 m_Name: P_Modul_34_Kiste m_TagString: Untagged @@ -647,6 +381,7 @@ Transform: m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0.1, y: -2.48, z: 7.7} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3742572976002767231} m_RootOrder: 0 @@ -701,116 +436,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9175142106070903125 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9175142106070903127} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 0 - m_Wrap: 0 - m_Translation: {x: 0.00000023841858, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 7411692749374158494, guid: b759e736e23a1d745abd0d14c718d695, - type: 3} - m_ShapeSize: {x: 4.1000094, y: 5.00001, z: 4.10001} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &9175142106070903124 +--- !u!114 &244039996087373597 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -819,45 +445,41 @@ MonoBehaviour: m_GameObject: {fileID: 9175142106070903127} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 1.4 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Friction: 0.8 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 + m_Convex: [] + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1001 &4260216111779074216 PrefabInstance: m_ObjectHideFlags: 0 @@ -932,12 +554,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &5439690376818900071 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 4260216111779074216} - m_PrefabAsset: {fileID: 0} --- !u!4 &3876340260299911004 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_37.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_37.prefab index 1575e32e..628af574 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_37.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_37.prefab @@ -1,154 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &691376735117222927 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 711581024349902535} - - component: {fileID: 8592631656688532822} - - component: {fileID: 7514913175826555871} - m_Layer: 0 - m_Name: P_Modul_37_Col3_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &711581024349902535 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691376735117222927} - m_LocalRotation: {x: -0, y: -0, z: 0.73702484, w: 0.67586565} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4567841462488385421} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 94.957} ---- !u!33 &8592631656688532822 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691376735117222927} - m_Mesh: {fileID: 19879252792930867, guid: 8f07e1e6c0617ca4081d8133aef95084, type: 3} ---- !u!114 &7514913175826555871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691376735117222927} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 19879252792930867, guid: 8f07e1e6c0617ca4081d8133aef95084, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &1492302497173472440 GameObject: m_ObjectHideFlags: 0 @@ -176,6 +27,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4375599455759497020} - {fileID: 2888782134201703091} @@ -196,12 +48,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_37 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_37 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody + Name: P_Modul_37_Bridge vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -269,77 +121,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody - - Type: 19 - Name: _PhysicsBodyCustomLayerName - vector2: {x: 0, y: 0} - vector2Int: {x: 0, y: 0} - vector3: {x: 0, y: 0, z: 0} - vector3Int: {x: 0, y: 0, z: 0} - vector4: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - rectInt: - x: 0 - y: 0 - width: 0 - height: 0 - gradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 0} - key1: {r: 0, g: 0, b: 0, a: 0} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - layer: 0 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 0 - m_PostInfinity: 0 - m_RotationOrder: 0 - color: {r: 0, g: 0, b: 0, a: 0} - boundsInt: - m_Position: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 0} - bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - objectVal: {fileID: 0} - gameObjectVal: {fileID: 0} - longVal: 0 - stringVal: Wood - intVal: 0 - doubleVal: 0 - boolVal: 0 - floatVal: 0 - componentClassVal: + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 @@ -348,7 +130,7 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!1 &2608105092011936980 +--- !u!1 &5169076336936455540 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -356,349 +138,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4686515268450111997} - - component: {fileID: 2877216701745026474} - - component: {fileID: 5511783765709092681} + - component: {fileID: 2792643299739615104} + - component: {fileID: 6862517499741416432} + - component: {fileID: 2423920737814934042} m_Layer: 0 - m_Name: P_Modul_37_Col2_Mesh + m_Name: P_Modul_37_Inner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4686515268450111997 +--- !u!4 &2792643299739615104 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608105092011936980} - m_LocalRotation: {x: -0, y: -0, z: 0.73702484, w: 0.67586565} + m_GameObject: {fileID: 5169076336936455540} + m_LocalRotation: {x: -0, y: -0, z: -0.7376902, w: 0.6751395} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4567841462488385421} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 94.957} ---- !u!33 &2877216701745026474 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608105092011936980} - m_Mesh: {fileID: -4870499123545912079, guid: 3d038c0b272484745afb9fd237dc5212, type: 3} ---- !u!114 &5511783765709092681 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608105092011936980} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: -4870499123545912079, guid: 3d038c0b272484745afb9fd237dc5212, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &5125829824297040220 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2562419408171806274} - - component: {fileID: 5628518174447688384} - - component: {fileID: 7135925194131141644} - m_Layer: 0 - m_Name: P_Modul_37_Col1_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2562419408171806274 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5125829824297040220} - m_LocalRotation: {x: -0, y: -0, z: 0.73702484, w: 0.67586565} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4567841462488385421} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 94.957} ---- !u!33 &5628518174447688384 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5125829824297040220} - m_Mesh: {fileID: 1587107040414998238, guid: c9f2b69d08b6d954eb7284dfc9e666f6, type: 3} ---- !u!114 &7135925194131141644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5125829824297040220} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 1587107040414998238, guid: c9f2b69d08b6d954eb7284dfc9e666f6, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!1 &6585032716200381305 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4567841462488385421} - - component: {fileID: 1591608805075725924} - - component: {fileID: 1935724158298242311} - - component: {fileID: 3564311588978284975} - - component: {fileID: 1354728446636124616} - - component: {fileID: 3672895640771305073} - m_Layer: 0 - m_Name: P_Modul_37_Bridge - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4567841462488385421 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6585032716200381305} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: -0.62, z: -2.38} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 711581024349902535} - - {fileID: 4686515268450111997} - - {fileID: 2562419408171806274} - m_Father: {fileID: 2305396171214183938} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!33 &1591608805075725924 + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -95.07} +--- !u!33 &6862517499741416432 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6585032716200381305} + m_GameObject: {fileID: 5169076336936455540} m_Mesh: {fileID: 8037077636543364025, guid: dfa6831f8ba67d249af625060c9d1247, type: 3} ---- !u!23 &1935724158298242311 +--- !u!23 &2423920737814934042 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6585032716200381305} + m_GameObject: {fileID: 5169076336936455540} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -739,116 +218,40 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3564311588978284975 -MonoBehaviour: +--- !u!1 &6585032716200381305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4567841462488385421} + - component: {fileID: 6362523778513650073} + m_Layer: 0 + m_Name: P_Modul_37_Bridge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4567841462488385421 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6585032716200381305} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 8037077636543364025, guid: dfa6831f8ba67d249af625060c9d1247, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0.1 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &1354728446636124616 + m_LocalRotation: {x: 0.5215839, y: 0.47744137, z: 0.5215839, w: 0.47744137} + m_LocalPosition: {x: 0, y: -0.62, z: -2.38} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2792643299739615104} + m_Father: {fileID: 2305396171214183938} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 95.06} +--- !u!114 &6362523778513650073 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -857,66 +260,44 @@ MonoBehaviour: m_GameObject: {fileID: 6585032716200381305} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 - m_Mass: 5 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + m_Mass: 3 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 1 + m_LinearSpeedDamping: 1 + m_RotSpeedDamping: 0.05 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 1 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: 0, z: 7} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 1 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &3672895640771305073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6585032716200381305} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 4760146458239427591} - AxisRef: {fileID: 4760146458239427591} - Stabilized: 0 + m_Convex: + - {fileID: 1587107040414998238, guid: c9f2b69d08b6d954eb7284dfc9e666f6, type: 3} + - {fileID: -4870499123545912079, guid: 3d038c0b272484745afb9fd237dc5212, type: 3} + - {fileID: 19879252792930867, guid: 8f07e1e6c0617ca4081d8133aef95084, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} --- !u!1 &8720527757265271298 GameObject: m_ObjectHideFlags: 0 @@ -945,6 +326,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 1.72, y: -0.76000005, z: -2.3700001} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2305396171214183938} m_RootOrder: 1 @@ -1090,12 +472,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f475f423afed2541a7d63c9bbb4d3bd, type: 3} ---- !u!1 &4760146458239427591 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8098310408283778255, guid: 4f475f423afed2541a7d63c9bbb4d3bd, - type: 3} - m_PrefabInstance: {fileID: 3633724933431593160} - m_PrefabAsset: {fileID: 0} --- !u!4 &4375599455759497020 stripped Transform: m_CorrespondingSourceObject: {fileID: 1068713305201475572, guid: 4f475f423afed2541a7d63c9bbb4d3bd, diff --git a/Assets/Game/Prefabs/Moduls/P_Modul_41.prefab b/Assets/Game/Prefabs/Moduls/P_Modul_41.prefab index 0fc98e3e..6298685b 100644 --- a/Assets/Game/Prefabs/Moduls/P_Modul_41.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Modul_41.prefab @@ -1,155 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &156987329909318322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5372450855172200386} - - component: {fileID: 2099707057860609850} - - component: {fileID: 7722415224039978406} - m_Layer: 0 - m_Name: P_Modul_41_Col2_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5372450855172200386 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156987329909318322} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1428344847360094067} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2099707057860609850 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156987329909318322} - m_Mesh: {fileID: 6040926733592199060, guid: 6ffaadd79e8e15943ad1fc53617a3c8b, type: 3} ---- !u!114 &7722415224039978406 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156987329909318322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 6040926733592199060, guid: 6ffaadd79e8e15943ad1fc53617a3c8b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 --- !u!1 &532564757385279225 GameObject: m_ObjectHideFlags: 0 @@ -161,10 +11,8 @@ GameObject: - component: {fileID: 1428344847360094067} - component: {fileID: 1267259389763058216} - component: {fileID: 92742590042865978} - - component: {fileID: 6162266460056150054} - - component: {fileID: 7897783774307904185} - - component: {fileID: 8008962344678728515} - - component: {fileID: 1093887169059870059} + - component: {fileID: 48551462267755232} + - component: {fileID: 1925733634671447876} m_Layer: 0 m_Name: P_Modul_41 m_TagString: Untagged @@ -183,9 +31,7 @@ Transform: m_LocalPosition: {x: 0, y: -1.3513, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5372450855172200386} - - {fileID: 917808464230196809} + m_Children: [] m_Father: {fileID: 4716446892905613495} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -241,115 +87,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6162266460056150054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 532564757385279225} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShapeType: 8 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 0} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 ---- !u!114 &7897783774307904185 +--- !u!114 &48551462267755232 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -358,46 +96,44 @@ MonoBehaviour: m_GameObject: {fileID: 532564757385279225} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79fa0ed245b7514ba47c4268200698e, type: 3} + m_Script: {fileID: 11500000, guid: 6e6108379294ece4d9a6b90635da294b, type: 3} m_Name: m_EditorClassIdentifier: - m_MotionType: 0 - m_CollidableQualityType: -1 m_Mass: 1 - m_LinearDamping: 0.1 - m_AngularDamping: 0.1 - m_InitialLinearVelocity: {x: 0, y: 0, z: 0} - m_InitialAngularVelocity: {x: 0, y: 0, z: 0} - m_GravityFactor: 1 - m_CenterOfMass: {x: 0, y: -5, z: 0} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 m_Friction: 0.7 - m_Restitution: 0.4 - m_Layer: 3 - m_InertiaTensor1: {x: 1, y: 0, z: 0} - m_InertiaTensor2: {x: 0, y: 1, z: 0} - m_InertiaTensor3: {x: 0, y: 0, z: 1} - m_MaxAngularVelocity: 200 - m_MaxLinearVelocity: 200 - m_IsTigger: 0 - m_AddContactListener: 0 + m_Elasticity: 0.4 + m_LinearSpeedDamping: 0.1 + m_RotSpeedDamping: 0.1 + m_BallRadius: 1 + m_UseBall: 0 + m_EnableConvexHull: 1 + m_EnableCollision: 1 + m_StartFrozen: 0 + m_Fixed: 0 + m_ShiftMassCenter: {x: 0, y: -2, z: 0} m_DoNotAutoCreateAtAwake: 1 - m_AutoComputeCenterOfMass: 0 + m_AutoMassCenter: 0 m_AutoControlActive: 1 + m_EnableConstantForce: 1 + m_Layer: 3 m_SystemGroupName: m_SubSystemId: 0 m_SubSystemDontCollideWith: 0 - DeactiveWhenLeaveBroadphase: 1 - CustomLayer: 0 ---- !u!114 &8008962344678728515 + m_Convex: + - {fileID: 6040926733592199060, guid: 6ffaadd79e8e15943ad1fc53617a3c8b, type: 3} + - {fileID: 5095160933795409093, guid: cd791ad4459f66247875aece92deaa21, type: 3} + m_Concave: [] + m_SurfaceName: + m_UseExistsSurface: 1 + m_ExtraRadius: 0.1 + m_EnableGravity: 1 + m_EnableCollisionEvent: 0 + m_CollisionEventCallSleep: 0 + m_CustomLayer: 0 + m_StaticConstantForceDirection: {x: 0, y: 0, z: 0} + m_StaticConstantForce: 0 + m_ConstantForceDirectionRef: {fileID: 0} +--- !u!114 &1925733634671447876 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -406,186 +142,11 @@ MonoBehaviour: m_GameObject: {fileID: 532564757385279225} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d05685e4a97c9745acfbb2696068b2b, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 ---- !u!114 &1093887169059870059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 532564757385279225} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2566324f701ea2e41bb694b3e64c92f4, type: 3} - m_Name: - m_EditorClassIdentifier: - ConnectedBody: {fileID: 0} - m_Breakable: 0 - m_Threshold: 10 - m_MaximumAngularImpulse: 1000 - m_MaximumLinearImpulse: 1000 - m_Priority: 1 - PovitRef: {fileID: 8003119241594540879} - AxisRef: {fileID: 8003119241594540879} - Stabilized: 0 ---- !u!1 &5175540620301412028 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 917808464230196809} - - component: {fileID: 4711295904827819370} - - component: {fileID: 5840982075262976391} - m_Layer: 0 - m_Name: P_Modul_41_Col1_Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &917808464230196809 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5175540620301412028} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1428344847360094067} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4711295904827819370 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5175540620301412028} - m_Mesh: {fileID: 5095160933795409093, guid: 7fbba63418fac9d4c907fdda7216ef9b, type: 3} ---- !u!114 &5840982075262976391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5175540620301412028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28c05039a7674a348b345b6c2bc08bf3, type: 3} + m_Script: {fileID: 11500000, guid: 93cc7725d0a74d848864661940657974, type: 3} m_Name: m_EditorClassIdentifier: - m_ShapeType: 5 - m_Wrap: 0 - m_Translation: {x: 0, y: 0, z: 0} - m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 1, y: 1, z: 1} - m_CustomTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 - m_ShapeMesh: {fileID: 5095160933795409093, guid: 7fbba63418fac9d4c907fdda7216ef9b, - type: 3} - m_ShapeSize: {x: 1, y: 1, z: 1} - m_ShapeRadius: 0.5 - m_ShapeConvexRadius: 0 - m_ShapeHeight: 1 - m_ShapeSideCount: 32 - m_MinimumSkinnedVertexWeight: 0.1 - m_BelongsToCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CollidesWithCategories: - Layer00: 1 - Layer01: 1 - Layer02: 1 - Layer03: 1 - Layer04: 1 - Layer05: 1 - Layer06: 1 - Layer07: 1 - Layer08: 1 - Layer09: 1 - Layer10: 1 - Layer11: 1 - Layer12: 1 - Layer13: 1 - Layer14: 1 - Layer15: 1 - Layer16: 1 - Layer17: 1 - Layer18: 1 - Layer19: 1 - Layer20: 1 - Layer21: 1 - Layer22: 1 - Layer23: 1 - Layer24: 1 - Layer25: 1 - Layer26: 1 - Layer27: 1 - Layer28: 1 - Layer29: 1 - Layer30: 1 - Layer31: 1 - m_CustomMaterialTags: - Tag00: 0 - Tag01: 0 - Tag02: 0 - Tag03: 0 - Tag04: 0 - Tag05: 0 - Tag06: 0 - Tag07: 0 + HingeRef: {fileID: 1271956772986814580} + Other: {fileID: 0} --- !u!1 &5350276191139009037 GameObject: m_ObjectHideFlags: 0 @@ -633,12 +194,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: - LuaClassName: ModulSingalPhysics - LuaFileName: Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics + LuaClassName: P_Modul_41 + LuaFileName: Assets/Game/Scripts/Moduls/P_Modul_41 LuaPackageName: core LuaInitialVars: - Type: 16 - Name: _PhysicsBody + Name: P_Modul_41_Box vector2: {x: 0, y: 0} vector2Int: {x: 0, y: 0} vector3: {x: 0, y: 0, z: 0} @@ -706,7 +267,7 @@ MonoBehaviour: doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsBody + componentClassVal: BallancePhysics.Wapper.PhysicsObject LuaPublicVars: [] ExecuteOrder: 0 CreateStore: 0 diff --git a/Assets/Game/Prefabs/Moduls/P_Trafo_Paper.prefab b/Assets/Game/Prefabs/Moduls/P_Trafo_Paper.prefab index dddaad34..3f1380ff 100644 --- a/Assets/Game/Prefabs/Moduls/P_Trafo_Paper.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Trafo_Paper.prefab @@ -27,10 +27,10 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3344258905931326625} - {fileID: 5417238459909725823} - - {fileID: 365916251523862570} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -113,14 +113,14 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 365916251523862569} + gameObjectVal: {fileID: 6684867353911723141} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsPhantom + componentClassVal: Ballance2.Game.TiggerTester - Type: 19 Name: _TargetBallType vector2: {x: 0, y: 0} @@ -269,55 +269,6 @@ MonoBehaviour: ManualInputScript: 0 UpdateDelta: 0 FixUpdateDelta: 0 ---- !u!1 &365916251523862569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 365916251523862570} - - component: {fileID: 365916251523862571} - m_Layer: 0 - m_Name: P_Trafo_Paper_Tigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &365916251523862570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365916251523862569} - 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: 365916250524178757} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &365916251523862571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365916251523862569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4479bf253979e394d9f9525083d66d81, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Type: 0 - m_Min: {x: -2, y: 0, z: -2} - m_Max: {x: 2, y: 1, z: 2} - m_Layer: 8 - m_EnableListener: 1 - m_DoNotAutoCreateAtAwake: 0 --- !u!1 &5726748937027950348 GameObject: m_ObjectHideFlags: 0 @@ -346,6 +297,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365916250524178757} m_RootOrder: 1 @@ -369,6 +321,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -410,6 +363,8 @@ GameObject: - component: {fileID: 3344258905931326625} - component: {fileID: 2083946596759162704} - component: {fileID: 2840934663894311805} + - component: {fileID: 1469589099434979581} + - component: {fileID: 8745170190370485299} m_Layer: 0 m_Name: P_Trafo_Paper_MF m_TagString: Untagged @@ -427,6 +382,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365916250524178757} m_RootOrder: 0 @@ -450,6 +406,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -481,3 +438,28 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &1469589099434979581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6684867353911723141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &8745170190370485299 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6684867353911723141} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.9317, y: 4.931701, z: 0.48350623} + m_Center: {x: 0, y: 0, z: 0.233249} diff --git a/Assets/Game/Prefabs/Moduls/P_Trafo_Stone.prefab b/Assets/Game/Prefabs/Moduls/P_Trafo_Stone.prefab index 7a4b4c56..0f5d0514 100644 --- a/Assets/Game/Prefabs/Moduls/P_Trafo_Stone.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Trafo_Stone.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 4563521970223823415} - component: {fileID: 5902649918193914021} - component: {fileID: 831865546933478610} + - component: {fileID: 7071287740308974624} + - component: {fileID: 2976840918208467118} m_Layer: 0 m_Name: P_Trafo_Stone_MF m_TagString: Untagged @@ -28,6 +30,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7057552714626735241} m_RootOrder: 0 @@ -51,6 +54,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -82,55 +86,31 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1864736132333901760 -GameObject: +--- !u!65 &7071287740308974624 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 595222683819502499} - - component: {fileID: 635626843890909938} - m_Layer: 0 - m_Name: P_Trafo_Stone_Tigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &595222683819502499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1864736132333901760} - 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: 7057552714626735241} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &635626843890909938 + m_GameObject: {fileID: 275325326541823740} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.9317, y: 4.931701, z: 0.48350623} + m_Center: {x: 0, y: 0, z: 0.233249} +--- !u!114 &2976840918208467118 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1864736132333901760} + m_GameObject: {fileID: 275325326541823740} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4479bf253979e394d9f9525083d66d81, type: 3} + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} m_Name: m_EditorClassIdentifier: - m_Type: 0 - m_Min: {x: -2, y: 0, z: -2} - m_Max: {x: 2, y: 1, z: 2} - m_Layer: 8 - m_EnableListener: 1 - m_DoNotAutoCreateAtAwake: 0 --- !u!1 &6730452989418452412 GameObject: m_ObjectHideFlags: 0 @@ -159,6 +139,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7057552714626735241} m_RootOrder: 1 @@ -182,6 +163,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -239,10 +221,10 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4563521970223823415} - {fileID: 5055773060514588723} - - {fileID: 595222683819502499} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -325,14 +307,14 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 1864736132333901760} + gameObjectVal: {fileID: 275325326541823740} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsPhantom + componentClassVal: Ballance2.Game.TiggerTester - Type: 19 Name: _TargetBallType vector2: {x: 0, y: 0} diff --git a/Assets/Game/Prefabs/Moduls/P_Trafo_Wood.prefab b/Assets/Game/Prefabs/Moduls/P_Trafo_Wood.prefab index 2265defe..4d2e47e4 100644 --- a/Assets/Game/Prefabs/Moduls/P_Trafo_Wood.prefab +++ b/Assets/Game/Prefabs/Moduls/P_Trafo_Wood.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8781644155923059489} m_RootOrder: 1 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -81,55 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1582759092785838662 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2575107690896148615} - - component: {fileID: 855547890389223858} - m_Layer: 0 - m_Name: P_Trafo_Wood_Tigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2575107690896148615 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1582759092785838662} - 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: 8781644155923059489} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &855547890389223858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1582759092785838662} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4479bf253979e394d9f9525083d66d81, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Type: 0 - m_Min: {x: -2, y: 0, z: -2} - m_Max: {x: 2, y: 1, z: 2} - m_Layer: 8 - m_EnableListener: 1 - m_DoNotAutoCreateAtAwake: 0 --- !u!1 &2101929513231851765 GameObject: m_ObjectHideFlags: 0 @@ -141,6 +94,8 @@ GameObject: - component: {fileID: 2823335692352821111} - component: {fileID: 1630831757045384699} - component: {fileID: 2674016415471115395} + - component: {fileID: 467250762087925665} + - component: {fileID: 4354455814670347025} m_Layer: 0 m_Name: P_Trafo_Wood_MF m_TagString: Untagged @@ -158,6 +113,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8781644155923059489} m_RootOrder: 0 @@ -181,6 +137,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -212,6 +169,31 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &467250762087925665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2101929513231851765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a9b1c55d1172884488b14c092689dbd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &4354455814670347025 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2101929513231851765} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.9317, y: 4.931701, z: 0.48350623} + m_Center: {x: 0, y: 0, z: 0.233249} --- !u!1 &8364104576429199987 GameObject: m_ObjectHideFlags: 0 @@ -239,10 +221,10 @@ Transform: m_LocalRotation: {x: 0.008726558, y: 0, z: 0, w: 0.999962} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2823335692352821111} - {fileID: 5395828124237932668} - - {fileID: 2575107690896148615} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 1, y: 0, z: 0} @@ -325,14 +307,14 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} objectVal: {fileID: 0} - gameObjectVal: {fileID: 1582759092785838662} + gameObjectVal: {fileID: 2101929513231851765} longVal: 0 stringVal: intVal: 0 doubleVal: 0 boolVal: 0 floatVal: 0 - componentClassVal: PhysicsRT.PhysicsPhantom + componentClassVal: Ballance2.Game.TiggerTester - Type: 19 Name: _TargetBallType vector2: {x: 0, y: 0} diff --git a/Assets/Game/Scripts/Data/GamePhysBall.lua b/Assets/Game/Scripts/Data/GamePhysBall.lua index 9f97e383..ff9bf66f 100644 --- a/Assets/Game/Scripts/Data/GamePhysBall.lua +++ b/Assets/Game/Scripts/Data/GamePhysBall.lua @@ -1,13 +1,97 @@ +---@class GamePhysBallData +---@field Force number +---@field Friction number +---@field Elasticity number +---@field Mass number +---@field LinearDamp number +---@field RotDamp number +---@field PiecesMinForce number +---@field PiecesMaxForce number +---@field PiecesPhysicsData table 碎片的物理化参数 +---@field UpForce number +---@field BallRadius number 球半径。如果为0则使用convex mesh +---@field DownForce number +GamePhysBallData = {} + ---游戏球物理参数 ----@deprecated 物理参数不再写在这里 +---子属性名称为球的名字 +---@type GamePhysBallData[] GamePhysBall = { BallWood = { - Force = 0 + Force = 0.43, + Friction = 0.8, + Elasticity = 0.2, + Mass = 1.9, + LinearDamp = 0.9, + RotDamp = 0.1, + PiecesPhysicsData = { + Friction = 2, + Elasticty = 1, + Mass = 0.2, + LinearDamp = 0.3, + RotDamp = 0.2, + }, + PiecesMinForce = 1.5, + PiecesMaxForce = 3.0, + UpForce = 0.6, + DownForce = 0.3, + BallRadius = 2, }, BallStone = { - Force = 0 + Force = 0.92, + Friction = 0.5, + Elasticity = 0.1, + Mass = 10, + LinearDamp = 0.3, + RotDamp = 0.1, + PiecesPhysicsData = { + Friction = 0.8, + Elasticty = 1, + Mass = 0.8, + LinearDamp = 0.3, + RotDamp = 0.2, + }, + PiecesMinForce = 4, + PiecesMaxForce = 9, + UpForce = 1.9, + DownForce = 0.05, + BallRadius = 2, }, BallPaper = { - Force = 0 + Force = 0.065, + Friction = 0.5, + Elasticity = 0.4, + Mass = 0.2, + LinearDamp = 1.5, + RotDamp = 0.1, + PiecesPhysicsData = { + Elasticty = 1, + LinearDamp = 6, + RotDamp = 0.5, + }, + PiecesMinForce = 0.5, + PiecesMaxForce = 1.3, + UpForce = 0.08, + DownForce = 0.01, + BallRadius = 0, }, -} \ No newline at end of file +} + +--[[ + +如何添加自己的球物理参数： +请在注册球之前插入物理参数，BallName是你的球名称，与注册球时的名称一致： +GamePhysBall['BallName'] = { + Force = 0.065, + Friction = 0.5, + Elasticity = 0.4, + Mass = 0.2, + LinearDamp = 1.5, + RotDamp = 0.1, + PiecesMinForce = 0.1, + PiecesMaxForce = 0.1, + UpForce = 0.1, + DownForce = 0.01, +}; + +]]-- \ No newline at end of file diff --git a/Assets/Game/Scripts/Data/GamePhysFloor.lua b/Assets/Game/Scripts/Data/GamePhysFloor.lua index df03ba55..2eb5aed1 100644 --- a/Assets/Game/Scripts/Data/GamePhysFloor.lua +++ b/Assets/Game/Scripts/Data/GamePhysFloor.lua @@ -2,22 +2,22 @@ GamePhysFloor = { Phys_Floors = { Friction = 0.7, - Restitution = 0.3, + Elasticity = 0.3, Layer = GameLayers.LAYER_PHY_FLOOR }, Phys_FloorWoods = { Friction = 0.7, - Restitution = 0.3, + Elasticity = 0.3, Layer = GameLayers.LAYER_PHY_FLOOR_WOODS }, Phys_FloorRails = { Friction = 0.7, - Restitution = 0.3, + Elasticity = 0.3, Layer = GameLayers.LAYER_PHY_FLOOR_RAIL }, Phys_FloorStopper = { Friction = 0.7, - Restitution = 0.3, + Elasticity = 0.3, Layer = GameLayers.LAYER_PHY_FLOOR_STOPPER }, } \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/BallLightningSphere.lua b/Assets/Game/Scripts/GamePlay/BallLightningSphere.lua index c21ba362..8e1cf1f1 100644 --- a/Assets/Game/Scripts/GamePlay/BallLightningSphere.lua +++ b/Assets/Game/Scripts/GamePlay/BallLightningSphere.lua @@ -49,7 +49,7 @@ BallLightningSphere = { } ---@return BallLightningSphere -function CreateClass_BallLightningSphere() +function CreateClass:BallLightningSphere() function BallLightningSphere:new(o) o = o or {} diff --git a/Assets/Game/Scripts/GamePlay/BallManager.lua b/Assets/Game/Scripts/GamePlay/BallManager.lua index 4970353a..4cdd2e65 100644 --- a/Assets/Game/Scripts/GamePlay/BallManager.lua +++ b/Assets/Game/Scripts/GamePlay/BallManager.lua @@ -51,7 +51,7 @@ BallControlStatus = { local BallRegStorage = { name = '', ball = nil, ---@type Ball - rigidbody = nil, ---@type PhysicsBody + rigidbody = nil, ---@type PhysicsObject } ---球管理器 @@ -93,6 +93,12 @@ function BallManager:new() ---当前激活的球 currentBall = nil, ---@type BallRegStorage currentActiveBall = nil, ---@type BallRegStorage + currentBallPushIds = { + left = 0, + right = 0, + forward = 0, + back = 0, + }, keyListener = nil, ---@type KeyListener ---控制按键设置 keySets = { @@ -182,11 +188,7 @@ function BallManager:OnDestroy() self._private.GameSettings:UnRegisterSettingsUpdateCallback(self._private.settingsCallbackId) self._private.keyListener:ClearKeyListen() end -function BallManager:FixedUpdate() - if self.CanControll then - self.CurrentBall:Push(self.PushType) - end -end + --[[ function BallManager:OnGUI() if(self._DebugMode) then @@ -228,15 +230,36 @@ function BallManager:RegisterBall(name, gameObject) return end - --检查是否添加了刚体组件 - local body = gameObject:GetComponent(PhysicsRT.PhysicsBody) ---@type PhysicsBody - if(body == nil) then - GameErrorChecker.SetLastErrorAndLog(GameError.ParamNotFound, TAG, 'Not fuoud PhysicsBody on Ball {0} , please add it before call RegisterBall', { name }) + --添加刚体组件 + local body = gameObject:AddComponent(BallancePhysics.Wapper.PhysicsObject) ---@type PhysicsObject + --查找物理参数 + local physicsData = GamePhysBall[name] + if(physicsData == nil) then + GameErrorChecker.SetLastErrorAndLog(GameError.ParamNotFound, TAG, 'Not fuoud GamePhysBall data for Ball {0} , please add it before call RegisterBall', { name }) return end + body.DoNotAutoCreateAtAwake = true + --设置物理参数 + body.Fixed = false + body.Mass = physicsData.Mass + if physicsData.BallRadius >= 0 then + body.UseBall = true + body.BallRadius = physicsData.BallRadius + else + body.UseBall = false + end + body.Friction = physicsData.Friction + body.Elasticity = physicsData.Elasticity + body.RotSpeedDamping = physicsData.RotDamp + body.LinearSpeedDamping = physicsData.LinearDamp + body.EnableCollision = true + + --设置恒力 + body.ConstantForceDirectionRef = GamePlay.CamManager.CamDirectionRef + body.EnableConstantForce = false --添加刚体的接触事件，为球声音做准备 - body.AddContactListener = true + body.EnableCollisionEvent = true --添加速度计 local speedMeter = gameObject:GetComponent(SpeedMeter) ---@type SpeedMeter if(speedMeter == nil) then @@ -244,15 +267,32 @@ function BallManager:RegisterBall(name, gameObject) speedMeter.Enabled = true end - local ball = GameLuaObjectHost.GetLuaClassFromGameObject(gameObject) + local ball = GameLuaObjectHost.GetLuaClassFromGameObject(gameObject) ---@type Ball if(ball == nil) then GameErrorChecker.SetLastErrorAndLog(GameError.ClassNotFound, TAG, 'Not found Ball class on {0} !', { name }) + return end + local pieces = ball:GetPieces() + --设置球相关物理参数 + ball._PiecesPhysicsData = physicsData.PiecesPhysicsData + --设置推动物理参数 + ball._PiecesMinForce = physicsData.PiecesMinForce + ball._PiecesMaxForce = physicsData.PiecesMaxForce + ball._Force = physicsData.Force + ball._UpForce = physicsData.UpForce + ball._DownForce = physicsData.DownForce if(pieces ~= nil) then ObjectStateBackupUtils.BackUpObjectAndChilds(pieces) --备份碎片的状态 end + --还需要设置一个Unity的碰撞器，用于死亡区的检测 + local collder = gameObject:AddComponent(UnityEngine.SphereCollider) ---@type SphereCollider + collder.radius = physicsData.BallRadius or 2 + local rigidbody = gameObject:AddComponent(UnityEngine.Rigidbody) ---@type Rigidbody + rigidbody.isKinematic = true + rigidbody.useGravity = false + --设置名称 if(gameObject.name ~= name) then gameObject.name = name end @@ -321,10 +361,6 @@ function BallManager:SetControllingStatus(status) self:_FlushCurrentBallAllStatus() end end ----重新恢复 LockMode 之前的速度值 -function BallManager:RestoreCurrentBallSpeed() - self:_RestoreRigidbodySpeed(self._private.currentBall.rigidbody) -end ---设置下一次球出生位置 ---@param pos Vector3 function BallManager:SetNextRecoverPos(pos) @@ -398,10 +434,12 @@ function BallManager:_DeactiveCurrentBall() if current ~= nil then --停止球的声音 GamePlay.BallSoundManager:ForceDisableBallAllSound(current.ball) + --取消推动 + self:RemoveAllBallPush() --取消激活 - if current.rigidbody:IsPhysicsed() then + if current.rigidbody.IsPhysicalized then current.ball:Deactive() - current.rigidbody:ForceDePhysics() + current.rigidbody:UnPhysicalize(true) end current.ball.gameObject:SetActive(false) --清空摄像机跟随对象 @@ -427,31 +465,18 @@ function BallManager:_PhysicsOrDePhysicsCurrentBall(physics) local current = self._private.currentActiveBall if current ~= nil then --激活 - local physicsed = current.rigidbody:IsPhysicsed() + local physicsed = current.rigidbody.IsPhysicalized current.ball.gameObject:SetActive(true) if physics and not physicsed then - current.rigidbody.InitialLinearVelocity = Vector3.zero - current.rigidbody.InitialAngularVelocity = Vector3.zero - current.rigidbody:ForcePhysics() + current.rigidbody:Physicalize() + current.rigidbody:WakeUp() end if not physics and physicsed then - current.rigidbody:ForceDePhysics() + current.rigidbody:UnPhysicalize(true) end current.ball:Active() end end ----设置刚体的速度为0 ----@param rigidbody PhysicsBody -function BallManager:_ZeroSpeedRigidbody(rigidbody) - self._private.lastSaveLinearVelocity = rigidbody.LinearVelocity - self._private.lastSaveAngularVelocity = rigidbody.AngularVelocity - rigidbody.LinearVelocity = Vector3.zero - rigidbody.AngularVelocity = Vector3.zero -end -function BallManager:_RestoreRigidbodySpeed(rigidbody) - rigidbody.LinearVelocity = self._private.lastSaveLinearVelocit - rigidbody.AngularVelocity = self._private.lastSaveAngularVelocity -end --#endregion @@ -668,12 +693,59 @@ end ---添加球推动方向 ---@param t BallPushType 推动方向 function BallManager:AddBallPush(t) - self.PushType = LuaUtils.Or(self.PushType, t) + if(t == BallPushType.Back) then + self._private.currentBallPushIds.back = self._private.currentActiveBall.rigidbody:AddConstantForce(Vector3.back) + elseif(t == BallPushType.Forward) then + self._private.currentBallPushIds.forward = self._private.currentActiveBall.rigidbody:AddConstantForce(Vector3.forward) + elseif(t == BallPushType.Left) then + self._private.currentBallPushIds.left = self._private.currentActiveBall.rigidbody:AddConstantForce(Vector3.left) + elseif(t == BallPushType.Right) then + self._private.currentBallPushIds.right = self._private.currentActiveBall.rigidbody:AddConstantForce(Vector3.right) + end end ---去除球推动方向 ---@param t BallPushType 推动方向 function BallManager:RemoveBallPush(t) - self.PushType = LuaUtils.And(self.PushType, LuaUtils.Not(t)) + if(t == BallPushType.Back) then + if self._private.currentBallPushIds.back ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.back) + self._private.currentBallPushIds.back = 0 + end + elseif(t == BallPushType.Forward) then + if self._private.currentBallPushIds.forward ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.forward) + self._private.currentBallPushIds.forward = 0 + end + elseif(t == BallPushType.Left) then + if self._private.currentBallPushIds.left ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.left) + self._private.currentBallPushIds.left = 0 + end + elseif(t == BallPushType.Right) then + if self._private.currentBallPushIds.right ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.right) + self._private.currentBallPushIds.right = 0 + end + end +end +---去除当前球所有推动方向 +function BallManager:RemoveAllBallPush() + if self._private.currentBallPushIds.back ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.back) + self._private.currentBallPushIds.back = 0 + end + if self._private.currentBallPushIds.forward ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.forward) + self._private.currentBallPushIds.forward = 0 + end + if self._private.currentBallPushIds.left ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.left) + self._private.currentBallPushIds.left = 0 + end + if self._private.currentBallPushIds.right ~= 0 then + self._private.currentActiveBall.rigidbody:DeleteConstantForce(self._private.currentBallPushIds.right) + self._private.currentBallPushIds.right = 0 + end end --#endregion @@ -682,24 +754,18 @@ end ---@param ball Ball ---@param speedMeter SpeedMeter ----@param body PhysicsBody +---@param body PhysicsObject function BallManager:_InitBallSounds(ball, speedMeter, body) speedMeter.Enabled = true + + - body.onCollisionEnter = function (body, other, info) - GamePlay.BallSoundManager:HandlerBallCollisionEnter(ball, speedMeter, body, other, info) - end - body.onCollisionStay = function (body, other, info) - GamePlay.BallSoundManager:HandlerBallCollisionStay(ball, speedMeter, body, other, info) - end - body.onCollisionLeave = function (body, other) - GamePlay.BallSoundManager:HandlerBallCollisionLeave(ball, speedMeter, body, other) - end + --TODO: 声音 end --#endregion -function CreateClass_BallManager() +function CreateClass:BallManager() return BallManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/BallSoundManager.lua b/Assets/Game/Scripts/GamePlay/BallSoundManager.lua index 1f473372..de079f59 100644 --- a/Assets/Game/Scripts/GamePlay/BallSoundManager.lua +++ b/Assets/Game/Scripts/GamePlay/BallSoundManager.lua @@ -226,6 +226,6 @@ function BallSoundManager:ForceDisableBallAllSound(ball) end end -function CreateClass_BallSoundManager() +function CreateClass:BallSoundManager() return BallSoundManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Balls/Ball.lua b/Assets/Game/Scripts/GamePlay/Balls/Ball.lua index 0bc845a8..9b63f3dc 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/Ball.lua +++ b/Assets/Game/Scripts/GamePlay/Balls/Ball.lua @@ -1,30 +1,32 @@ -local LuaUtils = Ballance2.Utils.LuaUtils local GameSoundType = Ballance2.Sys.Services.GameSoundType -local PhysicsBody = PhysicsRT.PhysicsBody -local Vector3 = UnityEngine.Vector3 +local PhysicsObject = BallancePhysics.Wapper.PhysicsObject local Table = require('Table') ----纸球定义 +---Ballance 基础球定义 +---可继承此类来重写你自己的球 ---@class Ball : GameLuaObjectHostClass ---@field _CamMgr CamManager ----@field _Rigidbody PhysicsBody +---@field _Rigidbody PhysicsObject ---@field _Pieces GameObject ---@field _PiecesData BallPiecesData ---@field _PiecesSoundName string ---@field _PiecesMinForce number ---@field _PiecesMaxForce number +---@field _PiecesPhysicsData table +---@field _PiecesPhysCallback function 物理化碎片自定义处理回调 (gameObject, physicsData) => PhysicsObject，如果为nil，则碎片将使用默认参数来物理化 ---@field _Force number ---@field _UpForce number ---@field _DownForce number Ball = ClassicObject:extend() function Ball:new() - self._CamMgr = nil self._Rigidbody = nil self._Pieces = nil self._PiecesMinForce = 0 self._PiecesMaxForce = 5 + self._PiecesMass = 1 self._PiecesHaveColSound = {} + self._PiecesPhysCallback = nil self._PiecesColSoundMaxSpeed = 25 self._PiecesColSoundMinSpeed = 2 self._Force = 0 @@ -59,8 +61,7 @@ function Ball:new() end function Ball:Start() - self._CamMgr = GamePlay.CamManager - self._Rigidbody = self.gameObject:GetComponent(PhysicsBody) + self._Rigidbody = self.gameObject:GetComponent(PhysicsObject) self:_InitPeices() self:_InitSounds() end @@ -82,9 +83,21 @@ function Ball:_InitPeices() } for i = 0, parent.transform.childCount - 1 do local child = parent.transform:GetChild(i) - local body = child.gameObject:GetComponent(PhysicsBody) ---@type PhysicsBody + local body = nil ---@type PhysicsObject + if self._PiecesPhysCallback then + body = self._PiecesPhysCallback(child.gameObject, self._PiecesPhysicsData) + else + body = child.gameObject:AddComponent(PhysicsObject) + body.Mass = self._PiecesPhysicsData.Mass + body.Elasticity = self._PiecesPhysicsData.Elasticity + body.Friction = self._PiecesPhysicsData.Friction + body.LinearSpeedDamping = self._PiecesPhysicsData.LinearDamp + body.RotSpeedDamping = self._PiecesPhysicsData.RotDamp + end + body.DoNotAutoCreateAtAwake = true table.insert(data.bodys, body); + --碎片声音 if piecesSound ~= nil and Table.IndexOf(self._PiecesHaveColSound, body.name) ~= -1 then local sound = Game.SoundManager:RegisterSoundPlayer(GameSoundType.BallEffect, piecesSound, false, true, 'PiecesSound'..child.name) sound.spatialBlend = 1 @@ -93,12 +106,14 @@ function Ball:_InitPeices() sound.dopplerLevel = 0 sound.volume = 1 body.AddContactListener = true - ---@param this PhysicsBody - ---@param other PhysicsBody - ---@param info PhysicsBodyCollisionInfo - body.onCollisionEnter = function (this, other, info) + ---@param this PhysicsObject + ---@param other PhysicsObject + ---@param contact_point_ws Vector3 + ---@param speed Vector3 + ---@param surf_normal Vector3 + body.OnPhysicsCollision = function (this, other, contact_point_ws, speed, surf_normal) if data.throwed then - sound.volume = (info.separatingVelocity - self._PiecesColSoundMinSpeed) / (self._PiecesColSoundMaxSpeed - self._PiecesColSoundMinSpeed) + sound.volume = (speed.sqrMagnitude - self._PiecesColSoundMinSpeed) / (self._PiecesColSoundMaxSpeed - self._PiecesColSoundMinSpeed) sound:Play() end end @@ -107,7 +122,6 @@ function Ball:_InitPeices() self._PiecesData = data end - end function Ball:_InitSounds() --加载球的撞击和滚动声音 @@ -128,29 +142,6 @@ function Ball:_InitSounds() end end ----推动 ----@param pushType number -function Ball:Push(pushType) - if self._CamMgr == nil then - self._CamMgr = GamePlay.CamManager - end - if LuaUtils.And(pushType, BallPushType.Left) == BallPushType.Left then - self._Rigidbody:ApplyLinearImpulse(self._CamMgr.CamLeftVector * self._Force) - elseif LuaUtils.And(pushType, BallPushType.Right) == BallPushType.Right then - self._Rigidbody:ApplyLinearImpulse(self._CamMgr.CamRightVector * self._Force) - end - if LuaUtils.And(pushType, BallPushType.Forward) == BallPushType.Forward then - self._Rigidbody:ApplyLinearImpulse(self._CamMgr.CamForwerdVector * self._Force) - elseif LuaUtils.And(pushType, BallPushType.Back) == BallPushType.Back then - self._Rigidbody:ApplyLinearImpulse(self._CamMgr.CamBackVector * self._Force) - end - if LuaUtils.And(pushType, BallPushType.Up) == BallPushType.Up then - self._Rigidbody:ApplyLinearImpulse(Vector3.up * self._UpForce) - elseif LuaUtils.And(pushType, BallPushType.Down) == BallPushType.Down then - self._Rigidbody:ApplyLinearImpulse(Vector3.down * self._DownForce) - end -end - function Ball:Update() if self._RollSoundLockTick > 0 then self._RollSoundLockTick = self._RollSoundLockTick - 1 @@ -186,6 +177,6 @@ function Ball:ResetPieces() GamePlay.BallPiecesControll:ResetPieces(self._PiecesData) end -function CreateClass_Ball() +function CreateClass:Ball() return Ball() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallPaper.lua b/Assets/Game/Scripts/GamePlay/Balls/BallPaper.lua index 0582656e..fc5f9e9c 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/BallPaper.lua +++ b/Assets/Game/Scripts/GamePlay/Balls/BallPaper.lua @@ -1,4 +1,6 @@ local GameSoundType = Ballance2.Sys.Services.GameSoundType +local CommonUtils = Ballance2.Utils.CommonUtils +local Vector3 = UnityEngine.Vector3 ---纸球定义 ---@class BallPaper : Ball @@ -11,6 +13,18 @@ function BallPaper:new() self._PaperPiecesSound = nil self._HitSound.Names.All = 'core.sounds:Hit_Paper.wav' self._RollSound.Names.All = 'core.sounds:Roll_Paper.wav' + ---自定义物理化碎片 + ---@param go GameObject + ---@param data table + self._PiecesPhysCallback = function (go, data) + local body = go:AddComponent(BallancePhysics.Wapper.PhysicsObject) ---@type PhysicsObject + body.Mass = CommonUtils.RandomFloat(0.02, 0.09) + body.Elasticity = data.Elasticity + body.Friction = CommonUtils.RandomFloat(1, 5) + body.LinearSpeedDamping = data.LinearDamp + body.RotSpeedDamping = data.RotDamp + return body + end end function BallPaper:Start() @@ -22,8 +36,23 @@ end function BallPaper:ThrowPieces(pos) self._PaperPiecesSound:Play() Ball.ThrowPieces(self, pos) + + --纸球碎片将施加一个恒力，以达到被风吹走的效果 + for _, body in ipairs(self._PiecesData.bodys) do + body:AddConstantForce(Vector3(-0.03, 0, 0.03)) --施加力 + end + +end + +function BallPaper:ResetPieces() + Ball.ResetPieces(self) + + --去掉纸球碎片恒力 + for _, body in ipairs(self._PiecesData.bodys) do + body:ClearConstantForce() + end end -function CreateClass_BallPaper() +function CreateClass:BallPaper() return BallPaper(nil) end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua b/Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua deleted file mode 100644 index 14d04d78..00000000 --- a/Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua +++ /dev/null @@ -1,27 +0,0 @@ -local PhysicsBody = PhysicsRT.PhysicsBody -local Vector3 = UnityEngine.Vector3 - ----球碎片回收器 ----@class BallPaperPiecesWind : GameLuaObjectHostClass -BallPaperPiecesWind = { - _PushForce = Vector3(-0.09, 0, 0.09), -} - -function CreateClass_BallPaperPiecesWind() - - function BallPaperPiecesWind:new(o) - o = o or {} - setmetatable(o, self) - self.__index = self - return o - end - - function BallPaperPiecesWind:FixedUpdate() - for i = 0, self.transform.childCount - 1 do - local body = self.transform:GetChild(i).gameObject:GetComponent(PhysicsBody) ---@type PhysicsBody - body:ApplyLinearImpulse(self._PushForce) --施加力 - end - end - - return BallPaperPiecesWind:new(nil) -end diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallPiecesControll.lua b/Assets/Game/Scripts/GamePlay/Balls/BallPiecesControll.lua index a7134969..695ad92d 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/BallPiecesControll.lua +++ b/Assets/Game/Scripts/GamePlay/Balls/BallPiecesControll.lua @@ -1,15 +1,12 @@ -local PhysicsBody = PhysicsRT.PhysicsBody -local Vector3 = UnityEngine.Vector3 local CommonUtils = Ballance2.Utils.CommonUtils local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils -local WaitForSeconds = UnityEngine.WaitForSeconds local FadeManager = Game.UIManager.UIFadeManager ---球碎片回收器 ---@class BallPiecesControll : GameLuaObjectHostClass BallPiecesControll = { _CamMgr = nil, ---@type CamManager - _Rigidbody = nil, ---@type PhysicsBody, + _Rigidbody = nil, ---@type PhysicsObject, _Force = 0, _UpForce = 0, _DownForce = 0, @@ -18,12 +15,12 @@ BallPiecesControll = { ---球碎片数据 ---@class BallPiecesData ----@field bodys PhysicsBody[] +---@field bodys PhysicsObject[] ---@field parent GameObject ---@field throwed boolean BallPiecesData = {} -function CreateClass_BallPiecesControll() +function CreateClass:BallPiecesControll() function BallPiecesControll:new(o) o = o or {} @@ -58,8 +55,8 @@ function CreateClass_BallPiecesControll() local forceDir = body.transform.localPosition body.gameObject:SetActive(true) forceDir:Normalize() --力的方向是从原点向碎片位置 - body:ForcePhysics() --物理 - body:ApplyLinearImpulse(forceDir * CommonUtils.RandomFloat(minForce, maxForce)) --施加力 + body:Physicalize() --物理 + body:Impluse(forceDir * CommonUtils.RandomFloat(minForce, maxForce)) --施加力 end ---延时消失 @@ -87,7 +84,7 @@ function CreateClass_BallPiecesControll() --去除物理 for _, body in ipairs(data.bodys) do - body:ForceDePhysics() + body:UnPhysicalize(true) end --渐变淡出隐藏其材质 diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallStone.lua b/Assets/Game/Scripts/GamePlay/Balls/BallStone.lua index a3d542f3..271f7988 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/BallStone.lua +++ b/Assets/Game/Scripts/GamePlay/Balls/BallStone.lua @@ -25,6 +25,6 @@ function BallStone:new() } end -function CreateClass_BallStone() +function CreateClass:BallStone() return BallStone(nil) end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallWood.lua b/Assets/Game/Scripts/GamePlay/Balls/BallWood.lua index d32c1f93..f6dc5a13 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/BallWood.lua +++ b/Assets/Game/Scripts/GamePlay/Balls/BallWood.lua @@ -25,6 +25,6 @@ function BallWood:new() } end -function CreateClass_BallWood() +function CreateClass:BallWood() return BallWood(nil) end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/CamManager.lua b/Assets/Game/Scripts/GamePlay/CamManager.lua index 54b039a8..f2a55504 100644 --- a/Assets/Game/Scripts/GamePlay/CamManager.lua +++ b/Assets/Game/Scripts/GamePlay/CamManager.lua @@ -24,6 +24,7 @@ CamRotateType = { ---@field _CameraNormalY number ---@field _CameraSpaceY number ---@field _PosFrame Transform +---@field CamDirectionRef Transform 获取球参照的摄像机旋转方向变换 [R] ---@field CamRightVector Vector3 获取摄像机右侧向量 [R] ---@field CamLeftVector Vector3 获取摄像机左侧向量 [R] ---@field CamForwerdVector Vector3 获取摄像机向前向量 [R] @@ -45,6 +46,7 @@ function CamManager:new() self.CamLeftVector = Vector3.left self.CamForwerdVector = Vector3.forward self.CamBackVector = Vector3.back + self.CamDirectionRef = nil self.CamFollowSpeed = 0.05 self.CamIsSpaced = false self.Target = nil @@ -74,6 +76,7 @@ function CamManager:Start() self.CamFollow = self._CameraHost:GetComponent(CamFollow) ---@type CamFollow self.transform.localPosition = Vector3(self._CameraNormalX, self._CameraNormalY, 0) self.transform:LookAt(Vector3.zero) + self.CamDirectionRef = self._CameraHost.transform self._CommandId = Game.Manager.GameDebugCommandServer:RegisterCommand('cam', function (eyword, fullCmd, argsCount, args) local type = args[1] @@ -282,6 +285,6 @@ end --#endregion -function CreateClass_CamManager() +function CreateClass:CamManager() return CamManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/GamePlayManager.lua b/Assets/Game/Scripts/GamePlay/GamePlayManager.lua index bb8f04d2..2938c33c 100644 --- a/Assets/Game/Scripts/GamePlay/GamePlayManager.lua +++ b/Assets/Game/Scripts/GamePlay/GamePlayManager.lua @@ -514,4 +514,4 @@ function GamePlayManager:AddPoint(count) GameUI.GamePlayUI:TwinklePoint() end -function CreateClass_GamePlayManager() return GamePlayManager() end \ No newline at end of file +function CreateClass:GamePlayManager() return GamePlayManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulBase.lua b/Assets/Game/Scripts/GamePlay/ModulBase/ModulBase.lua index efe14574..7e9b59b3 100644 --- a/Assets/Game/Scripts/GamePlay/ModulBase/ModulBase.lua +++ b/Assets/Game/Scripts/GamePlay/ModulBase/ModulBase.lua @@ -1,17 +1,42 @@ +local DistanceChecker = Ballance2.Game.DistanceChecker + ---机关定义 +---您可以通过继承此类来定义您的机关。 ---@class ModulBase : GameLuaObjectHostClass +---@field EnableBallRangeChecker boolean 是否开启球区域检测，开启后会定时检测，如果球进入指定范围，则发出 BallEnterRange 事件 +---@field IsActive boolean 获取当前机关是否激活 +---@field BallCheckeRange number 球区域检测范围。创建之后也可以手动设置 modul.BallRangeChecker.Diatance 属性来设置 ModulBase = ClassicObject:extend() function ModulBase:new() + self.BallRangeChecker = nil end +---初始化 +function ModulBase:Start() + --机关内置的球区域检测功能初始化 + if self.EnableBallRangeChecker then + self.BallRangeChecker = self.gameObject:AddComponent(DistanceChecker) ---@type DistanceChecker + self.BallRangeChecker.Diatance = self.BallCheckeRange or 100 + self.BallRangeChecker.Object1 = self.transform + self.BallRangeChecker.Object2 = GamePlay.BallManager.PosFrame + self.BallRangeChecker.OnEnterRange = function () + self:BallEnterRange() + end + self.BallRangeChecker.OnLeaveRange = function () + self:BallLeaveRange() + end + end +end ---机关激活时发出此事件（进入当前小节） ---此事件在Backup事后发出 function ModulBase:Active() self.gameObject:SetActive(true) + self.IsActive = true end ---机关隐藏时发出此事件（当前小节结束） function ModulBase:Deactive() + self.IsActive = false self.gameObject:SetActive(false) end ---关卡卸载时发出此事件 @@ -25,6 +50,13 @@ end function ModulBase:Backup() end -function CreateClass_ModulBase() +---球进入当前机关指定范围时发出此事件 +function ModulBase:BallEnterRange() +end +---球离开当前机关指定范围时发出此事件 +function ModulBase:BallLeaveRange() +end + +function CreateClass:ModulBase() return ModulBase() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua b/Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua deleted file mode 100644 index dd4aa6ef..00000000 --- a/Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua +++ /dev/null @@ -1,69 +0,0 @@ -local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils - ----@class ModulComplexPhysics : ModulBase -ModulComplexPhysics = ModulBase:extend() - -function ModulComplexPhysics:new() - self._PhysicsBody1 = nil ---@type PhysicsBody - self._PhysicsBody2 = nil ---@type PhysicsBody - self._PhysicsBody3 = nil ---@type PhysicsBody - self._PhysicsBody4 = nil ---@type PhysicsBody - self._PhysicsBody1CustomLayerName = nil - self._PhysicsBody2CustomLayerName = nil - self._PhysicsBody3CustomLayerName = nil - self._PhysicsBody4CustomLayerName = nil -end -function ModulComplexPhysics:Start() - if not IsNilOrEmpty(self._PhysicsBody1CustomLayerName) then - self._PhysicsBody1.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsBody1CustomLayerName) - end - if not IsNilOrEmpty(self._PhysicsBody2CustomLayerName) then - self._PhysicsBody2.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsBody2CustomLayerName) - end - if self._PhysicsBody3 ~= nil then - self._PhysicsBody3:ForcePhysics() - if not IsNilOrEmpty(self._PhysicsBody3CustomLayerName) then - self._PhysicsBody3.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsBody3CustomLayerName) - end - end - if self._PhysicsBody4 ~= nil then - self._PhysicsBody4:ForcePhysics() - if not IsNilOrEmpty(self._PhysicsBody4CustomLayerName) then - self._PhysicsBody4.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsBody4CustomLayerName) - end - end -end -function ModulComplexPhysics:Active() - self.gameObject:SetActive(true) - self._PhysicsBody1:ForcePhysics() - self._PhysicsBody2:ForcePhysics() - if self._PhysicsBody3 ~= nil then - self._PhysicsBody3:ForcePhysics() - end - if self._PhysicsBody4 ~= nil then - self._PhysicsBody4:ForcePhysics() - end -end -function ModulComplexPhysics:Deactive() - self.gameObject:SetActive(false) - self._PhysicsBody1:ForceDePhysics() - self._PhysicsBody2:ForceDePhysics() - if self._PhysicsBody3 ~= nil then self._PhysicsBody3:ForceDePhysics() end - if self._PhysicsBody4 ~= nil then self._PhysicsBody4:ForceDePhysics() end -end -function ModulComplexPhysics:Reset() - ObjectStateBackupUtils.RestoreObject(self._PhysicsBody1.gameObject) - ObjectStateBackupUtils.RestoreObject(self._PhysicsBody2.gameObject) - if self._PhysicsBody3 ~= nil then ObjectStateBackupUtils.RestoreObject(self._PhysicsBody3.gameObject) end - if self._PhysicsBody4 ~= nil then ObjectStateBackupUtils.RestoreObject(self._PhysicsBody4.gameObject) end -end -function ModulComplexPhysics:Backup() - ObjectStateBackupUtils.BackUpObject(self._PhysicsBody1.gameObject) - ObjectStateBackupUtils.BackUpObject(self._PhysicsBody2.gameObject) - if self._PhysicsBody3 ~= nil then ObjectStateBackupUtils.BackUpObject(self._PhysicsBody3.gameObject) end - if self._PhysicsBody4 ~= nil then ObjectStateBackupUtils.BackUpObject(self._PhysicsBody4.gameObject) end -end - -function CreateClass_ModulComplexPhysics() - return ModulComplexPhysics() -end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua b/Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua new file mode 100644 index 00000000..3e4a501b --- /dev/null +++ b/Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua @@ -0,0 +1,37 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +---@class ModulPhysics : ModulBase +ModulPhysics = ModulBase:extend() + +function ModulPhysics:new() + ModulBase.super.new(self) + self._PhysicsObject = nil + self._PhysicsObjectCustomLayerName = nil +end +function ModulPhysics:Start() + if self._PhysicsObject == nil then + self._PhysicsObject = self.gameObject:GetComponent(PhysicsRT.PhysicsObject) ---@type PhysicsObject + end + if not IsNilOrEmpty(self._PhysicsObjectCustomLayerName) then + self._PhysicsObject.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsObjectCustomLayerName) + end +end + +function ModulPhysics:Active() + self.gameObject:SetActive(true) + self._PhysicsObject:Physicalize() +end +function ModulPhysics:Deactive() + self.gameObject:SetActive(false) + self._PhysicsObject:UnPhysicalize(true) +end +function ModulPhysics:Reset() + ObjectStateBackupUtils.RestoreObject(self._PhysicsObject.gameObject) +end +function ModulPhysics:Backup() + ObjectStateBackupUtils.BackUpObject(self._PhysicsObject.gameObject) +end + +function CreateClass:ModulPhysics() + return ModulPhysics() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua.meta b/Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua.meta similarity index 74% rename from Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua.meta rename to Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua.meta index a35ee266..b827eaba 100644 --- a/Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua.meta +++ b/Assets/Game/Scripts/GamePlay/ModulBase/ModulPhysics.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20cb07cd5f3d2d24d9f34d86c2ab5875 +guid: 97f0981d1c240aa40a1df0a8a19857ed DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua b/Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua deleted file mode 100644 index c84780c7..00000000 --- a/Assets/Game/Scripts/GamePlay/ModulBase/ModulSingalPhysics.lua +++ /dev/null @@ -1,42 +0,0 @@ -local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils - ----@class ModulSingalPhysics : ModulBase -ModulSingalPhysics = ModulBase:extend() - -function ModulSingalPhysics:new() - self._PhysicsBody = nil - self._PhysicsBodyCustomLayerName = nil -end -function ModulSingalPhysics:Start() - if self._PhysicsBody == nil then - self._PhysicsBody = self.gameObject:GetComponent(PhysicsRT.PhysicsBody) ---@type PhysicsBody - end - if not IsNilOrEmpty(self._PhysicsBodyCustomLayerName) then - self._PhysicsBody.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName(self._PhysicsBodyCustomLayerName) - end -end - -function ModulSingalPhysics:GamePause() - self._PhysicsBody:ForceDeactive() -end -function ModulSingalPhysics:GameResume() - self._PhysicsBody:ForceActive() -end -function ModulSingalPhysics:Active() - self.gameObject:SetActive(true) - self._PhysicsBody:ForcePhysics() -end -function ModulSingalPhysics:Deactive() - self.gameObject:SetActive(false) - self._PhysicsBody:ForceDePhysics() -end -function ModulSingalPhysics:Reset() - ObjectStateBackupUtils.RestoreObject(self._PhysicsBody.gameObject) -end -function ModulSingalPhysics:Backup() - ObjectStateBackupUtils.BackUpObject(self._PhysicsBody.gameObject) -end - -function CreateClass_ModulSingalPhysics() - return ModulSingalPhysics() -end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/MusicManager.lua b/Assets/Game/Scripts/GamePlay/MusicManager.lua index 943704fe..18f1853b 100644 --- a/Assets/Game/Scripts/GamePlay/MusicManager.lua +++ b/Assets/Game/Scripts/GamePlay/MusicManager.lua @@ -181,6 +181,6 @@ function MusicManager:DisableInSec(sec) end) end -function CreateClass_MusicManager() +function CreateClass:MusicManager() return MusicManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Other/LevelBriz.lua b/Assets/Game/Scripts/GamePlay/Other/LevelBriz.lua index a692a27e..12344b53 100644 --- a/Assets/Game/Scripts/GamePlay/Other/LevelBriz.lua +++ b/Assets/Game/Scripts/GamePlay/Other/LevelBriz.lua @@ -59,6 +59,6 @@ function LevelBriz:LightFlash() Game.SoundManager:PlayFastVoice('core.sounds.music:Music_thunder.wav', GameSoundType.Normal) end -function CreateClass_LevelBriz() +function CreateClass:LevelBriz() return LevelBriz() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Other/UFOAnimController.lua b/Assets/Game/Scripts/GamePlay/Other/UFOAnimController.lua index 4ca82a76..a2abb9ee 100644 --- a/Assets/Game/Scripts/GamePlay/Other/UFOAnimController.lua +++ b/Assets/Game/Scripts/GamePlay/Other/UFOAnimController.lua @@ -86,6 +86,6 @@ end)) end -function CreateClass_UFOAnimController() +function CreateClass:UFOAnimController() return UFOAnimController() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/SectorManager.lua b/Assets/Game/Scripts/GamePlay/SectorManager.lua index f4665c29..d39445cb 100644 --- a/Assets/Game/Scripts/GamePlay/SectorManager.lua +++ b/Assets/Game/Scripts/GamePlay/SectorManager.lua @@ -187,6 +187,6 @@ function SectorManager:ResetAllSector(active) self.CurrentLevelEndBalloon:Reset() end -function CreateClass_SectorManager() +function CreateClass:SectorManager() return SectorManager() end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Tranfo/TranfoAminControl.lua b/Assets/Game/Scripts/GamePlay/Tranfo/TranfoAminControl.lua index 2c5132b3..b044ba45 100644 --- a/Assets/Game/Scripts/GamePlay/Tranfo/TranfoAminControl.lua +++ b/Assets/Game/Scripts/GamePlay/Tranfo/TranfoAminControl.lua @@ -103,6 +103,6 @@ function TranfoAminControl:PlayAnim(transform, color, placeholder, ballChangeCal end)) end -function CreateClass_TranfoAminControl() +function CreateClass:TranfoAminControl() return TranfoAminControl() end \ No newline at end of file diff --git a/Assets/Game/Scripts/InitCore.lua b/Assets/Game/Scripts/InitCore.lua index 5966dbbf..0081b447 100644 --- a/Assets/Game/Scripts/InitCore.lua +++ b/Assets/Game/Scripts/InitCore.lua @@ -6,6 +6,8 @@ local GameError = Ballance2.Sys.Debug.GameError local Log = Ballance2.Utils.Log local SystemPackage = GamePackage.GetSystemPackage() +---全局 CreateClass 引入 +CreateClass = {} ---全局 ClassicObject 引入 ClassicObject = require("classic") require('ConstLinks') diff --git a/Assets/Game/Scripts/LevelBuilder/LevelBuilder.lua b/Assets/Game/Scripts/LevelBuilder/LevelBuilder.lua index 8a619a61..d5018745 100644 --- a/Assets/Game/Scripts/LevelBuilder/LevelBuilder.lua +++ b/Assets/Game/Scripts/LevelBuilder/LevelBuilder.lua @@ -13,11 +13,8 @@ local StringUtils = Ballance2.Utils.StringUtils local Log = Ballance2.Utils.Log local I18N = Ballance2.Sys.Language.I18N -local PhysicsBody = PhysicsRT.PhysicsBody -local PhysicsShape = PhysicsRT.PhysicsShape -local PhysicsPhantom = PhysicsRT.PhysicsPhantom -local ShapeType = PhysicsRT.ShapeType -local MotionType = PhysicsRT.MotionType +local PhysicsObject = BallancePhysics.Wapper.PhysicsObject +local TiggerTester = Ballance2.Game.TiggerTester local Application = UnityEngine.Application local GUIUtility = UnityEngine.GUIUtility @@ -44,7 +41,7 @@ local LevelBuilderModulRegStorage = {} ---@class LevelBuilder : GameLuaObjectHostClass LevelBuilder = ClassicObject:extend() -function CreateClass_LevelBuilder() +function CreateClass:LevelBuilder() return LevelBuilder() end @@ -412,14 +409,6 @@ function LevelBuilder:_LoadLevelInternal() --StaticCompound local floorStatic = Game.Manager:InstanceNewGameObject(self.gameObject.transform, floor.name) - local shape = floorStatic:AddComponent(PhysicsShape) ---@type PhysicsShape - shape.ShapeType = ShapeType.StaticCompound - local body = floorStatic:AddComponent(PhysicsBody) ---@type PhysicsBody - body.DoNotAutoCreateAtAwake = true - body.MotionType = MotionType.Fixed - body.Friction = physicsData.Friction - body.Restitution = physicsData.Restitution - body.Layer = physicsData.Layer table.insert(self._CurrentLevelFloors, floorStatic) --Floor childs @@ -431,10 +420,15 @@ function LevelBuilder:_LoadLevelInternal() if meshFilter ~= nil and meshFilter.mesh ~= nil then go.transform:SetParent(floorStatic.transform) go.tag = floor.name - local shape = go:AddComponent(PhysicsShape) ---@type PhysicsShape - shape.ShapeType = ShapeType.BvCompressedMesh - shape.ShapeConvexRadius = 0.1 - shape.ShapeMesh = meshFilter.mesh + local body = go:AddComponent(PhysicsObject) ---@type PhysicsObject + body.Fixed = true + body.DoNotAutoCreateAtAwake = true + body.ShapeConvexRadius = 0.1 + body.Concave:Add(meshFilter.mesh) + body.Friction = physicsData.Friction + body.Elasticity = physicsData.Elasticity + body.Layer = physicsData.Layer + body:Physicalize() if go:GetComponent(MeshCollider) == nil then go:AddComponent(MeshCollider) end @@ -450,8 +444,7 @@ function LevelBuilder:_LoadLevelInternal() if floorCount == 0 then ---没有路面，则隐藏当前静态父级 floorStatic:SetActive(false) - else - body:ForcePhysics() + else Log.D(TAG, 'Loaded floor '..floor.name..' count: '..floorCount) end @@ -472,20 +465,17 @@ function LevelBuilder:_LoadLevelInternal() local renderer = go:GetComponent(Renderer) ---@type Renderer if renderer ~= nil then renderer.enabled = false end - --添加幻影 - local phantom = go:AddComponent(PhysicsPhantom) ---@type PhysicsPhantom - phantom.EnableListener = true - phantom.DoNotAutoCreateAtAwake = true - phantom:SetAabbBySelf() - ---@param self PhysicsPhantom - ---@param other PhysicsBody - phantom.onOverlappingCollidableAdd = function (self, other) + --添加坠落检测区Mesh + local tigger = go:AddComponent(TiggerTester) ---@type TiggerTester + + ---@param _self GameObject + ---@param other GameObject + tigger.onTriggerEnter = function (_self, other) --触发球坠落 - if other.gameObject.tag == 'Ball' then + if other.tag == 'Ball' then GamePlayManager:Fall() end end - phantom:ForceReCreate() else Log.W(TAG, 'Not found object \''..name..'\' in depthTestCubes') end diff --git a/Assets/Game/Scripts/Moduls/PC_TwoFlames.lua b/Assets/Game/Scripts/Moduls/PC_TwoFlames.lua index 26f1d61d..413b5010 100644 --- a/Assets/Game/Scripts/Moduls/PC_TwoFlames.lua +++ b/Assets/Game/Scripts/Moduls/PC_TwoFlames.lua @@ -5,17 +5,17 @@ function PC_TwoFlames:new() self.FlameSmallLeft = nil ---@type GameObject self.FlameSmallRight = nil ---@type GameObject self.Flame = nil ---@type GameObject - self.CheckPointTigger = nil ---@type PhysicsPhantom + self.CheckPointTigger = nil ---@type TiggerTester self.CheckPointActived = false end function PC_TwoFlames:Start() self.FlameSmallLeft:SetActive(false) self.FlameSmallRight:SetActive(false) self.Flame:SetActive(false) - ---@param phantom PhysicsPhantom - ---@param otherBody PhysicsBody - self.CheckPointTigger.onOverlappingCollidableAdd = function (phantom, otherBody) - if not self.CheckPointActived and otherBody.gameObject.tag == 'Ball' then + --Tigger 进入事件 + ---@param otherBody GameObject + self.CheckPointTigger.onTriggerEnter = function (s, otherBody) + if not self.CheckPointActived and otherBody.tag == 'Ball' then --触发下一关 self.CheckPointActived = true self.Flame:SetActive(false) @@ -45,6 +45,6 @@ function PC_TwoFlames:InternalActive() self.CheckPointActived = false end -function CreateClass_PC_TwoFlames() +function CreateClass:PC_TwoFlames() return PC_TwoFlames() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/PE_Balloon.lua b/Assets/Game/Scripts/Moduls/PE_Balloon.lua index 8e8b8666..cb623c5d 100644 --- a/Assets/Game/Scripts/Moduls/PE_Balloon.lua +++ b/Assets/Game/Scripts/Moduls/PE_Balloon.lua @@ -4,25 +4,34 @@ local Yield = UnityEngine.Yield local WaitForSeconds = UnityEngine.WaitForSeconds ---@class PE_Balloon : ModulBase ----@field PE_Balloon_Platform_Tigger PhysicsBody ----@field PE_Balloon_Platform_HingeJoint HingeConstraint ----@field PE_Balloon_Platform PhysicsBody ----@field PE_Balloon_Platform_Force PhysicsForce ----@field PE_Balloon_Platte01 PhysicsBody ----@field PE_Balloon_Platte02 PhysicsBody ----@field PE_Balloon_Platte03 PhysicsBody ----@field PE_Balloon_Platte04 PhysicsBody ----@field PE_Balloon_Platte05 PhysicsBody ----@field PE_Balloon_Platte06 PhysicsBody ----@field PE_Balloon_Platte07 PhysicsBody ----@field PE_Balloon_Platte08 PhysicsBody ----@field PE_Balloon_BoxSide PhysicsBody +---@field PE_Balloon_BoxSlide PhysicsObject +---@field PE_Balloon_Platform PhysicsObject +---@field PE_Balloon_Ballon04 PhysicsObject +---@field PE_Balloon_Ballon03 PhysicsObject +---@field PE_Balloon_Ballon02 PhysicsObject +---@field PE_Balloon_Ballon01 PhysicsObject +---@field PE_Balloon_Ballon_Seil04 PhysicsObject +---@field PE_Balloon_Ballon_Seil03 PhysicsObject +---@field PE_Balloon_Ballon_Seil02 PhysicsObject +---@field PE_Balloon_Ballon_Seil01 PhysicsObject +---@field PE_Balloon_Platform_HingeJoint PhysicsHinge +---@field PE_Balloon_Platte01 PhysicsObject +---@field PE_Balloon_Platte02 PhysicsObject +---@field PE_Balloon_Platte03 PhysicsObject +---@field PE_Balloon_Platte04 PhysicsObject +---@field PE_Balloon_Platte05 PhysicsObject +---@field PE_Balloon_Platte06 PhysicsObject +---@field PE_Balloon_Platte07 PhysicsObject +---@field PE_Balloon_Platte08 PhysicsObject ---@field PE_Balloon_BallRefPos GameObject +---@field PE_Balloon_BallTigger TiggerTester PE_Balloon = ModulBase:extend() function PE_Balloon:new() + ModulBase.super.new(self) end function PE_Balloon:Start() + ModulBase.Start(self) --接近PE_Balloon时禁用背景音乐 local musicDisabledByPE_Balloon = false @@ -33,6 +42,9 @@ function PE_Balloon:Start() musicDisabledByPE_Balloon = true GamePlay.MusicManager:DisableBackgroundMusic() end + if self.IsActive then + self.PE_Balloon_Platform:WakeUp() + end end distanceChecker.OnLeaveRange = function () if self._MusicActived and musicDisabledByPE_Balloon and not GamePlay.GamePlayManager.CurrentLevelPass then @@ -43,20 +55,9 @@ function PE_Balloon:Start() distanceChecker.CheckEnabled = true --PE_Balloon 过关触发器 - self.PE_Balloon_Platform_Tigger.onTiggerEnter = function (body, other) + self.PE_Balloon_BallTigger.onTiggerEnter = function (body, other) if other and other.gameObject.tag == "Ball" then - self.PE_Balloon_Platform_Force.Force = 0 - self.PE_Balloon_Platform_HingeJoint:SetEnabled(false) --断开与桥的连接 - LuaTimer.Add(2000, function () - self.PE_Balloon_Platform_Force.Enable = true - self.PE_Balloon_Platform_Force.Force = 100 - end) - LuaTimer.Add(5000, function () - self.PE_Balloon_Platform_Force.Force = 50 - end) - LuaTimer.Add(20000, function () - self.PE_Balloon_Platform_Force.Force = 40 - end) + self.PE_Balloon_Platform_HingeJoint:Destroy() --断开与桥的连接 self._MusicActived = false GamePlay.GamePlayManager:Pass() --通知管理器关卡已结束 end @@ -76,20 +77,26 @@ function PE_Balloon:Start() end function PE_Balloon:Active() - self.gameObject:SetActive(true) - - self.PE_Balloon_BoxSide:ForcePhysics() - self.PE_Balloon_Platte08:ForcePhysics() - self.PE_Balloon_Platte07:ForcePhysics() - self.PE_Balloon_Platte06:ForcePhysics() - self.PE_Balloon_Platte05:ForcePhysics() - self.PE_Balloon_Platte04:ForcePhysics() - self.PE_Balloon_Platte03:ForcePhysics() - self.PE_Balloon_Platte02:ForcePhysics() - self.PE_Balloon_Platte01:ForcePhysics() - self.PE_Balloon_Platform:ForcePhysics() - self.PE_Balloon_Platform_Tigger:ForcePhysics() - self.PE_Balloon_Platform_Force.Enable = false + ModulBase.Active(self) + + self.PE_Balloon_BoxSlide:Physicalize() + self.PE_Balloon_Ballon04:Physicalize() + self.PE_Balloon_Ballon03:Physicalize() + self.PE_Balloon_Ballon02:Physicalize() + self.PE_Balloon_Ballon01:Physicalize() + self.PE_Balloon_Ballon_Seil04:Physicalize() + self.PE_Balloon_Ballon_Seil03:Physicalize() + self.PE_Balloon_Ballon_Seil02:Physicalize() + self.PE_Balloon_Ballon_Seil01:Physicalize() + self.PE_Balloon_Platte01:Physicalize() + self.PE_Balloon_Platte02:Physicalize() + self.PE_Balloon_Platte03:Physicalize() + self.PE_Balloon_Platte04:Physicalize() + self.PE_Balloon_Platte05:Physicalize() + self.PE_Balloon_Platte06:Physicalize() + self.PE_Balloon_Platte07:Physicalize() + self.PE_Balloon_Platte08:Physicalize() + self.PE_Balloon_BoxSlide.EnableConstantForce = false if not self._MusicActived then self._MusicActived = true; @@ -118,21 +125,27 @@ function PE_Balloon:Active() end function PE_Balloon:Deactive() - self.PE_Balloon_Platform_Tigger:ForceDePhysics() - self.PE_Balloon_Platform:ForceDePhysics() - self.PE_Balloon_Platte01:ForceDePhysics() - self.PE_Balloon_Platte02:ForceDePhysics() - self.PE_Balloon_Platte03:ForceDePhysics() - self.PE_Balloon_Platte04:ForceDePhysics() - self.PE_Balloon_Platte05:ForceDePhysics() - self.PE_Balloon_Platte06:ForceDePhysics() - self.PE_Balloon_Platte07:ForceDePhysics() - self.PE_Balloon_Platte08:ForceDePhysics() - self.PE_Balloon_BoxSide:ForceDePhysics() - - self.gameObject:SetActive(false) + self.PE_Balloon_BoxSlide:UnPhysicalize(true) + self.PE_Balloon_Ballon04:UnPhysicalize(true) + self.PE_Balloon_Ballon03:UnPhysicalize(true) + self.PE_Balloon_Ballon02:UnPhysicalize(true) + self.PE_Balloon_Ballon01:UnPhysicalize(true) + self.PE_Balloon_Ballon_Seil04:UnPhysicalize(true) + self.PE_Balloon_Ballon_Seil03:UnPhysicalize(true) + self.PE_Balloon_Ballon_Seil02:UnPhysicalize(true) + self.PE_Balloon_Ballon_Seil01:UnPhysicalize(true) + self.PE_Balloon_Platte01:UnPhysicalize(true) + self.PE_Balloon_Platte02:UnPhysicalize(true) + self.PE_Balloon_Platte03:UnPhysicalize(true) + self.PE_Balloon_Platte04:UnPhysicalize(true) + self.PE_Balloon_Platte05:UnPhysicalize(true) + self.PE_Balloon_Platte06:UnPhysicalize(true) + self.PE_Balloon_Platte07:UnPhysicalize(true) + self.PE_Balloon_Platte08:UnPhysicalize(true) GamePlay.GamePlayManager._SoundLastSector:Stop() + + ModulBase.Deactive(self) end function PE_Balloon:Reset(type) GamePlay.GamePlayManager._SoundLastSector:Stop() @@ -145,6 +158,6 @@ function PE_Balloon:Backup() ObjectStateBackupUtils.BackUpObjectAndChilds(self.gameObject) end -function CreateClass_PE_Balloon() +function CreateClass:PE_Balloon() return PE_Balloon() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/PS_FourFlames.lua b/Assets/Game/Scripts/Moduls/PS_FourFlames.lua index e230bc29..7c48da5f 100644 --- a/Assets/Game/Scripts/Moduls/PS_FourFlames.lua +++ b/Assets/Game/Scripts/Moduls/PS_FourFlames.lua @@ -27,6 +27,6 @@ end function PS_FourFlames:Backup() end -function CreateClass_PS_FourFlames() +function CreateClass:PS_FourFlames() return PS_FourFlames() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Extra_Life.lua b/Assets/Game/Scripts/Moduls/P_Extra_Life.lua index 89c19c4d..5b6275b8 100644 --- a/Assets/Game/Scripts/Moduls/P_Extra_Life.lua +++ b/Assets/Game/Scripts/Moduls/P_Extra_Life.lua @@ -69,6 +69,6 @@ function P_Extra_Life:Reset() self.P_Extra_Life_Animator.speed = 0 end -function CreateClass_P_Extra_Life() +function CreateClass:P_Extra_Life() return P_Extra_Life() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Extra_Point.lua b/Assets/Game/Scripts/Moduls/P_Extra_Point.lua index 03c9ee5d..b9b749ab 100644 --- a/Assets/Game/Scripts/Moduls/P_Extra_Point.lua +++ b/Assets/Game/Scripts/Moduls/P_Extra_Point.lua @@ -208,6 +208,6 @@ function P_Extra_Point:Backup() ObjectStateBackupUtils.BackUpObject(self.P_Extra_Point_Ball6) end -function CreateClass_P_Extra_Point() +function CreateClass:P_Extra_Point() return P_Extra_Point() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_01.lua b/Assets/Game/Scripts/Moduls/P_Modul_01.lua new file mode 100644 index 00000000..4d0eab96 --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_01.lua @@ -0,0 +1,44 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_01 = ModulBase:extend() + +---P_Modul_01 +---栅栏机关 +---@class P_Modul_01 : ModulBase +---@field P_Modul_01_Rinne PhysicsObject +---@field P_Modul_01_Filter PhysicsObject +---@field P_Modul_01_Pusher PhysicsObject +function P_Modul_01:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 +end + +function P_Modul_01:Active() + self.gameObject:SetActive(true) + self.P_Modul_01_Rinne:Physicalize() + self.P_Modul_01_Filter:Physicalize() + self.P_Modul_01_Pusher:Physicalize() + self.P_Modul_01_Pusher.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('WoodOnlyHit') +end +function P_Modul_01:Deactive() + self.P_Modul_01_Rinne:UnPhysicalize(true) + self.P_Modul_01_Filter:UnPhysicalize(true) + self.P_Modul_01_Pusher:UnPhysicalize(true) + self.gameObject:SetActive(false) +end +function P_Modul_01:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_01:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end +function P_Modul_01:BallEnterRange() + if self.IsActive then + self.P_Modul_01_Pusher:WakeUp() + end +end + +function CreateClass:P_Modul_01() + return P_Modul_01() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_01.lua.meta similarity index 74% rename from Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua.meta rename to Assets/Game/Scripts/Moduls/P_Modul_01.lua.meta index 43ed976d..962f71a8 100644 --- a/Assets/Game/Scripts/GamePlay/Balls/BallPaperPiecesWind.lua.meta +++ b/Assets/Game/Scripts/Moduls/P_Modul_01.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83748a0d8b16460469e73f8b5fbd4e84 +guid: 8a68f4b908f65c445b70c61a8aea4a1c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_03.lua b/Assets/Game/Scripts/Moduls/P_Modul_03.lua index 03bb608b..e8fb5c21 100644 --- a/Assets/Game/Scripts/Moduls/P_Modul_03.lua +++ b/Assets/Game/Scripts/Moduls/P_Modul_03.lua @@ -3,41 +3,45 @@ local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils P_Modul_03 = ModulBase:extend() ---@class P_Modul_03 : ModulBase ----@field P_Modul_03_Floor PhysicsBody ----@field P_Modul_03_Gate PhysicsBody ----@field P_Modul_03_Wall01 PhysicsBody ----@field P_Modul_03_Wall02 PhysicsBody ----@field P_Modul_03_Wall03 PhysicsBody ----@field P_Modul_03_Wall04 PhysicsBody ----@field P_Modul_03_Wall05 PhysicsBody ----@field P_Modul_03_Wall06 PhysicsBody ----@field P_Modul_03_Wall07 PhysicsBody +---@field P_Modul_03_Floor PhysicsObject +---@field P_Modul_03_Gate PhysicsObject +---@field P_Modul_03_Wall01 PhysicsObject +---@field P_Modul_03_Wall02 PhysicsObject +---@field P_Modul_03_Wall03 PhysicsObject +---@field P_Modul_03_Wall04 PhysicsObject +---@field P_Modul_03_Wall05 PhysicsObject +---@field P_Modul_03_Wall06 PhysicsObject +---@field P_Modul_03_Wall07 PhysicsObject function P_Modul_03:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 end function P_Modul_03:Active() - self.gameObject:SetActive(true) - self.P_Modul_03_Floor:ForcePhysics() - self.P_Modul_03_Gate:ForcePhysics() - self.P_Modul_03_Wall01:ForcePhysics() - self.P_Modul_03_Wall02:ForcePhysics() - self.P_Modul_03_Wall03:ForcePhysics() - self.P_Modul_03_Wall04:ForcePhysics() - self.P_Modul_03_Wall05:ForcePhysics() - self.P_Modul_03_Wall06:ForcePhysics() - self.P_Modul_03_Wall07:ForcePhysics() + ModulBase.Active(self) + self.P_Modul_03_Floor:Physicalize() + self.P_Modul_03_Gate:Physicalize() + self.P_Modul_03_Wall01:Physicalize() + self.P_Modul_03_Wall02:Physicalize() + self.P_Modul_03_Wall03:Physicalize() + self.P_Modul_03_Wall04:Physicalize() + self.P_Modul_03_Wall05:Physicalize() + self.P_Modul_03_Wall06:Physicalize() + self.P_Modul_03_Wall07:Physicalize() + self.P_Modul_03_Floor.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('Wood') end function P_Modul_03:Deactive() - self.P_Modul_03_Floor:ForceDePhysics() - self.P_Modul_03_Gate:ForceDePhysics() - self.P_Modul_03_Wall01:ForceDePhysics() - self.P_Modul_03_Wall02:ForceDePhysics() - self.P_Modul_03_Wall03:ForceDePhysics() - self.P_Modul_03_Wall04:ForceDePhysics() - self.P_Modul_03_Wall05:ForceDePhysics() - self.P_Modul_03_Wall06:ForceDePhysics() - self.P_Modul_03_Wall07:ForceDePhysics() - self.gameObject:SetActive(false) + self.P_Modul_03_Floor:UnPhysicalize(true) + self.P_Modul_03_Gate:UnPhysicalize(true) + self.P_Modul_03_Wall01:UnPhysicalize(true) + self.P_Modul_03_Wall02:UnPhysicalize(true) + self.P_Modul_03_Wall03:UnPhysicalize(true) + self.P_Modul_03_Wall04:UnPhysicalize(true) + self.P_Modul_03_Wall05:UnPhysicalize(true) + self.P_Modul_03_Wall06:UnPhysicalize(true) + self.P_Modul_03_Wall07:UnPhysicalize(true) + ModulBase.Deactive(self) end function P_Modul_03:Reset() ObjectStateBackupUtils.RestoreObject(self.gameObject) @@ -45,7 +49,12 @@ end function P_Modul_03:Backup() ObjectStateBackupUtils.BackUpObject(self.gameObject) end +function P_Modul_03:BallEnterRange() + if self.IsActive then + self.P_Modul_03_Floor:WakeUp() + end +end -function CreateClass_P_Modul_03() +function CreateClass:P_Modul_03() return P_Modul_03() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_08.lua b/Assets/Game/Scripts/Moduls/P_Modul_08.lua index fab7aed2..e289e01b 100644 --- a/Assets/Game/Scripts/Moduls/P_Modul_08.lua +++ b/Assets/Game/Scripts/Moduls/P_Modul_08.lua @@ -1,21 +1,19 @@ local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils ---@class P_Modul_08 : ModulBase ----@field P_Modul_08_Schaukel_Force PhysicsForce ----@field P_Modul_08_Schaukel PhysicsBody +---@field P_Modul_08_Schaukel PhysicsObject ---@field P_Modul_08_ForcePovit_2 Transform ---@field P_Modul_08_ForcePovit_1 Transform P_Modul_08 = ModulBase:extend() function P_Modul_08:new() + ModulBase.super.new(self) self._EnableForce = false self._ForceIsLeft = false self._ForceTick = 0 self._ForceAppilyTick = 10 --(6/0.1s) end -function P_Modul_08:Start() -end function P_Modul_08:FixedUpdate() if self._EnableForce then if self._ForceTick > 0 then @@ -25,25 +23,25 @@ function P_Modul_08:FixedUpdate() self._ForceIsLeft = not self._ForceIsLeft self._ForceTick = self._ForceAppilyTick if self._ForceIsLeft then - self.P_Modul_08_Schaukel_Force.ForceRef = self.P_Modul_08_ForcePovit_1 + self.P_Modul_08_Schaukel.ConstantForceDirectionRef = self.P_Modul_08_ForcePovit_1 else - self.P_Modul_08_Schaukel_Force.ForceRef = self.P_Modul_08_ForcePovit_2 + self.P_Modul_08_Schaukel.ConstantForceDirectionRef = self.P_Modul_08_ForcePovit_2 end end end end function P_Modul_08:Active() - self.gameObject:SetActive(true) - self.P_Modul_08_Schaukel:ForcePhysics() - self.P_Modul_08_Schaukel_Force.Enable = true + ModulBase.Active(self) + self.P_Modul_08_Schaukel:Physicalize() + self.P_Modul_08_Schaukel.EnableConstantForce = true self._EnableForce = true end function P_Modul_08:Deactive() - self.P_Modul_08_Schaukel_Force.Enable = false + self.P_Modul_08_Schaukel.EnableConstantForce = false self._EnableForce = false self._ForceTick = 0 - self.P_Modul_08_Schaukel:ForceDePhysics() - self.gameObject:SetActive(false) + self.P_Modul_08_Schaukel:UnPhysicalize(true) + ModulBase.Deactive(self) end function P_Modul_08:Reset() ObjectStateBackupUtils.RestoreObject(self.P_Modul_08_Schaukel.gameObject) @@ -54,6 +52,6 @@ function P_Modul_08:Backup() ObjectStateBackupUtils.BackUpObject(self.P_Modul_08_Schaukel.gameObject) end -function CreateClass_P_Modul_08() +function CreateClass:P_Modul_08() return P_Modul_08() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_17.lua b/Assets/Game/Scripts/Moduls/P_Modul_17.lua new file mode 100644 index 00000000..ffd5031d --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_17.lua @@ -0,0 +1,31 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +---@class P_Modul_17 : ModulBase +---@field Modul17_Dreharme PhysicsObject +P_Modul_17 = ModulBase:extend() + +function P_Modul_17:new() + ModulBase.super.new(self) +end + +function P_Modul_17:Active() + ModulBase.Active(self) + self.Modul17_Dreharme:Physicalize() + self._EnableForce = true +end +function P_Modul_17:Deactive() + self.Modul17_Dreharme:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_17:Reset() + ObjectStateBackupUtils.RestoreObject(self.Modul17_Dreharme.gameObject) + self._ForceIsLeft = false + self._ForceTick = 0 +end +function P_Modul_17:Backup() + ObjectStateBackupUtils.BackUpObject(self.Modul17_Dreharme.gameObject) +end + +function CreateClass:P_Modul_17() + return P_Modul_17() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_17.lua.meta similarity index 74% rename from Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua.meta rename to Assets/Game/Scripts/Moduls/P_Modul_17.lua.meta index 0a95d435..03c1d8f6 100644 --- a/Assets/Game/Scripts/GamePlay/ModulBase/ModulComplexPhysics.lua.meta +++ b/Assets/Game/Scripts/Moduls/P_Modul_17.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86c18c028e55b234ba829a93b86649d9 +guid: f4567a6f44bb710498732dd7c90b9de1 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_18.lua b/Assets/Game/Scripts/Moduls/P_Modul_18.lua index e3d44d0c..dbc5e148 100644 --- a/Assets/Game/Scripts/Moduls/P_Modul_18.lua +++ b/Assets/Game/Scripts/Moduls/P_Modul_18.lua @@ -1,7 +1,8 @@ local Vector3 = UnityEngine.Vector3 +local Time = UnityEngine.Time ---@class P_Modul_18 : ModulBase ----@field P_Modul_18_Kollisionsquader PhysicsPhantom +---@field P_Modul_18_Kollisionsquader TiggerTester ---@field P_Modul_18_Rotor Animator ---@field P_Modul_18_Particle GameObject ---@field P_Modul_18_Particle_Small GameObject @@ -10,32 +11,32 @@ local Vector3 = UnityEngine.Vector3 P_Modul_18 = ModulBase:extend() function P_Modul_18:new() - self._CurrentInRangeBall = nil ---@type PhysicsBody + ModulBase.super.new(self) + self._CurrentInRangeBall = nil ---@type PhysicsObject end function P_Modul_18:Start() - self.P_Modul_18_Kollisionsquader:ForceReCreate() - ---@param phantom PhysicsPhantom - ---@param otherBody PhysicsBody - self.P_Modul_18_Kollisionsquader.onOverlappingCollidableAdd = function (phantom, otherBody) - if self._CurrentInRangeBall == nil and otherBody.gameObject.tag == 'Ball' and otherBody.gameObject.name == 'BallPaper' then - self._CurrentInRangeBall = otherBody + ModulBase.Start(self) + ---@param other GameObject + self.P_Modul_18_Kollisionsquader.onTriggerEnter = function (_, other) + if self._CurrentInRangeBall == nil and other.tag == 'Ball' and other.name == 'BallPaper' then + self._CurrentInRangeBall = GamePlay.BallManager.CurrentBall._Rigidbody end end - ---@param phantom PhysicsPhantom - ---@param otherBody PhysicsBody - self.P_Modul_18_Kollisionsquader.onOverlappingCollidableRemove = function (phantom, otherBody) - if self._CurrentInRangeBall ~= nil and otherBody.gameObject.tag == 'Ball' and otherBody.gameObject.name == 'BallPaper' then + ---@param other GameObject + self.P_Modul_18_Kollisionsquader.onTriggerExit = function (_, other) + if self._CurrentInRangeBall ~= nil and other.tag == 'Ball' and other.name == 'BallPaper' then self._CurrentInRangeBall = nil end end end function P_Modul_18:FixedUpdate() if self._CurrentInRangeBall ~= nil then - self._CurrentInRangeBall:ApplyForce(Vector3(0, self.P_Modul_18_Force, 0)) -- 为球添加向上的力 + self._CurrentInRangeBall:Impluse(Vector3(0, self.P_Modul_18_Force * Time.fixedDeltaTime, 0)) -- 为球添加向上的力 end end function P_Modul_18:Active() + ModulBase.Active(self) self.P_Modul_18_Particle:SetActive(true) self.P_Modul_18_Particle_Small:SetActive(true) self.P_Modul_18_Sound:Play(); @@ -49,11 +50,12 @@ function P_Modul_18:Deactive() self.P_Modul_18_Kollisionsquader.gameObject:SetActive(false) self.P_Modul_18_Rotor:Play('P_Modul_18_Rotor_Stop_Animation') self._CurrentInRangeBall = nil + ModulBase.Deactive(self) end function P_Modul_18:Reset() self._CurrentInRangeBall = nil end -function CreateClass_P_Modul_18() +function CreateClass:P_Modul_18() return P_Modul_18() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_19.lua b/Assets/Game/Scripts/Moduls/P_Modul_19.lua new file mode 100644 index 00000000..24dc62d4 --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_19.lua @@ -0,0 +1,38 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_19 = ModulBase:extend() + +---P_Modul_19 +---双向推板机关 +---@class P_Modul_19 : ModulBase +---@field P_Modul_19_Flaps PhysicsObject +function P_Modul_19:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 +end + +function P_Modul_19:Active() + ModulBase.Active(self) + self.P_Modul_19_Flaps:Physicalize() + self.P_Modul_19_Flaps.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('Wood') +end +function P_Modul_19:Deactive() + self.P_Modul_19_Flaps:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_19:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_19:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end +function P_Modul_19:BallEnterRange() + if self.IsActive then + self.P_Modul_19_Flaps:WakeUp() + end +end + +function CreateClass:P_Modul_19() + return P_Modul_19() +end \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem.meta b/Assets/Game/Scripts/Moduls/P_Modul_19.lua.meta similarity index 67% rename from Assets/Scripts/PhysicsSystem.meta rename to Assets/Game/Scripts/Moduls/P_Modul_19.lua.meta index 0de0c8ab..36b6668d 100644 --- a/Assets/Scripts/PhysicsSystem.meta +++ b/Assets/Game/Scripts/Moduls/P_Modul_19.lua.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 4697160a5881cd047ad4d4bda3df1a37 -folderAsset: yes +guid: f8d2856bf1b4f5e47bfbf9ef434cc185 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_25.lua b/Assets/Game/Scripts/Moduls/P_Modul_25.lua new file mode 100644 index 00000000..5ec08d1e --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_25.lua @@ -0,0 +1,38 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_25 = ModulBase:extend() + +---P_Modul_25 +---推板机关 +---@class P_Modul_25 : ModulBase +---@field P_Modul_25_Bridge PhysicsObject +function P_Modul_25:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 +end + +function P_Modul_25:Active() + ModulBase.Active(self) + self.P_Modul_25_Bridge:Physicalize() + self.P_Modul_25_Bridge.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('WoodOnlyHit') +end +function P_Modul_25:Deactive() + self.P_Modul_25_Bridge:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_25:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_25:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end +function P_Modul_25:BallEnterRange() + if self.IsActive then + self.P_Modul_25_Bridge:WakeUp() + end +end + +function CreateClass:P_Modul_25() + return P_Modul_25() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_25.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_25.lua.meta new file mode 100644 index 00000000..e2c72a1d --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_25.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8723d8305ea1d9445ad7a832b9103586 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_26.lua b/Assets/Game/Scripts/Moduls/P_Modul_26.lua index 7d135810..0e9d8ea7 100644 --- a/Assets/Game/Scripts/Moduls/P_Modul_26.lua +++ b/Assets/Game/Scripts/Moduls/P_Modul_26.lua @@ -1,22 +1,20 @@ local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils ---@class P_Modul_26 : ModulBase ----@field P_Modul_26_SackForce PhysicsForce ----@field P_Modul_26_Rope PhysicsBody ----@field P_Modul_26_Sack PhysicsBody +---@field P_Modul_26_Rope PhysicsObject +---@field P_Modul_26_Sack PhysicsObject ---@field P_Modul_26_ForcePovit_2 Transform ---@field P_Modul_26_ForcePovit_1 Transform P_Modul_26 = ModulBase:extend() function P_Modul_26:new() + ModulBase.super.new(self) self._EnableForce = false self._ForceIsLeft = false self._ForceTick = 0 self._ForceAppilyTick = 8 --(6/0.1s) end -function P_Modul_26:Start() -end function P_Modul_26:FixedUpdate() if self._EnableForce then if self._ForceTick > 0 then @@ -26,27 +24,27 @@ function P_Modul_26:FixedUpdate() self._ForceIsLeft = not self._ForceIsLeft self._ForceTick = self._ForceAppilyTick if self._ForceIsLeft then - self.P_Modul_26_SackForce.ForceRef = self.P_Modul_26_ForcePovit_1 + self.P_Modul_26_Sack.ConstantForceDirectionRef = self.P_Modul_26_ForcePovit_1 else - self.P_Modul_26_SackForce.ForceRef = self.P_Modul_26_ForcePovit_2 + self.P_Modul_26_Sack.ConstantForceDirectionRef = self.P_Modul_26_ForcePovit_2 end end end end function P_Modul_26:Active() - self.gameObject:SetActive(true) - self.P_Modul_26_Rope:ForcePhysics() - self.P_Modul_26_Sack:ForcePhysics() - self.P_Modul_26_SackForce.Enable = true + ModulBase.Active(self) + self.P_Modul_26_Rope:Physicalize() + self.P_Modul_26_Sack:Physicalize() + self.P_Modul_26_Sack.EnableConstantForce = true self._EnableForce = true end function P_Modul_26:Deactive() - self.P_Modul_26_SackForce.Enable = false + self.P_Modul_26_Sack.EnableConstantForce = false self._EnableForce = false self._ForceTick = 0 - self.P_Modul_26_Rope:ForceDePhysics() - self.P_Modul_26_Sack:ForceDePhysics() - self.gameObject:SetActive(false) + self.P_Modul_26_Rope:UnPhysicalize(true) + self.P_Modul_26_Sack:UnPhysicalize(true) + ModulBase.Deactive(self) end function P_Modul_26:Reset() ObjectStateBackupUtils.RestoreObject(self.P_Modul_26_Rope.gameObject) @@ -59,6 +57,6 @@ function P_Modul_26:Backup() ObjectStateBackupUtils.BackUpObject(self.P_Modul_26_Sack.gameObject) end -function CreateClass_P_Modul_26() +function CreateClass:P_Modul_26() return P_Modul_26() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_29.lua b/Assets/Game/Scripts/Moduls/P_Modul_29.lua index f56f3af3..21c04840 100644 --- a/Assets/Game/Scripts/Moduls/P_Modul_29.lua +++ b/Assets/Game/Scripts/Moduls/P_Modul_29.lua @@ -2,28 +2,32 @@ local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils local GameSoundType = Ballance2.Sys.Services.GameSoundType ---@class P_Modul_29 : ModulBase ----@field _P_Modul_29_Platte01 PhysicsBody ----@field _P_Modul_29_Platte02 PhysicsBody ----@field _P_Modul_29_Platte03 PhysicsBody ----@field _P_Modul_29_Platte04 PhysicsBody ----@field _P_Modul_29_Platte05 PhysicsBody ----@field _P_Modul_29_Platte05_HingeConstraint HingeConstraint ----@field _P_Modul_29_Platte06 PhysicsBody ----@field _P_Modul_29_Platte07 PhysicsBody ----@field _P_Modul_29_Platte08 PhysicsBody ----@field _P_Modul_29_Platte09 PhysicsBody +---@field _P_Modul_29_Platte01 PhysicsObject +---@field _P_Modul_29_Platte02 PhysicsObject +---@field _P_Modul_29_Platte03 PhysicsObject +---@field _P_Modul_29_Platte04 PhysicsObject +---@field _P_Modul_29_Platte05 PhysicsObject +---@field _P_Modul_29_Platte06 PhysicsObject +---@field _P_Modul_29_Platte07 PhysicsObject +---@field _P_Modul_29_Platte08 PhysicsObject +---@field _P_Modul_29_Platte09 PhysicsObject +---@field _P_Modul_29_Platte05_HingeConstraint PhysicsHinge +---@field _P_Modul_29_Platte05_Tigger TiggerTester P_Modul_29 = ModulBase:extend() function P_Modul_29:new() + ModulBase.super.new(self) self._BrigeBreaked = false + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 end function P_Modul_29:Start() - ---@param body PhysicsBody - ---@param otherBody PhysicsBody - self._P_Modul_29_Platte05.onCollisionEnter = function (body, otherBody) + ModulBase.Start(self) + ---@param other GameObject + self._P_Modul_29_Platte05_Tigger.onTriggerEnter = function (_, other) --石球断开木桥 - if not self._BrigeBreaked and otherBody.gameObject.tag == 'Ball' and otherBody.gameObject.name ~= 'BallStone' then + if not self._BrigeBreaked and other.tag == 'Ball' and other.name ~= 'BallStone' then self._BrigeBreaked = true self._P_Modul_29_Platte05_HingeConstraint:Destroy() Game.SoundManager:PlayFastVoice('core.sounds:Misc_RopeTears.wav', GameSoundType.Normal) @@ -31,38 +35,42 @@ function P_Modul_29:Start() end end function P_Modul_29:Active() - self.gameObject:SetActive(true) - self._P_Modul_29_Platte01:ForcePhysics() - self._P_Modul_29_Platte02:ForcePhysics() - self._P_Modul_29_Platte03:ForcePhysics() - self._P_Modul_29_Platte04:ForcePhysics() - self._P_Modul_29_Platte05:ForcePhysics() - self._P_Modul_29_Platte06:ForcePhysics() - self._P_Modul_29_Platte07:ForcePhysics() - self._P_Modul_29_Platte08:ForcePhysics() - self._P_Modul_29_Platte09:ForcePhysics() + ModulBase.Active(self) + self._P_Modul_29_Platte01:Physicalize() + self._P_Modul_29_Platte02:Physicalize() + self._P_Modul_29_Platte03:Physicalize() + self._P_Modul_29_Platte04:Physicalize() + self._P_Modul_29_Platte05:Physicalize() + self._P_Modul_29_Platte06:Physicalize() + self._P_Modul_29_Platte07:Physicalize() + self._P_Modul_29_Platte08:Physicalize() + self._P_Modul_29_Platte09:Physicalize() end function P_Modul_29:Deactive() - self._P_Modul_29_Platte01:ForceDePhysics() - self._P_Modul_29_Platte02:ForceDePhysics() - self._P_Modul_29_Platte03:ForceDePhysics() - self._P_Modul_29_Platte04:ForceDePhysics() - self._P_Modul_29_Platte05:ForceDePhysics() - self._P_Modul_29_Platte06:ForceDePhysics() - self._P_Modul_29_Platte07:ForceDePhysics() - self._P_Modul_29_Platte08:ForceDePhysics() - self._P_Modul_29_Platte09:ForceDePhysics() - self.gameObject:SetActive(false) + self._P_Modul_29_Platte01:UnPhysicalize(true) + self._P_Modul_29_Platte02:UnPhysicalize(true) + self._P_Modul_29_Platte03:UnPhysicalize(true) + self._P_Modul_29_Platte04:UnPhysicalize(true) + self._P_Modul_29_Platte05:UnPhysicalize(true) + self._P_Modul_29_Platte06:UnPhysicalize(true) + self._P_Modul_29_Platte07:UnPhysicalize(true) + self._P_Modul_29_Platte08:UnPhysicalize(true) + self._P_Modul_29_Platte09:UnPhysicalize(true) + ModulBase.Deactive(self) end function P_Modul_29:Reset() - self._P_Modul_29_Platte05_HingeConstraint:Create() ObjectStateBackupUtils.RestoreObjectAndChilds(self.gameObject) self._BrigeBreaked = false end function P_Modul_29:Backup() ObjectStateBackupUtils.BackUpObjectAndChilds(self.gameObject) end +function P_Modul_29:BallEnterRange() + if self.IsActive then + self._P_Modul_29_Platte04:WakeUp() + end +end -function CreateClass_P_Modul_29() +function CreateClass:P_Modul_29() return P_Modul_29() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_30.lua b/Assets/Game/Scripts/Moduls/P_Modul_30.lua new file mode 100644 index 00000000..6ea3bbaf --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_30.lua @@ -0,0 +1,38 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_30 = ModulBase:extend() + +---P_Modul_30 +---跷跷板机关 +---@class P_Modul_30 : ModulBase +---@field P_Modul_30_Wippe PhysicsObject +function P_Modul_30:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 +end + +function P_Modul_30:Active() + ModulBase.Active(self) + self.P_Modul_30_Wippe:Physicalize() + self.P_Modul_30_Wippe.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('Wood') +end +function P_Modul_30:Deactive() + self.P_Modul_30_Wippe:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_30:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_30:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end +function P_Modul_30:BallEnterRange() + if self.IsActive then + self.P_Modul_30_Wippe:WakeUp() + end +end + +function CreateClass:P_Modul_30() + return P_Modul_30() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_30.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_30.lua.meta new file mode 100644 index 00000000..a2fd4098 --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_30.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b15a033bcd22306429fe5fffc16ab54a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_34.lua b/Assets/Game/Scripts/Moduls/P_Modul_34.lua new file mode 100644 index 00000000..24d59f4e --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_34.lua @@ -0,0 +1,43 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +---@class P_Modul_34 : ModulBase +---@field P_Modul_34_Kiste PhysicsObject +---@field P_Modul_34_Schiebestein PhysicsObject +P_Modul_34 = ModulBase:extend() + +function P_Modul_34:new() + P_Modul_34.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 50 +end + +function P_Modul_34:Start() + ModulBase.Start(self) +end +function P_Modul_34:Active() + self.P_Modul_34_Kiste:Physicalize() + self.P_Modul_34_Schiebestein:Physicalize() + ModulBase.Active(self) +end +function P_Modul_34:Deactive() + self.P_Modul_34_Kiste:UnPhysicalize(true) + self.P_Modul_34_Schiebestein:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_34:Reset() + ObjectStateBackupUtils.RestoreObjectAndChilds(self.gameObject) + self._ForceIsLeft = false + self._ForceTick = 0 +end +function P_Modul_34:Backup() + ObjectStateBackupUtils.BackUpObjectAndChilds(self.gameObject) +end +function P_Modul_34:BallEnterRange() + if self.IsActive then + self.P_Modul_34_Schiebestein:WakeUp() + end +end + +function CreateClass:P_Modul_34() + return P_Modul_34() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_34.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_34.lua.meta new file mode 100644 index 00000000..d801783d --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_34.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 32dd6a60e174bc94da7064c58d721fda +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_37.lua b/Assets/Game/Scripts/Moduls/P_Modul_37.lua new file mode 100644 index 00000000..51da357f --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_37.lua @@ -0,0 +1,38 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_37 = ModulBase:extend() + +---P_Modul_37 +---T推板机关 +---@class P_Modul_37 : ModulBase +---@field P_Modul_37_Bridge PhysicsObject +function P_Modul_37:new() + ModulBase.super.new(self) + self.EnableBallRangeChecker = true + self.BallCheckeRange = 60 +end + +function P_Modul_37:Active() + ModulBase.Active(self) + self.P_Modul_37_Bridge:Physicalize() + self.P_Modul_37_Bridge.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('Wood') +end +function P_Modul_37:Deactive() + self.P_Modul_37_Bridge:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_37:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_37:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end +function P_Modul_37:BallEnterRange() + if self.IsActive then + self.P_Modul_37_Bridge:WakeUp() + end +end + +function CreateClass:P_Modul_37() + return P_Modul_37() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_37.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_37.lua.meta new file mode 100644 index 00000000..53579d2c --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_37.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3a33c47557f82c4fb88521792457a2b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Moduls/P_Modul_41.lua b/Assets/Game/Scripts/Moduls/P_Modul_41.lua new file mode 100644 index 00000000..9ab17206 --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_41.lua @@ -0,0 +1,31 @@ +local ObjectStateBackupUtils = Ballance2.Sys.Utils.ObjectStateBackupUtils + +P_Modul_41 = ModulBase:extend() + +---P_Modul_41 +---浮块机关 +---@class P_Modul_41 : ModulBase +---@field P_Modul_41_Box PhysicsObject +function P_Modul_41:new() + ModulBase.super.new(self) +end + +function P_Modul_41:Active() + ModulBase.Active(self) + self.P_Modul_41_Box:Physicalize() + self.P_Modul_41_Box.CustomLayer = GamePlay.BallSoundManager:GetCustomSoundLayerByName('WoodOnlyHit') +end +function P_Modul_41:Deactive() + self.P_Modul_41_Box:UnPhysicalize(true) + ModulBase.Deactive(self) +end +function P_Modul_41:Reset() + ObjectStateBackupUtils.RestoreObject(self.gameObject) +end +function P_Modul_41:Backup() + ObjectStateBackupUtils.BackUpObject(self.gameObject) +end + +function CreateClass:P_Modul_41() + return P_Modul_41() +end \ No newline at end of file diff --git a/Assets/Game/Scripts/Moduls/P_Modul_41.lua.meta b/Assets/Game/Scripts/Moduls/P_Modul_41.lua.meta new file mode 100644 index 00000000..55be182d --- /dev/null +++ b/Assets/Game/Scripts/Moduls/P_Modul_41.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb56c9d5d93ff7d47aba1c1f9f3dc89f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Moduls/P_Trafo_Base.lua b/Assets/Game/Scripts/Moduls/P_Trafo_Base.lua index 8576670b..35e10207 100644 --- a/Assets/Game/Scripts/Moduls/P_Trafo_Base.lua +++ b/Assets/Game/Scripts/Moduls/P_Trafo_Base.lua @@ -1,22 +1,21 @@ ---@class P_Trafo_Base : ModulBase ----@field _Tigger PhysicsPhantom +---@field _Tigger TiggerTester ---@field _TargetBallType string ---@field _Color Color P_Trafo_Base = ModulBase:extend() function P_Trafo_Base:new() - self._Tigger = nil ---@type PhysicsPhantom + self._Tigger = nil ---@type TiggerTester self._TargetBallType = '' self._Color = nil self.TranfoActived = false end function P_Trafo_Base:Start() - ---@param phantom PhysicsPhantom - ---@param otherBody PhysicsBody - self._Tigger.onOverlappingCollidableAdd = function (phantom, otherBody) + ---@param other GameObject + self._Tigger.onTriggerEnter = function (_, other) --球，并且球类型于目标类型不一致 - if not self._TranfoActived and otherBody.gameObject.tag == 'Ball' and otherBody.gameObject.name ~= self._TargetBallType then + if not self._TranfoActived and other.tag == 'Ball' and other.name ~= self._TargetBallType then --触发变球 self._TranfoActived = true GamePlay.GamePlayManager:ActiveTranfo(self, self._TargetBallType, self._Color) @@ -36,6 +35,6 @@ function P_Trafo_Base:Backup() end -function CreateClass_P_Trafo_Base() +function CreateClass:P_Trafo_Base() return P_Trafo_Base() end \ No newline at end of file diff --git a/Assets/Game/Scripts/Utils/classic.lua b/Assets/Game/Scripts/Utils/classic.lua index 3add5578..da4f017e 100644 --- a/Assets/Game/Scripts/Utils/classic.lua +++ b/Assets/Game/Scripts/Utils/classic.lua @@ -8,6 +8,7 @@ -- ---@class ClassicObject +---@field super ClassicObject local ClassicObject = {} ClassicObject.__index = ClassicObject diff --git a/Assets/Materials/RedMaterial.mat b/Assets/Materials/RedMaterial.mat index ef50821a..a3288c2f 100644 --- a/Assets/Materials/RedMaterial.mat +++ b/Assets/Materials/RedMaterial.mat @@ -55,13 +55,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -73,6 +74,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 0.8490566, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.debug/DebugOptWindow.lua b/Assets/Packages/core.debug/DebugOptWindow.lua index f1525d60..ff0add2c 100644 --- a/Assets/Packages/core.debug/DebugOptWindow.lua +++ b/Assets/Packages/core.debug/DebugOptWindow.lua @@ -31,7 +31,7 @@ DebugOptWindow = { } ---调试功能列表窗口 -function CreateClass_DebugOptWindow() +function CreateClass:DebugOptWindow() function DebugOptWindow:new(o) o = o or {} setmetatable(o, self) diff --git a/Assets/Packages/core.debug/DebugTools.lua b/Assets/Packages/core.debug/DebugTools.lua index 45c84e4b..be2ff679 100644 --- a/Assets/Packages/core.debug/DebugTools.lua +++ b/Assets/Packages/core.debug/DebugTools.lua @@ -30,7 +30,7 @@ DebugTools = { logCount = 0, } -function CreateClass_DebugTools() +function CreateClass:DebugTools() function DebugTools:new(o) o = o or {} setmetatable(o, self) diff --git a/Assets/Packages/core.debug/DebugWindow.lua b/Assets/Packages/core.debug/DebugWindow.lua index a6c05465..ee3e544b 100644 --- a/Assets/Packages/core.debug/DebugWindow.lua +++ b/Assets/Packages/core.debug/DebugWindow.lua @@ -55,7 +55,7 @@ DebugWindow = { cmdServer = nil, } -function CreateClass_DebugWindow() +function CreateClass:DebugWindow() function DebugWindow:new(o) o = o or {} setmetatable(o, self) diff --git a/Assets/Packages/core.menulevel/Import/MenuLevel.FBX.meta b/Assets/Packages/core.menulevel/Import/MenuLevel.FBX.meta index 826a7b6b..dcdc48ed 100644 --- a/Assets/Packages/core.menulevel/Import/MenuLevel.FBX.meta +++ b/Assets/Packages/core.menulevel/Import/MenuLevel.FBX.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c0acd9cfb86a2d545845c6e9446062bb ModelImporter: - serializedVersion: 20200 + serializedVersion: 21202 internalIDToNameTable: - first: 74: 1827226128182048838 @@ -11,62 +11,62 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Ball_Stone - second: {fileID: 2100000, guid: 456cdb1c3804a154ab306cb1c7f94774, type: 2} + second: {fileID: 2100000, guid: 9fe145a79f262a84a9d1279dcefc5a7b, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Columns_beige_fade - second: {fileID: 2100000, guid: e0b625c75007d91408e6ea87a1415847, type: 2} + second: {fileID: 2100000, guid: 2a1f38039065894489dc49be4ca87ead, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Colums_beige - second: {fileID: 2100000, guid: cba8335627d875f4381404e0b255b422, type: 2} + second: {fileID: 2100000, guid: aafa34ed96da6ca489588f918fb0cdbe, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Colums_blue - second: {fileID: 2100000, guid: fb4a5bea7659a9c439482cc5b46df518, type: 2} + second: {fileID: 2100000, guid: 8afc1e8d1925ed14f9a8280db3c05f72, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Dome - second: {fileID: 2100000, guid: f19bf66724991a44b981bcd2c0a3d746, type: 2} + second: {fileID: 2100000, guid: ae8fbb6f53508374287aaab23d784e53, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_DomeShadow - second: {fileID: 2100000, guid: 4a188d0679b24fb4e9500b388ee300d4, type: 2} + second: {fileID: 2100000, guid: c492201075737c2489ed68aa9a464f3f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Side - second: {fileID: 2100000, guid: 2d0b3a37724641845a06171b222d9b20, type: 2} + second: {fileID: 2100000, guid: 618a93596a9fee34bbf6dad8801c87b2, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Top_Boderless - second: {fileID: 2100000, guid: ccc886496f0b01b4182dc49c53a6a6c2, type: 2} + second: {fileID: 2100000, guid: 58fb8afde889e3a47b0c0aa81369e51e, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Top_Checkpoint - second: {fileID: 2100000, guid: 66147b4cd2774704fb77e71331b0cb2d, type: 2} + second: {fileID: 2100000, guid: f36980d0850fd7f42be3df65ae666fee, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Top_Flat - second: {fileID: 2100000, guid: c361ef40a1c0ad24a937226da554e6b3, type: 2} + second: {fileID: 2100000, guid: 7c593523c8d2337439151593e8f5c798, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Top_Profile - second: {fileID: 2100000, guid: c0afadb9a5e72e44bab0100af6b0724a, type: 2} + second: {fileID: 2100000, guid: 021e6d404dff278449c9a6ec25168d78, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Top_ProfileFlat - second: {fileID: 2100000, guid: fed43b58dc48b524c91421a658880e9b, type: 2} + second: {fileID: 2100000, guid: 418b04c25acc29245af4dad6bd459fdb, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -86,47 +86,47 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Floor_Wood - second: {fileID: 2100000, guid: aa15eb02b87f8ca4e898a984f5a9dfeb, type: 2} + second: {fileID: 2100000, guid: a03f0b3e0eee3ff4690b8788a7d974fe, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Laterne_Glas - second: {fileID: 2100000, guid: 5fdd9e78ed72a68458284ff5e181c2e7, type: 2} + second: {fileID: 2100000, guid: f06eaebf9b4796a42a3419758353a1d4, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Laterne_Metal - second: {fileID: 2100000, guid: 8870bc2e9aa005a4390ad05798eb4686, type: 2} + second: {fileID: 2100000, guid: abd8b98f9e027224a91beabdc9d0d8f8, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Laterne_Schatten - second: {fileID: 2100000, guid: 2e4dfc2023f99c04e8f615378aad2c54, type: 2} + second: {fileID: 2100000, guid: 3ab7094be3abecb4eb4ef3bca82a90dd, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Laterne_Verlauf - second: {fileID: 2100000, guid: 09ffbdc7895cb224d8cfbcfd86e0eda4, type: 2} + second: {fileID: 2100000, guid: 3ab7cda77608e2845bf09ed6ffa38fa2, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Misc_MetalButtons - second: {fileID: 2100000, guid: 11407f800d590d04b9afc8fa5d60733f, type: 2} + second: {fileID: 2100000, guid: 4043d7579e4bce9409bead204b7d3272, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Misc_Schelle - second: {fileID: 2100000, guid: 5749baeb424b5fc4ca04d563d4ba9938, type: 2} + second: {fileID: 2100000, guid: 9ec8d101c5e4fb14e9dae339549bb979, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Modul_11_Wood01 - second: {fileID: 2100000, guid: f2b88072396176b4bb565f3510d769d4, type: 2} + second: {fileID: 2100000, guid: 187fa3c9f526d804aa444aacba4954a9, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Modul_11_Wood02 - second: {fileID: 2100000, guid: 91e7cb2fd0dea744ab91b707d31e391e, type: 2} + second: {fileID: 2100000, guid: b764182dffd0a8b4eae35f875f742fc4, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -136,42 +136,42 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Modul_13_Wood - second: {fileID: 2100000, guid: 6768457165b50c74b87953e6bac700be, type: 2} + second: {fileID: 2100000, guid: f0d2ed3a3524cf04095f1d881d3dab2f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Rail - second: {fileID: 2100000, guid: 714e6aac5338f2641824ce728008c8da, type: 2} + second: {fileID: 2100000, guid: f85ef732b14c163458238163b3238780, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_TowerRail - second: {fileID: 2100000, guid: 74251e0b59ce8cd4ab9f90277095046d, type: 2} + second: {fileID: 2100000, guid: 76c442f97f0404f418f61b32e730ca27, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_TowerRoof - second: {fileID: 2100000, guid: bf0c9c8253c27944e828b28099bf237c, type: 2} + second: {fileID: 2100000, guid: 9d529980e635ba447bb7046f34fa285c, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_TowerRoof_Brim - second: {fileID: 2100000, guid: f21865fdf1bca86488f054f5dfac5124, type: 2} + second: {fileID: 2100000, guid: 9b2b1edcee703a740b528be54a4ff489, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Tower_Floor_Side - second: {fileID: 2100000, guid: df787c93d0c5cbf46aff724768879d5c, type: 2} + second: {fileID: 2100000, guid: 8aea1665ee2c90f46a914cf32908d16c, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Tower_Floor_Top_Flat_illu - second: {fileID: 2100000, guid: c139055131bfe5d49b3c32a5a8287e8d, type: 2} + second: {fileID: 2100000, guid: 46994ae32e214e74faee65f600194d2f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Paper - second: {fileID: 2100000, guid: 60ad479c759b7184a8e1dd75283d0f31, type: 2} + second: {fileID: 2100000, guid: c38919676957d7d4aaa5e4ede55e3eb9, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -181,12 +181,12 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Paper_Shadow - second: {fileID: 2100000, guid: c50aee7cd7cd1bc45bc176f62666f2f9, type: 2} + second: {fileID: 2100000, guid: a5536b0f49412eb44811666707076daf, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Stone - second: {fileID: 2100000, guid: 103f3fc49b17ebb4c8729aef5c39c335, type: 2} + second: {fileID: 2100000, guid: c38919676957d7d4aaa5e4ede55e3eb9, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -196,12 +196,12 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Stone_Shadow - second: {fileID: 2100000, guid: 91aba730cf2d52f459907334fb42bc5d, type: 2} + second: {fileID: 2100000, guid: a5536b0f49412eb44811666707076daf, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Wood - second: {fileID: 2100000, guid: f9ac853a072ab1b4db032bc7cab75fdb, type: 2} + second: {fileID: 2100000, guid: c38919676957d7d4aaa5e4ede55e3eb9, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -211,7 +211,7 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: I_Trafo_Wood_Shadow - second: {fileID: 2100000, guid: af9b25b911ce27b4f8b7313f76ed13e1, type: 2} + second: {fileID: 2100000, guid: a5536b0f49412eb44811666707076daf, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -377,6 +377,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -406,6 +407,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -417,6 +419,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat.meta deleted file mode 100644 index df783903..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 456cdb1c3804a154ab306cb1c7f94774 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat b/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat deleted file mode 100644 index 6975a975..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Columns_beige_fade - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 14636da14fd50994dbe52727aad2db12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat.meta deleted file mode 100644 index 33dca013..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Columns_beige_fade.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0b625c75007d91408e6ea87a1415847 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat b/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat deleted file mode 100644 index 47567de8..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Colums_beige - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 95e9eabf828732343bef795ed3e3a445, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat.meta deleted file mode 100644 index 496aa08d..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Colums_beige.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cba8335627d875f4381404e0b255b422 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat b/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat deleted file mode 100644 index b122a529..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Colums_blue - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 6796eabc07092b64cb57d89d0af2c32a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat.meta deleted file mode 100644 index 12fe90cf..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Colums_blue.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb4a5bea7659a9c439482cc5b46df518 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Dome.mat b/Assets/Packages/core.menulevel/Materials/I_Dome.mat deleted file mode 100644 index 938d88d8..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Dome.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Dome - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DETAIL_MULX2 - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: a9ce9c2fa4defca4791609d7a12259a0, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7a2b88fcf74b84441a0354fc1aaf5b27, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.815 - - _GlossyReflections: 1 - - _Metallic: 0.303 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Dome.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Dome.mat.meta deleted file mode 100644 index afb3f367..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Dome.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f19bf66724991a44b981bcd2c0a3d746 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat b/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat deleted file mode 100644 index 900ac125..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_DomeShadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d478151b0aba22e4db5daab299311c66, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat.meta b/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat.meta deleted file mode 100644 index f453742c..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_DomeShadow.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a188d0679b24fb4e9500b388ee300d4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat deleted file mode 100644 index bb9eb38c..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Side - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d2b2cd19e0a0e6a41bde905eb957f8c7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat.meta deleted file mode 100644 index 724dcb8f..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Side.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2d0b3a37724641845a06171b222d9b20 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat deleted file mode 100644 index 323cc421..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Top_Boderless - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: b9e91817c7877324ba58934973cabc41, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat.meta deleted file mode 100644 index 6f178533..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Boderless.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ccc886496f0b01b4182dc49c53a6a6c2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat deleted file mode 100644 index cd9e2359..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Top_Checkpoint - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 33216033fe1a1504f8681a6051b2c9f1, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat.meta deleted file mode 100644 index 7b2d6f52..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Checkpoint.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66147b4cd2774704fb77e71331b0cb2d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat deleted file mode 100644 index 4bbf8e1d..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Top_Flat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7833511de7346ce4295bbdb51f25c101, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat.meta deleted file mode 100644 index 95205dce..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Flat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c361ef40a1c0ad24a937226da554e6b3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat deleted file mode 100644 index a639e163..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Top_Profile - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d819dc7f7515e6346a22010510948126, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat.meta deleted file mode 100644 index da6707b3..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_Profile.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0afadb9a5e72e44bab0100af6b0724a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat deleted file mode 100644 index c5de3522..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Top_ProfileFlat - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: f281e934f7bbdcc48bb509def4993a24, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat.meta deleted file mode 100644 index b9fe1f11..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Top_ProfileFlat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fed43b58dc48b524c91421a658880e9b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat b/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat deleted file mode 100644 index 4567ebbe..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Floor_Wood - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7506a00537b256646b9a8b5112a3c533, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat.meta deleted file mode 100644 index 6ab9bd7f..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Floor_Wood.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aa15eb02b87f8ca4e898a984f5a9dfeb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat b/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat deleted file mode 100644 index e860a068..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Laterne_Glas - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 2800000, guid: f5ef031e6a7f9674da713acc2728c244, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: f5ef031e6a7f9674da713acc2728c244, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat.meta deleted file mode 100644 index 76dff8db..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Glas.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5fdd9e78ed72a68458284ff5e181c2e7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat b/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat deleted file mode 100644 index f39a333b..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Laterne_Metal - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.79058963, g: 0.79058963, b: 0.79058963, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat.meta deleted file mode 100644 index 19b357c0..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Metal.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8870bc2e9aa005a4390ad05798eb4686 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat b/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat deleted file mode 100644 index 558bf363..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Laterne_Schatten - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: deba024b8b77ddc44b56ebd65a98c6fd, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat.meta deleted file mode 100644 index 818d2ee0..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Schatten.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2e4dfc2023f99c04e8f615378aad2c54 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat b/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat deleted file mode 100644 index 30acba27..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Laterne_Verlauf - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _EMISSION - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 73834bd79760a8245b093680ee8887e6, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0.2735849, g: 0.17023776, b: 0.073558204, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat.meta deleted file mode 100644 index bbd754ca..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Laterne_Verlauf.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09ffbdc7895cb224d8cfbcfd86e0eda4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat b/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat deleted file mode 100644 index 823659c4..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Misc_MetalButtons - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 546ce18e3bf498e4eb1225a3555848fb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat.meta deleted file mode 100644 index 8c9a579f..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Misc_MetalButtons.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 11407f800d590d04b9afc8fa5d60733f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat b/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat deleted file mode 100644 index 4d08ef10..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Misc_Schelle - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d24828dcc47a3844cb15f7df969c959d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat.meta deleted file mode 100644 index f559dfcb..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Misc_Schelle.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5749baeb424b5fc4ca04d563d4ba9938 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat b/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat deleted file mode 100644 index b3dbd0ff..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Modul_11_Wood01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 936e98c25c78fb445aef8bb7b12f841e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat.meta deleted file mode 100644 index 3ef8c1ad..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood01.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f2b88072396176b4bb565f3510d769d4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat b/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat deleted file mode 100644 index cb6f5ec9..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Modul_11_Wood02 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 936e98c25c78fb445aef8bb7b12f841e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat.meta deleted file mode 100644 index 98dbc577..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_11_Wood02.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 91e7cb2fd0dea744ab91b707d31e391e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Metal.mat b/Assets/Packages/core.menulevel/Materials/I_Modul_13_Metal.mat deleted file mode 100644 index dc77fd4f..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Metal.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Modul_13_Metal - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 1ba73df6257c927418c4b5ca3016fb96, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat b/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat deleted file mode 100644 index ec1c18a1..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Modul_13_Wood - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 4beebbfacd70a7746bae822aa948f112, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat.meta deleted file mode 100644 index 25641310..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Wood.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6768457165b50c74b87953e6bac700be -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Rail.mat b/Assets/Packages/core.menulevel/Materials/I_Rail.mat deleted file mode 100644 index 9d12febe..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Rail.mat +++ /dev/null @@ -1,92 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Rail - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.8 - - _GlossyReflections: 1 - - _GridSpacing: 1 - - _LineThickness: 0.1 - - _Metallic: 0.8 - - _Mode: 0 - - _ODistance: 5 - - _OcclusionStrength: 0.143 - - _Outline: 0.1 - - _Parallax: 0.02 - - _Shininess: 0.01 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _TDistance: 10 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _BaseColour: {r: 1, g: 1, b: 1, a: 0} - - _Color: {r: 0.740566, g: 0.87304294, b: 1, a: 1} - - _EmissionColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 1} - - _GridColour: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 0.5, b: 0, a: 1} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Rail.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Rail.mat.meta deleted file mode 100644 index 8e897344..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Rail.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 714e6aac5338f2641824ce728008c8da -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat b/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat deleted file mode 100644 index a1979af8..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_TowerRail - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DETAIL_MULX2 - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: c4300b13235023a4a8ddc1b4433197cb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.7 - - _GlossyReflections: 1 - - _Metallic: 0.8 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.7411765, g: 0.8745098, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat.meta b/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat.meta deleted file mode 100644 index b2b242ce..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRail.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 74251e0b59ce8cd4ab9f90277095046d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat b/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat deleted file mode 100644 index cbb31e48..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_TowerRoof - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 6ffd16c41ca3e5948b8374fa9d59fd93, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat.meta b/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat.meta deleted file mode 100644 index 93d7bed5..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRoof.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf0c9c8253c27944e828b28099bf237c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat b/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat deleted file mode 100644 index ce93d1eb..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_TowerRoof_Brim - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 546ce18e3bf498e4eb1225a3555848fb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.175 - - _GlossyReflections: 1 - - _Metallic: 0.202 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat.meta b/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat.meta deleted file mode 100644 index ea5c846e..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_TowerRoof_Brim.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f21865fdf1bca86488f054f5dfac5124 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat b/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat deleted file mode 100644 index 22fa9973..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Tower_Floor_Side - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d2b2cd19e0a0e6a41bde905eb957f8c7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat.meta deleted file mode 100644 index eb7e023d..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Side.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df787c93d0c5cbf46aff724768879d5c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat b/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat deleted file mode 100644 index 0b761d2d..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Tower_Floor_Top_Flat_illu - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 7833511de7346ce4295bbdb51f25c101, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat.meta deleted file mode 100644 index 7731353a..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Tower_Floor_Top_Flat_illu.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c139055131bfe5d49b3c32a5a8287e8d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat deleted file mode 100644 index c0fae6c4..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Paper - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e5c7b75a6e51e66498fa272a4f257f47, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.7 - - _GlossyReflections: 1 - - _Metallic: 0.25 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.759434, g: 0.9259797, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat.meta deleted file mode 100644 index 6bda4333..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 60ad479c759b7184a8e1dd75283d0f31 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat deleted file mode 100644 index 0e8258d3..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Paper_Shadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d38300d4e98999e4eb033dfba43242c3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat.meta deleted file mode 100644 index 74a01bf8..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Paper_Shadow.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c50aee7cd7cd1bc45bc176f62666f2f9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat deleted file mode 100644 index ebde5dad..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Stone - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e5c7b75a6e51e66498fa272a4f257f47, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.7 - - _GlossyReflections: 1 - - _Metallic: 0.25 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.759434, g: 0.9259797, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat.meta deleted file mode 100644 index 29be2b3f..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 103f3fc49b17ebb4c8729aef5c39c335 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat deleted file mode 100644 index 3ca13d42..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Stone_Shadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d38300d4e98999e4eb033dfba43242c3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat.meta deleted file mode 100644 index 402f3671..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Stone_Shadow.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 91aba730cf2d52f459907334fb42bc5d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat deleted file mode 100644 index 99894c6b..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Wood - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e5c7b75a6e51e66498fa272a4f257f47, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.7 - - _GlossyReflections: 1 - - _Metallic: 0.25 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.759434, g: 0.9259797, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat.meta deleted file mode 100644 index ce3dc556..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f9ac853a072ab1b4db032bc7cab75fdb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat b/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat deleted file mode 100644 index 6e8a93e7..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: I_Trafo_Wood_Shadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d38300d4e98999e4eb033dfba43242c3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat.meta b/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat.meta deleted file mode 100644 index 6f06de33..00000000 --- a/Assets/Packages/core.menulevel/Materials/I_Trafo_Wood_Shadow.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: af9b25b911ce27b4f8b7313f76ed13e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Scripts/CameraControl.lua b/Assets/Packages/core.menulevel/Scripts/CameraControl.lua index 7f84e03a..31dcb5f0 100644 --- a/Assets/Packages/core.menulevel/Scripts/CameraControl.lua +++ b/Assets/Packages/core.menulevel/Scripts/CameraControl.lua @@ -35,7 +35,7 @@ local CameraControl = { EVENT_SWITCH_LIGHTZONE = 'swicth_menulevel_lightzone' -function CreateClass_CameraControl() +function CreateClass:CameraControl() function CameraControl:new(o) o = o or {} diff --git a/Assets/Packages/core.menulevel/Scripts/MouseSelect.lua b/Assets/Packages/core.menulevel/Scripts/MouseSelect.lua index e1914736..db9e1f32 100644 --- a/Assets/Packages/core.menulevel/Scripts/MouseSelect.lua +++ b/Assets/Packages/core.menulevel/Scripts/MouseSelect.lua @@ -10,7 +10,7 @@ local MouseSelect = { MessageSender = nil,---@type GameUIControlMessageSender } -function CreateClass_MouseSelect() +function CreateClass:MouseSelect() function MouseSelect:new(o) o = o or {} diff --git a/Assets/Packages/core.menulevel/Textures/Column_beige.bmp b/Assets/Packages/core.menulevel/Textures/Column_beige.bmp deleted file mode 100644 index d0f80395..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Column_beige.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Column_beige.bmp.meta b/Assets/Packages/core.menulevel/Textures/Column_beige.bmp.meta deleted file mode 100644 index ea0d7c93..00000000 --- a/Assets/Packages/core.menulevel/Textures/Column_beige.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 95e9eabf828732343bef795ed3e3a445 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png b/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png deleted file mode 100644 index a8e0f78f..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png.meta b/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png.meta deleted file mode 100644 index 735321db..00000000 --- a/Assets/Packages/core.menulevel/Textures/Column_beige_fade.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 14636da14fd50994dbe52727aad2db12 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Column_blue.bmp b/Assets/Packages/core.menulevel/Textures/Column_blue.bmp deleted file mode 100644 index a060ef7c..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Column_blue.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Column_blue.bmp.meta b/Assets/Packages/core.menulevel/Textures/Column_blue.bmp.meta deleted file mode 100644 index 26ed6059..00000000 --- a/Assets/Packages/core.menulevel/Textures/Column_blue.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 6796eabc07092b64cb57d89d0af2c32a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Dome.bmp b/Assets/Packages/core.menulevel/Textures/Dome.bmp deleted file mode 100644 index a7d33f3f..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Dome.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp b/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp deleted file mode 100644 index c9e3ed7e..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp.meta b/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp.meta deleted file mode 100644 index 6b09bf0a..00000000 --- a/Assets/Packages/core.menulevel/Textures/DomeEnvironment.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: a9ce9c2fa4defca4791609d7a12259a0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/DomeShadow.png b/Assets/Packages/core.menulevel/Textures/DomeShadow.png deleted file mode 100644 index 83fa33ed..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/DomeShadow.png and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/DomeShadow.png.meta b/Assets/Packages/core.menulevel/Textures/DomeShadow.png.meta deleted file mode 100644 index 80058e67..00000000 --- a/Assets/Packages/core.menulevel/Textures/DomeShadow.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: d478151b0aba22e4db5daab299311c66 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp b/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp deleted file mode 100644 index 7bc8d103..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp.meta b/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp.meta deleted file mode 100644 index 7cd2def2..00000000 --- a/Assets/Packages/core.menulevel/Textures/E_Holzbeschlag.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 1ba73df6257c927418c4b5ca3016fb96 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp deleted file mode 100644 index 9bcdc252..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp.meta deleted file mode 100644 index cc86434f..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Side.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: d2b2cd19e0a0e6a41bde905eb957f8c7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp deleted file mode 100644 index 3c5ae9b0..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp.meta deleted file mode 100644 index 7dcf7ddd..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Top_Borderless.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: b9e91817c7877324ba58934973cabc41 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp deleted file mode 100644 index ad202041..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp.meta deleted file mode 100644 index 61477223..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Top_Checkpoint.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 33216033fe1a1504f8681a6051b2c9f1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp deleted file mode 100644 index b72f3d43..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp.meta deleted file mode 100644 index 9734abb2..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Top_Flat.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 7833511de7346ce4295bbdb51f25c101 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp deleted file mode 100644 index be9ab16e..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp.meta deleted file mode 100644 index 9aa821d5..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Top_Profil.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: d819dc7f7515e6346a22010510948126 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp b/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp deleted file mode 100644 index 41a2812d..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp.meta b/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp.meta deleted file mode 100644 index 6fd2b453..00000000 --- a/Assets/Packages/core.menulevel/Textures/Floor_Top_ProfilFlat.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: f281e934f7bbdcc48bb509def4993a24 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp b/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp deleted file mode 100644 index f8bd77a8..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp.meta b/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp.meta deleted file mode 100644 index 6bc89534..00000000 --- a/Assets/Packages/core.menulevel/Textures/Laterne_Glas.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: f5ef031e6a7f9674da713acc2728c244 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png b/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png deleted file mode 100644 index 6fcfd051..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png.meta b/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png.meta deleted file mode 100644 index 8d3d33f0..00000000 --- a/Assets/Packages/core.menulevel/Textures/Laterne_Schatten.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: deba024b8b77ddc44b56ebd65a98c6fd -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png b/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png deleted file mode 100644 index 01970872..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png.meta b/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png.meta deleted file mode 100644 index d9e1f4b6..00000000 --- a/Assets/Packages/core.menulevel/Textures/Laterne_Verlauf.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 73834bd79760a8245b093680ee8887e6 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp b/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp deleted file mode 100644 index 44486790..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp.meta b/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp.meta deleted file mode 100644 index b7f0ad4e..00000000 --- a/Assets/Packages/core.menulevel/Textures/Metal_stained.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 546ce18e3bf498e4eb1225a3555848fb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp b/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp deleted file mode 100644 index 22130cee..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp.meta b/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp.meta deleted file mode 100644 index dfd02103..00000000 --- a/Assets/Packages/core.menulevel/Textures/Modul11_13_Wood.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 4beebbfacd70a7746bae822aa948f112 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp b/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp deleted file mode 100644 index 2e8b8fc7..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp.meta b/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp.meta deleted file mode 100644 index 0bfb2550..00000000 --- a/Assets/Packages/core.menulevel/Textures/Rail_Environment.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: c4300b13235023a4a8ddc1b4433197cb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp b/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp deleted file mode 100644 index e5280c1e..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp.meta b/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp.meta deleted file mode 100644 index 6d5cf9c8..00000000 --- a/Assets/Packages/core.menulevel/Textures/Tower_Roof.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 6ffd16c41ca3e5948b8374fa9d59fd93 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp b/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp deleted file mode 100644 index 477a21b8..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp.meta b/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp.meta deleted file mode 100644 index a3f4f4f1..00000000 --- a/Assets/Packages/core.menulevel/Textures/Trafo_Environment.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: e5c7b75a6e51e66498fa272a4f257f47 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp b/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp deleted file mode 100644 index 8e278a6d..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp.meta b/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp.meta deleted file mode 100644 index 178177d1..00000000 --- a/Assets/Packages/core.menulevel/Textures/Wood_Metal.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: d24828dcc47a3844cb15f7df969c959d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp b/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp deleted file mode 100644 index 8c283c67..00000000 Binary files a/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp and /dev/null differ diff --git a/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp.meta b/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp.meta deleted file mode 100644 index 3ae1094b..00000000 --- a/Assets/Packages/core.menulevel/Textures/Wood_Panel.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 7506a00537b256646b9a8b5112a3c533 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Packages/core.ui/Scripts/GamePlayUIControl.lua b/Assets/Packages/core.ui/Scripts/GamePlayUIControl.lua index 48004737..a8b211e3 100644 --- a/Assets/Packages/core.ui/Scripts/GamePlayUIControl.lua +++ b/Assets/Packages/core.ui/Scripts/GamePlayUIControl.lua @@ -192,6 +192,6 @@ function GamePlayUIControl:_MoveLifeLeftBaffle() self._CurrentMoveBaffleStart = self._LifeBoardLeftBaffle.rectTransform.anchoredPosition.x end -function CreateClass_GamePlayUIControl() +function CreateClass:GamePlayUIControl() return GamePlayUIControl() end \ No newline at end of file diff --git a/Assets/Packages/core.ui/Scripts/HighscoreUIControl.lua b/Assets/Packages/core.ui/Scripts/HighscoreUIControl.lua index 0f512e1f..866e62ca 100644 --- a/Assets/Packages/core.ui/Scripts/HighscoreUIControl.lua +++ b/Assets/Packages/core.ui/Scripts/HighscoreUIControl.lua @@ -80,6 +80,6 @@ function HighscoreUIControl:Prev() end -function CreateClass_HighscoreUIControl() +function CreateClass:HighscoreUIControl() return HighscoreUIControl end \ No newline at end of file diff --git a/Assets/Packages/core.ui/Scripts/WinScoreUIControl.lua b/Assets/Packages/core.ui/Scripts/WinScoreUIControl.lua index 7ad7ec4c..9222a7d3 100644 --- a/Assets/Packages/core.ui/Scripts/WinScoreUIControl.lua +++ b/Assets/Packages/core.ui/Scripts/WinScoreUIControl.lua @@ -180,6 +180,6 @@ function WinScoreUIControl:_ShowHighscore() end end -function CreateClass_WinScoreUIControl() +function CreateClass:WinScoreUIControl() return WinScoreUIControl end \ No newline at end of file diff --git a/Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll.meta b/Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll.meta deleted file mode 100644 index 41a8cc3e..00000000 --- a/Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: 50c6d9309e449994383547895aacaa9f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll b/Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll similarity index 59% rename from Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll rename to Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll index afd6e591..03934477 100644 Binary files a/Assets/Plugins/BallancePhysics/x64/BallancePhysicsEditor.dll and b/Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll differ diff --git a/Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll.meta b/Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll.meta new file mode 100644 index 00000000..fbc652a3 --- /dev/null +++ b/Assets/Plugins/BallancePhysics/x64/bphysics_unity.dll.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 9db129588ee9162499623fcb974ff1e3 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Materials/Halfpipe_Wood.mat b/Assets/Prefabs/Import/Materials/Halfpipe_Wood.mat index 38f16759..b5bd6197 100644 --- a/Assets/Prefabs/Import/Materials/Halfpipe_Wood.mat +++ b/Assets/Prefabs/Import/Materials/Halfpipe_Wood.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 17ce78d87fd1c14449168dace32610d4, type: 3} + m_Texture: {fileID: 2800000, guid: 8ab434ba908ffbd4a8745c7d80897bad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,6 +55,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 diff --git a/Assets/Prefabs/Import/Materials/Modul_11_Wood02.mat b/Assets/Prefabs/Import/Materials/Modul_11_Wood02.mat index 02c899ff..7fbc2d90 100644 --- a/Assets/Prefabs/Import/Materials/Modul_11_Wood02.mat +++ b/Assets/Prefabs/Import/Materials/Modul_11_Wood02.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 936e98c25c78fb445aef8bb7b12f841e, type: 3} + m_Texture: {fileID: 2800000, guid: 96ea63317db0b5744a2aeeaf3991c150, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,6 +55,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 diff --git a/Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat b/Assets/Prefabs/Import/Materials/Modul_13_Metal.mat similarity index 94% rename from Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat rename to Assets/Prefabs/Import/Materials/Modul_13_Metal.mat index 632ccc6b..774703f5 100644 --- a/Assets/Packages/core.menulevel/Materials/I_Ball_Stone.mat +++ b/Assets/Prefabs/Import/Materials/Modul_13_Metal.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: I_Ball_Stone + m_Name: Modul_13_Metal m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e045f62658994a248b9768459f841e59, type: 3} + m_Texture: {fileID: 2800000, guid: ecb810345b76fd4429fb3491bf1e9172, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,6 +55,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 diff --git a/Assets/Packages/core.menulevel/Materials/I_Modul_13_Metal.mat.meta b/Assets/Prefabs/Import/Materials/Modul_13_Metal.mat.meta similarity index 100% rename from Assets/Packages/core.menulevel/Materials/I_Modul_13_Metal.mat.meta rename to Assets/Prefabs/Import/Materials/Modul_13_Metal.mat.meta diff --git a/Assets/Prefabs/Import/Materials/P_Dome_MFMat.mat b/Assets/Prefabs/Import/Materials/P_Dome_MFMat.mat index 2b5e332d..104f256f 100644 --- a/Assets/Prefabs/Import/Materials/P_Dome_MFMat.mat +++ b/Assets/Prefabs/Import/Materials/P_Dome_MFMat.mat @@ -26,7 +26,7 @@ Material: - _DetailAlbedoMap: m_Texture: {fileID: 2800000, guid: aae66db9d5b1dca4b92a670c741132ed, type: 3} m_Scale: {x: 1, y: 1} - m_Offset: {x: 1, y: 0} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,6 +55,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -63,7 +64,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.7 - _GlossyReflections: 1 - - _Metallic: 0.3 + - _Metallic: 0.4 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/Prefabs/Import/Materials/P_Modul_08_Metal.mat b/Assets/Prefabs/Import/Materials/P_Modul_08_Metal.mat index 4f2718d7..c1251e25 100644 --- a/Assets/Prefabs/Import/Materials/P_Modul_08_Metal.mat +++ b/Assets/Prefabs/Import/Materials/P_Modul_08_Metal.mat @@ -55,15 +55,16 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.1 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj new file mode 100644 index 00000000..2b5d7012 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Col01_Mesh.mtl +v -8.00832 2.89042 -1.98 +v -8.00832 2.89042 1.98 +v -7.50832 2.89042 -1.98 +v -7.50832 2.89042 1.98 +v -7.50832 -0.709585 1.98 +v -8.00832 -0.709585 1.98 +v -7.50832 -0.709585 -1.98 +v -8.00832 -0.709585 -1.98 +v -7.50832 2.89042 1.98 +v -8.00832 2.89042 1.98 +v -7.50832 -0.709585 1.98 +v -8.00832 -0.709585 1.98 +v -7.50832 2.89042 -1.98 +v -7.50832 2.89042 1.98 +v -7.50832 -0.709585 -1.98 +v -7.50832 -0.709585 1.98 +v -8.00832 2.89042 -1.98 +v -7.50832 2.89042 -1.98 +v -8.00832 -0.709585 -1.98 +v -7.50832 -0.709585 -1.98 +v -8.00832 2.89042 1.98 +v -8.00832 2.89042 -1.98 +v -8.00832 -0.709585 1.98 +v -8.00832 -0.709585 -1.98 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vn 0 1.00015 -0 +vn 0 1.00015 -0 +vn 0 1.00015 -0 +vn 0 1.00015 -0 +vn 0 -1.00015 -0 +vn 0 -1.00015 -0 +vn 0 -1.00015 -0 +vn 0 -1.00015 -0 +vn 0 0 0.999951 +vn 0 0 0.999951 +vn 0 0 0.999951 +vn 0 0 0.999951 +vn 0.999956 0 -0 +vn 0.999956 0 -0 +vn 0.999956 0 -0 +vn 0.999956 0 -0 +vn 0 0 -0.999951 +vn 0 0 -0.999951 +vn 0 0 -0.999951 +vn 0 0 -0.999951 +vn -0.999956 0 -0 +vn -0.999956 0 -0 +vn -0.999956 0 -0 +vn -0.999956 0 -0 +g P_Modul_01_Col01_Mesh +f 2/2/2 3/3/3 1/1/1 +f 3/3/3 2/2/2 4/4/4 +f 6/6/6 7/7/7 5/5/5 +f 7/7/7 6/6/6 8/8/8 +f 10/10/10 11/11/11 9/9/9 +f 11/11/11 10/10/10 12/12/12 +f 14/14/14 15/15/15 13/13/13 +f 15/15/15 14/14/14 16/16/16 +f 18/18/18 19/19/19 17/17/17 +f 19/19/19 18/18/18 20/20/20 +f 22/22/22 23/23/23 21/21/21 +f 23/23/23 22/22/22 24/24/24 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj.meta new file mode 100644 index 00000000..0d9c508c --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col01_Mesh.obj.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: 7f432e5c7b7d8c44fafdd34a4551f697 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj new file mode 100644 index 00000000..de5bb6be --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Col02_Mesh.mtl +v -7.27552 1.09877 0.599999 +v 2.59167 1.09877 0.599999 +v 2.59167 1.09877 -0.599999 +v -7.27552 1.09877 -0.599999 +v -7.27552 -0.909585 0.599999 +v 2.59167 -0.909585 0.599999 +v 2.59167 1.09877 0.599999 +v -7.27552 1.09877 0.599999 +v 2.59167 -0.909585 0.599999 +v 2.59167 -0.909585 -0.599999 +v 2.59167 1.09877 -0.599999 +v 2.59167 1.09877 0.599999 +v 2.59167 -0.909585 -0.599999 +v -7.27552 -0.909585 -0.599999 +v -7.27552 1.09877 -0.599999 +v 2.59167 1.09877 -0.599999 +v -7.27552 -0.909585 -0.599999 +v -7.27552 -0.909585 0.599999 +v -7.27552 1.09877 0.599999 +v -7.27552 1.09877 -0.599999 +v -7.27552 -0.909585 0.599999 +v -7.27552 -0.909585 -0.599999 +v 2.59167 -0.909585 -0.599999 +v 2.59167 -0.909585 0.599999 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vn 0 0.999783 -0 +vn 0 0.999783 -0 +vn 0 0.999783 -0 +vn 0 0.999783 -0 +vn 0 0 0.999881 +vn 0 0 0.999881 +vn 0 0 0.999881 +vn 0 0 0.999881 +vn 0.999864 0 -0 +vn 0.999864 0 -0 +vn 0.999864 0 -0 +vn 0.999864 0 -0 +vn 0 0 -0.999881 +vn 0 0 -0.999881 +vn 0 0 -0.999881 +vn 0 0 -0.999881 +vn -0.999864 0 -0 +vn -0.999864 0 -0 +vn -0.999864 0 -0 +vn -0.999864 0 -0 +vn 0 -0.999783 -0 +vn 0 -0.999783 -0 +vn 0 -0.999783 -0 +vn 0 -0.999783 -0 +g P_Modul_01_Col02_Mesh +f 2/2/2 3/3/3 1/1/1 +f 4/4/4 1/1/1 3/3/3 +f 6/6/6 7/7/7 5/5/5 +f 8/8/8 5/5/5 7/7/7 +f 10/10/10 11/11/11 9/9/9 +f 12/12/12 9/9/9 11/11/11 +f 14/14/14 15/15/15 13/13/13 +f 16/16/16 13/13/13 15/15/15 +f 18/18/18 19/19/19 17/17/17 +f 20/20/20 17/17/17 19/19/19 +f 22/22/22 23/23/23 21/21/21 +f 23/23/23 24/24/24 21/21/21 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj.meta new file mode 100644 index 00000000..4f94015f --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col02_Mesh.obj.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: 587643162bc1eff44a76a07084b9555a +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj new file mode 100644 index 00000000..d62c9e7f --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Col03_Mesh.mtl +v -2.47009 1.59042 0.313344 +v -2.47009 1.59042 -0.313344 +v 2.45343 1.59042 -0.313344 +v 2.45343 1.59042 0.313344 +v -3.57781 5.93845 0.313344 +v 3.45722 5.93845 0.313344 +v 3.45722 5.93845 -0.313344 +v -3.57781 5.93845 -0.313344 +v -2.47009 1.59042 0.313344 +v 2.45343 1.59042 0.313344 +v 3.45722 5.93845 0.313344 +v -3.57781 5.93845 0.313344 +v 2.45343 1.59042 0.313344 +v 2.45343 1.59042 -0.313344 +v 3.45722 5.93845 -0.313344 +v 3.45722 5.93845 0.313344 +v 2.45343 1.59042 -0.313344 +v -2.47009 1.59042 -0.313344 +v -3.57781 5.93845 -0.313344 +v 3.45722 5.93845 -0.313344 +v -2.47009 1.59042 -0.313344 +v -2.47009 1.59042 0.313344 +v -3.57781 5.93845 0.313344 +v -3.57781 5.93845 -0.313344 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vn 0 -0.999759 -0 +vn 0 -0.999759 -0 +vn 0 -0.999759 -0 +vn 0 -0.999759 -0 +vn 0 0.999963 -0 +vn 0 0.999963 -0 +vn 0 0.999963 -0 +vn 0 0.999963 -0 +vn 0 0 1.00019 +vn 0 0 1.00013 +vn 0 0 1.00019 +vn 0 0 1.00024 +vn 0.974495 -0.224972 -0 +vn 0.974495 -0.224972 -0 +vn 0.974495 -0.224972 -0 +vn 0.974495 -0.224972 -0 +vn 0 0 -1.00019 +vn 0 0 -1.00013 +vn 0 0 -1.00019 +vn 0 0 -1.00024 +vn -0.969171 -0.246911 -0 +vn -0.969171 -0.246911 -0 +vn -0.969171 -0.246911 -0 +vn -0.969171 -0.246911 -0 +g P_Modul_01_Col03_Mesh +f 2/2/2 3/3/3 1/1/1 +f 4/4/4 1/1/1 3/3/3 +f 6/6/6 7/7/7 5/5/5 +f 8/8/8 5/5/5 7/7/7 +f 10/10/10 11/11/11 9/9/9 +f 12/12/12 9/9/9 11/11/11 +f 14/14/14 15/15/15 13/13/13 +f 16/16/16 13/13/13 15/15/15 +f 18/18/18 19/19/19 17/17/17 +f 20/20/20 17/17/17 19/19/19 +f 22/22/22 23/23/23 21/21/21 +f 24/24/24 21/21/21 23/23/23 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj.meta new file mode 100644 index 00000000..18ecce54 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Col03_Mesh.obj.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 16a42b1e9f5cef0419191b95dc409963 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: P_Modul_01_Col03_MeshMat + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj new file mode 100644 index 00000000..67370c50 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Rinne.mtl +v -8.97902 -1.17732 -0.649923 +v 4.75223 -1.17732 -0.649923 +v -8.97902 -1.17732 0.650088 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v 4.75223 -1.58243 -0.649923 +v -8.97902 -1.58243 0.650088 +v -8.97902 -1.58243 -0.649923 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v -8.97902 -1.17732 0.650088 +v -8.97902 -1.58243 0.650088 +v 4.75223 -1.17732 -0.649923 +v 4.75223 -1.58243 -0.649923 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v -8.97902 -1.17732 -0.649923 +v -8.97902 -1.58243 -0.649923 +v 4.75223 -1.17732 -0.649923 +v 4.75223 -1.58243 -0.649923 +v -8.97902 -1.17732 0.650088 +v -8.97902 -1.58243 0.650088 +v -8.97902 -1.17732 -0.649923 +v -8.97902 -1.58243 -0.649923 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +g P_Modul_01_Rinne +f 3/3/3 2/2/2 1/1/1 +f 2/2/2 3/3/3 4/4/4 +f 7/7/7 6/6/6 5/5/5 +f 6/6/6 7/7/7 8/8/8 +f 11/11/11 10/10/10 9/9/9 +f 10/10/10 11/11/11 12/12/12 +f 15/15/15 14/14/14 13/13/13 +f 14/14/14 15/15/15 16/16/16 +f 19/19/19 18/18/18 17/17/17 +f 18/18/18 19/19/19 20/20/20 +f 23/23/23 22/22/22 21/21/21 +f 22/22/22 23/23/23 24/24/24 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj.meta new file mode 100644 index 00000000..e48613f8 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne.obj.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 13be6dcd42c09304ea1a65e6f8501837 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: P_Modul_01_RinneMat + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj new file mode 100644 index 00000000..bafc9e70 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Rinne_01_Mesh.mtl +v -8.97902 -1.17732 -0.649923 +v 4.75223 -1.17732 -0.649923 +v -8.97902 -1.17732 0.650088 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v 4.75223 -1.58243 -0.649923 +v -8.97902 -1.58243 0.650088 +v -8.97902 -1.58243 -0.649923 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v -8.97902 -1.17732 0.650088 +v -8.97902 -1.58243 0.650088 +v 4.75223 -1.17732 -0.649923 +v 4.75223 -1.58243 -0.649923 +v 4.75223 -1.17732 0.650088 +v 4.75223 -1.58243 0.650088 +v -8.97902 -1.17732 -0.649923 +v -8.97902 -1.58243 -0.649923 +v 4.75223 -1.17732 -0.649923 +v 4.75223 -1.58243 -0.649923 +v -8.97902 -1.17732 0.650088 +v -8.97902 -1.58243 0.650088 +v -8.97902 -1.17732 -0.649923 +v -8.97902 -1.58243 -0.649923 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 -0.999803 -0 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 0 0 0.99981 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 1.00005 0 -0 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn 0 -2.94207e-007 -0.99981 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +vn -1.00005 0 -0 +g P_Modul_01_Rinne_01_Mesh +f 3/3/3 2/2/2 1/1/1 +f 2/2/2 3/3/3 4/4/4 +f 7/7/7 6/6/6 5/5/5 +f 6/6/6 7/7/7 8/8/8 +f 11/11/11 10/10/10 9/9/9 +f 10/10/10 11/11/11 12/12/12 +f 15/15/15 14/14/14 13/13/13 +f 14/14/14 15/15/15 16/16/16 +f 19/19/19 18/18/18 17/17/17 +f 18/18/18 19/19/19 20/20/20 +f 23/23/23 22/22/22 21/21/21 +f 22/22/22 23/23/23 24/24/24 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj.meta new file mode 100644 index 00000000..09c9f40b --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_01_Mesh.obj.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 40024545627d731498833686a83c8a30 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: P_Modul_01_Rinne_01_MeshMat + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj new file mode 100644 index 00000000..15eee2d5 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Rinne_02_Mesh.mtl +v -4.75222 1.32268 0.670081 +v 3.74692 1.32268 0.670081 +v -4.75222 1.32268 1.5095 +v 3.74692 1.32268 1.5095 +v 3.74692 -1.17732 1.5095 +v 3.74692 -1.17732 0.670081 +v -4.75222 -1.17732 1.5095 +v -4.75222 -1.17732 0.670081 +v 3.74692 1.32268 1.5095 +v 3.74692 -1.17732 1.5095 +v -4.75222 1.32268 1.5095 +v -4.75222 -1.17732 1.5095 +v 3.74692 1.32268 0.670081 +v 3.74692 -1.17732 0.670081 +v 3.74692 1.32268 1.5095 +v 3.74692 -1.17732 1.5095 +v -4.75222 1.32268 0.670081 +v -4.75222 -1.17732 0.670081 +v 3.74692 1.32268 0.670081 +v 3.74692 -1.17732 0.670081 +v -4.75222 1.32268 1.5095 +v -4.75222 -1.17732 1.5095 +v -4.75222 1.32268 0.670081 +v -4.75222 -1.17732 0.670081 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +g P_Modul_01_Rinne_02_Mesh +f 3/3/3 2/2/2 1/1/1 +f 2/2/2 3/3/3 4/4/4 +f 7/7/7 6/6/6 5/5/5 +f 6/6/6 7/7/7 8/8/8 +f 11/11/11 10/10/10 9/9/9 +f 10/10/10 11/11/11 12/12/12 +f 15/15/15 14/14/14 13/13/13 +f 14/14/14 15/15/15 16/16/16 +f 19/19/19 18/18/18 17/17/17 +f 18/18/18 19/19/19 20/20/20 +f 23/23/23 22/22/22 21/21/21 +f 22/22/22 23/23/23 24/24/24 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj.meta new file mode 100644 index 00000000..52500291 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_02_Mesh.obj.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 78dad0ab41e303840ac92940793ba4ad +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: P_Modul_01_Rinne_02_MeshMat + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj new file mode 100644 index 00000000..c823baaf --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_01_Rinne_03_Mesh.mtl +v -4.75222 1.32268 -1.50934 +v 3.74692 1.32268 -1.50934 +v -4.75222 1.32268 -0.669915 +v 3.74692 1.32268 -0.669915 +v 3.74692 -1.17732 -0.669915 +v 3.74692 -1.17732 -1.50934 +v -4.75222 -1.17732 -0.669915 +v -4.75222 -1.17732 -1.50934 +v 3.74692 1.32268 -0.669915 +v 3.74692 -1.17732 -0.669915 +v -4.75222 1.32268 -0.669915 +v -4.75222 -1.17732 -0.669915 +v 3.74692 1.32268 -1.50934 +v 3.74692 -1.17732 -1.50934 +v 3.74692 1.32268 -0.669915 +v 3.74692 -1.17732 -0.669915 +v -4.75222 1.32268 -1.50934 +v -4.75222 -1.17732 -1.50934 +v 3.74692 1.32268 -1.50934 +v 3.74692 -1.17732 -1.50934 +v -4.75222 1.32268 -0.669915 +v -4.75222 -1.17732 -0.669915 +v -4.75222 1.32268 -1.50934 +v -4.75222 -1.17732 -1.50934 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vt 0.500000 -0.500000 0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 -0.999758 -0 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 0 0 0.999802 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 1.00021 0 -0 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn 0 0 -0.999802 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +vn -1.00021 0 -0 +g P_Modul_01_Rinne_03_Mesh +f 3/3/3 2/2/2 1/1/1 +f 2/2/2 3/3/3 4/4/4 +f 7/7/7 6/6/6 5/5/5 +f 6/6/6 7/7/7 8/8/8 +f 11/11/11 10/10/10 9/9/9 +f 10/10/10 11/11/11 12/12/12 +f 15/15/15 14/14/14 13/13/13 +f 14/14/14 15/15/15 16/16/16 +f 19/19/19 18/18/18 17/17/17 +f 18/18/18 19/19/19 20/20/20 +f 23/23/23 22/22/22 21/21/21 +f 22/22/22 23/23/23 24/24/24 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj.meta new file mode 100644 index 00000000..373a88c4 --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_01_Rinne_03_Mesh.obj.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6dfe2f45c4fe90d488cabd4bb8f34d87 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: P_Modul_01_Rinne_03_MeshMat + second: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj b/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj new file mode 100644 index 00000000..97dc955e --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_41_Col1_Mesh.mtl +v -2.47676 1.35115 -2.48465 +v -2.47676 1.35114 2.51548 +v 2.52545 1.35114 2.51548 +v 2.52545 1.35115 -2.48465 +v -1.96089 -0.359228 -2.48465 +v 2.00958 -0.359228 -2.48465 +v 2.00958 -0.359228 2.51548 +v -1.96089 -0.359228 2.51548 +v -2.47676 1.35115 -2.48465 +v 2.52545 1.35115 -2.48465 +v 2.00958 -0.359228 -2.48465 +v -1.96089 -0.359228 -2.48465 +v 2.52545 1.35115 -2.48465 +v 2.52545 1.35114 2.51548 +v 2.00958 -0.359228 2.51548 +v 2.00958 -0.359228 -2.48465 +v 2.52545 1.35114 2.51548 +v -2.47676 1.35114 2.51548 +v -1.96089 -0.359228 2.51548 +v 2.00958 -0.359228 2.51548 +v -2.47676 1.35114 2.51548 +v -2.47676 1.35115 -2.48465 +v -1.96089 -0.359228 -2.48465 +v -1.96089 -0.359228 2.51548 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.3844e-008 1.37494e-007 -0.999773 +vn -4.76682e-008 1.5379e-007 -1.00012 +vn -5.3844e-008 1.37494e-007 -0.999773 +vn -6.0043e-008 1.21274e-007 -0.999917 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 5.3844e-008 -1.41234e-007 0.999773 +vn 4.76682e-008 -1.25035e-007 1.00012 +vn 5.3844e-008 -1.41234e-007 0.999773 +vn 6.0043e-008 -1.57494e-007 0.999917 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +g P_Modul_41_Col1_Mesh +f 2/2/2 3/3/3 1/1/1 +f 4/4/4 1/1/1 3/3/3 +f 6/6/6 7/7/7 5/5/5 +f 8/8/8 5/5/5 7/7/7 +f 10/10/10 11/11/11 9/9/9 +f 12/12/12 9/9/9 11/11/11 +f 14/14/14 15/15/15 13/13/13 +f 16/16/16 13/13/13 15/15/15 +f 18/18/18 19/19/19 17/17/17 +f 20/20/20 17/17/17 19/19/19 +f 22/22/22 23/23/23 21/21/21 +f 24/24/24 21/21/21 23/23/23 diff --git a/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj.meta b/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj.meta new file mode 100644 index 00000000..f3787c9f --- /dev/null +++ b/Assets/Prefabs/Import/Moduls/P_Modul_41_Col1_Mesh.obj.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: cd791ad4459f66247875aece92deaa21 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/core.menulevel/Textures/Modul11_Wood.bmp b/Assets/Prefabs/Import/Textures/Modul11_Wood.bmp similarity index 100% rename from Assets/Packages/core.menulevel/Textures/Modul11_Wood.bmp rename to Assets/Prefabs/Import/Textures/Modul11_Wood.bmp diff --git a/Assets/Packages/core.menulevel/Textures/Modul11_Wood.bmp.meta b/Assets/Prefabs/Import/Textures/Modul11_Wood.bmp.meta similarity index 91% rename from Assets/Packages/core.menulevel/Textures/Modul11_Wood.bmp.meta rename to Assets/Prefabs/Import/Textures/Modul11_Wood.bmp.meta index af05e6c7..0d00e147 100644 --- a/Assets/Packages/core.menulevel/Textures/Modul11_Wood.bmp.meta +++ b/Assets/Prefabs/Import/Textures/Modul11_Wood.bmp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 936e98c25c78fb445aef8bb7b12f841e +guid: ecb810345b76fd4429fb3491bf1e9172 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +33,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -88,6 +89,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Prefabs/Import/Textures/Wood_Plain.bmp b/Assets/Prefabs/Import/Textures/Wood_Plain.bmp new file mode 100644 index 00000000..11498e20 Binary files /dev/null and b/Assets/Prefabs/Import/Textures/Wood_Plain.bmp differ diff --git a/Assets/Packages/core.menulevel/Textures/Dome.bmp.meta b/Assets/Prefabs/Import/Textures/Wood_Plain.bmp.meta similarity index 91% rename from Assets/Packages/core.menulevel/Textures/Dome.bmp.meta rename to Assets/Prefabs/Import/Textures/Wood_Plain.bmp.meta index d1ff2ded..c57d7b17 100644 --- a/Assets/Packages/core.menulevel/Textures/Dome.bmp.meta +++ b/Assets/Prefabs/Import/Textures/Wood_Plain.bmp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a2b88fcf74b84441a0354fc1aaf5b27 +guid: 46d2cf9240c3f6246b128f0ed8b085a5 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +33,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -88,6 +89,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Textures/Game/Wood_Plain2.bmp b/Assets/Prefabs/Import/Textures/Wood_Plain2.bmp similarity index 100% rename from Assets/Textures/Game/Wood_Plain2.bmp rename to Assets/Prefabs/Import/Textures/Wood_Plain2.bmp diff --git a/Assets/Textures/Game/Wood_Plain2.bmp.meta b/Assets/Prefabs/Import/Textures/Wood_Plain2.bmp.meta similarity index 91% rename from Assets/Textures/Game/Wood_Plain2.bmp.meta rename to Assets/Prefabs/Import/Textures/Wood_Plain2.bmp.meta index dbf97999..7ec6af43 100644 --- a/Assets/Textures/Game/Wood_Plain2.bmp.meta +++ b/Assets/Prefabs/Import/Textures/Wood_Plain2.bmp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17ce78d87fd1c14449168dace32610d4 +guid: 8ab434ba908ffbd4a8745c7d80897bad TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +33,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -88,6 +89,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scenes/EmptyScene.unity b/Assets/Scenes/EmptyScene.unity index 33632e38..07cf516c 100644 --- a/Assets/Scenes/EmptyScene.unity +++ b/Assets/Scenes/EmptyScene.unity @@ -571,7 +571,6 @@ GameObject: - component: {fileID: 1084468644} - component: {fileID: 1084468643} - component: {fileID: 1084468642} - - component: {fileID: 1084468641} - component: {fileID: 1084468640} m_Layer: 0 m_Name: Cube @@ -620,19 +619,6 @@ MonoBehaviour: m_EnableCollisionEvent: 0 m_CollisionEventCallSleep: 0 m_CustomLayer: 0 ---- !u!65 &1084468641 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084468639} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1084468642 MeshRenderer: m_ObjectHideFlags: 0 @@ -716,7 +702,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1191960624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -777,7 +763,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 9bbbb646d24443f49a7238226ea7047e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -815,7 +801,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1191960623} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.1, y: 20.6, z: -4.6} + m_LocalPosition: {x: 4.1, y: 12.23, z: 0.86} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/BallancePhysics/Api/ApiDefine.cs b/Assets/Scripts/BallancePhysics/Api/ApiDefine.cs index 7e567cfa..d01f25b7 100644 --- a/Assets/Scripts/BallancePhysics/Api/ApiDefine.cs +++ b/Assets/Scripts/BallancePhysics/Api/ApiDefine.cs @@ -33,7 +33,7 @@ namespace BallancePhysics.Api [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void fn_delete_points_buffer(IntPtr b); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fn_delete_all_surfaces(); + public delegate void fn_delete_all_surfaces(IntPtr world); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate int fn_physics_get_id(IntPtr body); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] @@ -155,7 +155,7 @@ namespace BallancePhysics.Api [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void fn_destroy_physics_spring(IntPtr spring); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fn_surface_exist_by_name(IntPtr name); + public delegate int fn_surface_exist_by_name(IntPtr world, IntPtr name); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void fn_motion_controller_set_target_pos(IntPtr controller, IntPtr pos_ws); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] diff --git a/Assets/Scripts/BallancePhysics/Api/ApiStruct.cs b/Assets/Scripts/BallancePhysics/Api/ApiStruct.cs index 6ba4219c..2b453457 100644 --- a/Assets/Scripts/BallancePhysics/Api/ApiStruct.cs +++ b/Assets/Scripts/BallancePhysics/Api/ApiStruct.cs @@ -390,9 +390,9 @@ public IntPtr create_physics_spring(IntPtr body1, IntPtr body2, Vector3 pos1_ws, return rs; } - public bool surface_exist_by_name(string name) { + public bool surface_exist_by_name(IntPtr world, string name) { var p_name = Marshal.StringToHGlobalAnsi(name); - var rs = _surface_exist_by_name(p_name) > 0; + var rs = _surface_exist_by_name(world, p_name) > 0; Marshal.FreeHGlobal(p_name); return rs; } diff --git a/Assets/Scripts/BallancePhysics/Assets/PhysicsLayerNames.cs b/Assets/Scripts/BallancePhysics/Assets/PhysicsLayerNames.cs index 2d12a2d9..435b0013 100644 --- a/Assets/Scripts/BallancePhysics/Assets/PhysicsLayerNames.cs +++ b/Assets/Scripts/BallancePhysics/Assets/PhysicsLayerNames.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using BallancePhysics.Data; using UnityEngine; namespace BallancePhysics diff --git a/Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs b/Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs new file mode 100644 index 00000000..b365952c --- /dev/null +++ b/Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs @@ -0,0 +1,8 @@ +using UnityEngine; + +namespace BallancePhysics { + + public class EnumFlagPropertyAttribute : PropertyAttribute { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs.meta b/Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs.meta similarity index 83% rename from Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs.meta rename to Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs.meta index 42e48e0f..34276564 100644 --- a/Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs.meta +++ b/Assets/Scripts/BallancePhysics/Data/EnumFlagPropertyAttribute.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db1a5869edd6e3744a6a38bdd8ba5345 +guid: 22cc64888bc1a574c93fdc45539cbc3a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs b/Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs new file mode 100644 index 00000000..ae7a4d3e --- /dev/null +++ b/Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs @@ -0,0 +1,13 @@ +using UnityEditor; +using UnityEngine; + +namespace BallancePhysics.Editor { + + [CustomPropertyDrawer(typeof(EnumFlagPropertyAttribute))] + public class EnumFlagPropertyDrawer : PropertyDrawer { + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + property.intValue = EditorGUI.MaskField(position, label, property.intValue, property.enumNames); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs.meta b/Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs.meta rename to Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs.meta index 02aebef0..341ef64c 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs.meta +++ b/Assets/Scripts/BallancePhysics/Editor/EnumFlagPropertyDrawer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f71dfb473a349e34db5b92b5dff89912 +guid: e24557bbc1c1cdd438fefe8bf6412187 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs b/Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs similarity index 98% rename from Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs rename to Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs index e20771f1..04271d63 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs @@ -4,7 +4,7 @@ using UnityEngine; using static UnityEditor.IMGUI.Controls.PrimitiveBoundsHandle; -namespace Unity.Physics.Editor +namespace BallancePhysics.Editor { static class PhysicsBoundsHandleUtility { @@ -186,9 +186,9 @@ public static void CalculateCornerHorizon(float3 cornerPosition, float3x3 axes, corner = new Corner { angle = new float3( - MathUtils.Angle(axes[0], axes[1]), - MathUtils.Angle(axes[1], axes[2]), - MathUtils.Angle(axes[2], axes[0]) + BallancePhysics.MathUtils.Angle(axes[0], axes[1]), + BallancePhysics.MathUtils.Angle(axes[1], axes[2]), + BallancePhysics.MathUtils.Angle(axes[2], axes[0]) ), intersections = default, points = default, diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta b/Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta rename to Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs.meta index db14b785..ce6ee351 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsBoundsHandleUtility.cs.meta +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsBoundsHandleUtility.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9626acb960ba914459a875595b53b4af +guid: 91cda5f4c82771f42818c422756ad409 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditor.cs b/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditor.cs index 19865ff8..16f43348 100644 --- a/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditor.cs +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditor.cs @@ -52,8 +52,13 @@ private void OnEnable() m_EnableCollisionEvent = serializedObject.FindProperty("m_EnableCollisionEvent"); m_CollisionEventCallSleep = serializedObject.FindProperty("m_CollisionEventCallSleep"); m_CustomLayer = serializedObject.FindProperty("m_CustomLayer"); + m_StaticConstantForceDirection = serializedObject.FindProperty("m_StaticConstantForceDirection"); + m_StaticConstantForce = serializedObject.FindProperty("m_StaticConstantForce"); + m_ConstantForceDirectionRef = serializedObject.FindProperty("m_ConstantForceDirectionRef"); + m_EnableConstantForce = serializedObject.FindProperty("m_EnableConstantForce"); bOpenCollisionFilterInfo = EditorPrefs.GetBool("PhysicsObjectEditor_bOpenCollisionFilterInfo", false); + bOpenConstantForce = EditorPrefs.GetBool("PhysicsObjectEditor_bOpenConstantForce", false); bSurface = EditorPrefs.GetBool("PhysicsObjectEditor_bSurface", false); var names = AssetDatabase.LoadAssetAtPath("Assets/Resources/BallancePhysicsLayerNames.asset"); @@ -66,6 +71,7 @@ private void OnEnable() private void OnDisable() { EditorPrefs.SetBool("PhysicsObjectEditor_bOpenCollisionFilterInfo", bOpenCollisionFilterInfo); + EditorPrefs.SetBool("PhysicsObjectEditor_bOpenConstantForce", bOpenConstantForce); EditorPrefs.SetBool("PhysicsObjectEditor_bSurface", bSurface); @@ -99,8 +105,13 @@ private void OnDisable() private SerializedProperty m_EnableCollisionEvent; private SerializedProperty m_CollisionEventCallSleep; private SerializedProperty m_CustomLayer; + private SerializedProperty m_StaticConstantForce; + private SerializedProperty m_StaticConstantForceDirection; + private SerializedProperty m_ConstantForceDirectionRef; + private SerializedProperty m_EnableConstantForce ; private bool bOpenCollisionFilterInfo = false; + private bool bOpenConstantForce = false; private bool bSurface = false; public override void OnInspectorGUI() @@ -136,12 +147,8 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(m_BallRadius); } else { EditorGUILayout.PropertyField(m_UseExistsSurface); - - if(!m_UseExistsSurface.boolValue) { - EditorGUILayout.PropertyField(m_Convex); - EditorGUILayout.PropertyField(m_Concave); - } - + EditorGUILayout.PropertyField(m_Convex); + EditorGUILayout.PropertyField(m_Concave); EditorGUILayout.PropertyField(m_SurfaceName); EditorGUILayout.PropertyField(m_EnableConvexHull); } @@ -175,11 +182,23 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(m_CustomLayer); EditorGUILayout.PropertyField(m_EnableCollisionEvent); - if(m_EnableCollisionEvent.boolValue) { EditorGUILayout.PropertyField(m_CollisionEventCallSleep); } + bOpenConstantForce = EditorGUILayout.Foldout(bOpenConstantForce, "Constant Force"); + if (bOpenConstantForce) + { + EditorGUI.indentLevel++; + + EditorGUILayout.PropertyField(m_EnableConstantForce); + EditorGUILayout.PropertyField(m_StaticConstantForceDirection); + EditorGUILayout.PropertyField(m_StaticConstantForce); + EditorGUILayout.PropertyField(m_ConstantForceDirectionRef); + + EditorGUI.indentLevel--; + } + if (EditorApplication.isPlaying) EditorGUILayout.LabelField("Handle: 0x" + instance.Handle.ToString("X")); if (EditorGUI.EndChangeCheck()) diff --git a/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditorTool.cs b/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditorTool.cs index 64f25cec..06c14346 100644 --- a/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditorTool.cs +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsObjectEditorTool.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.Runtime.InteropServices; using BallancePhysics.Utils; using BallancePhysics.Wapper; using Unity.Mathematics; -using Unity.Physics.Editor; using UnityEditor; using UnityEditor.EditorTools; using UnityEngine; @@ -56,7 +54,7 @@ public override void OnToolGUI(EditorWindow window) var sScale = shape.transform.lossyScale; var handleColor = shape.enabled ? k_ShapeHandleColor : k_ShapeHandleColorDisabled; - var handleMatrix = new float4x4(MathUtils.DecomposeRigidBodyTransform(shape.transform.localToWorldMatrix)); + var handleMatrix = new float4x4(BallancePhysics.MathUtils.DecomposeRigidBodyTransform(shape.transform.localToWorldMatrix)); using (new Handles.DrawingScope(handleColor, handleMatrix)) { if(shape.UseBall) { @@ -81,7 +79,7 @@ public override void OnToolGUI(EditorWindow window) foreach(var points in data.ConcaveEdges) if (points != null && points.Length > 0) Handles.DrawLines(points); - Handles.color = Color.magenta; + Handles.color = k_ShapeHandleColor; foreach(var points in data.ConvexEdges) if (points != null && points.Length > 0) Handles.DrawLines(points); @@ -138,20 +136,19 @@ private void GenerateEdges(Vector3[] vertices, int[] triangles) ConcaveEdges.Add(m_Edges); } private void GenerateConvexHullEdges(Vector3[] vertices, int[] triangles) { - List ind = new List(triangles); - ConvexHullAlgorithm.Execute(ref ind, vertices, Vector3.up); + int[] ind = ConvexHull.Generate(vertices); int ie = 0; - Vector3[] m_Edges = new Vector3[ind.Count * 2]; - for (int i = 0; i < ind.Count; i += 3) + Vector3[] m_Edges = new Vector3[ind.Length * 2]; + for (int i = 0; i < ind.Length; i += 3) { - if(i + 2 >= ind.Count || ind[i + 2] >= vertices.Length) - break; - m_Edges[ie++] = vertices[ind[i]]; - m_Edges[ie++] = vertices[ind[i + 1]]; - m_Edges[ie++] = vertices[ind[i + 1]]; - m_Edges[ie++] = vertices[ind[i + 2]]; - m_Edges[ie++] = vertices[ind[i + 2]]; - m_Edges[ie++] = vertices[ind[i]]; + if(i + 2 <= ind.Length && ind[i + 2] < vertices.Length) { + m_Edges[ie++] = vertices[ind[i]]; + m_Edges[ie++] = vertices[ind[i + 1]]; + m_Edges[ie++] = vertices[ind[i + 1]]; + m_Edges[ie++] = vertices[ind[i + 2]]; + m_Edges[ie++] = vertices[ind[i + 2]]; + m_Edges[ie++] = vertices[ind[i]]; + } } ConvexEdges.Add(m_Edges); } diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs b/Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs similarity index 99% rename from Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs rename to Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs index 5e126c78..f3943d9d 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs @@ -4,7 +4,7 @@ using UnityEditor.IMGUI.Controls; using UnityEngine; -namespace Unity.Physics.Editor +namespace BallancePhysics.Editor { class PhysicsSphereBoundsHandle : SphereBoundsHandle { diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta b/Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta rename to Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs.meta index adacf798..7ec720c5 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsSphereBoundsHandle.cs.meta +++ b/Assets/Scripts/BallancePhysics/Editor/PhysicsSphereBoundsHandle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c824782b964d084f930e76bdafcd6f2 +guid: 3abf1b64dde8b5a42a4f46bec10a6c95 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/BallancePhysics/PhysicsApi.cs b/Assets/Scripts/BallancePhysics/PhysicsApi.cs index df05d87c..4b58b7fa 100644 --- a/Assets/Scripts/BallancePhysics/PhysicsApi.cs +++ b/Assets/Scripts/BallancePhysics/PhysicsApi.cs @@ -11,11 +11,11 @@ public static class PhysicsApi #region 基础定义 #if UNITY_EDITOR - private const string DLL_NNAME = "BallancePhysicsEditor"; + private const string DLL_NNAME = "bphysics_unity"; #elif UNITY_IPHONE private const string DLL_NNAME = "_Internal"; #else - private const string DLL_NNAME = "BallancePhysics"; + private const string DLL_NNAME = "bphysics"; #endif public const int sError = 0; diff --git a/Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs b/Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs new file mode 100644 index 00000000..ea9d2a06 --- /dev/null +++ b/Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs @@ -0,0 +1,410 @@ +namespace BallancePhysics.Utils +{ + /** + * ============================================================================ + * MIT License + * + * Copyright (c) 2016 Eric Phillips + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * ============================================================================ + * + * + * This file implements a 3D generalization of the convex hulling algorithm + * known as the "QuickHull" algorithm. This algorithm generates a surface for a + * point cloud which contains all of the points and all of the surface features + * possible using only a convex mesh. + * + * The procedure followed here is based on the following example. + * http://thomasdiewald.com/blog/?p=1888 + * + * Created by Eric Phillips on October 23, 2016. + */ + + using System.Collections.Generic; + using UnityEngine; + + public static class ConvexHull + { + /// + /// Class for holding faces and their data. + /// + private class FaceData + { + public Vector4 Plane; // Equation of a face's plane + public int[] FaceIndices; // Indices of the face's points + public List VisibleIndices; // Indices of points visible to face + private Vector3[] _vertices; // Main vertex array + + + /// + /// Create a new data structure for a face. + /// + /// Index of the first point on the face. + /// Index of the second point on the face. + /// Index of the third point on the face. + /// Array of vertices. + public FaceData(int pt1Idx, int pt2Idx, int pt3Idx, Vector3[] vertices) + { + Plane = Points2Plane(vertices[pt1Idx], vertices[pt2Idx], + vertices[pt3Idx]); + FaceIndices = new int[] { pt1Idx, pt2Idx, pt3Idx }; + VisibleIndices = new List(); + _vertices = vertices; + } + + /// + /// Get the point farthest from the plane in the positive direction. + /// + /// The index of the point. + public int GetFurthestPoint() + { + int maxIndex = 0; + float maxDistance = float.NegativeInfinity; + foreach (int index in VisibleIndices) + { + // Calculate something linearly equivalent to the plane distance + Vector3 v = _vertices[index] - _vertices[FaceIndices[0]]; + float distance = Vector3.Dot(v, Plane); + if (distance > maxDistance) + { + maxIndex = index; + maxDistance = distance; + } + } + return maxIndex; + } + } + + + /// + /// Compute indices of triangles which form a convex hull around the given + /// array of vertices. This is formatted so that a set of mesh vertices can + /// be passed in, and the output can be directly assigned to the triangles + /// property of the mesh. + /// + /// Array of vertices passed in. + /// Array of triangles as indices into the input array. + public static int[] Generate(Vector3[] vertices) + { + // Create initial simplex + int[] extremePoints = FindExtremePoints(vertices); + int[] initialSimplex = CreateInitialSimplex(extremePoints, vertices); + // Assign each vertex to the first face to which it is visible + List faceStack = AssignInitialPointsToFaces(initialSimplex, vertices); + // Iterate until all faces have been processed + FaceData face; + int i = 0; + while ((face = GetUnprocessedFace(faceStack)) != null && i < 0xFF) + { + // Get the point farthest from the plane in the positive direction + int maxPtIndex = face.GetFurthestPoint(); + // Get all faces which are visible to this point and pop from stack + List visibleFaces = ExtractVisibleFaces( + vertices[maxPtIndex], faceStack); + // Extract the horizon edges of the visible faces + // All faces will be connected + Dictionary horizonEdges = + ExtractHorizonEdges(visibleFaces); + // Create new points from horizon edges and max point + List newFaces = CreateNewFaces(maxPtIndex, visibleFaces, + vertices, horizonEdges); + // Add new faces to stack and repeat + faceStack.AddRange(newFaces); + i++; + } + // Compile one array of all the triangle indices + int[] indices = new int[faceStack.Count * 3]; + for (int ii = 0; ii < faceStack.Count; ii++) + for (int jj = 0; jj < 3; jj++) + indices[ii * 3 + jj] = faceStack[ii].FaceIndices[jj]; + return indices; + } + + /// + /// Find the indices of the points in the vertices array which are at a + /// minimum or maximum on each of the three axis. So find the min and max + /// X, the min and max Y and the min and max Z points, and return their + /// indices. + /// + /// Array of vertices passed in. + /// Array of six indices into the vertices array. + private static int[] FindExtremePoints(Vector3[] vertices) + { + // Setup variables + int[] extremePoints = new int[6]; + float[] extremePointValues = new float[6]; + for (int ii = 0; ii < extremePoints.Length - 1; ii += 2) + { + extremePoints[ii] = 0; + extremePoints[ii + 1] = 0; + extremePointValues[ii] = float.PositiveInfinity; + extremePointValues[ii + 1] = float.NegativeInfinity; + } + // Search point cloud + for (int ii = 0; ii < vertices.Length; ii++) + for (int jj = 0; jj < extremePoints.Length - 1; jj += 2) + { + float val = vertices[ii][jj / 2]; + if (val < extremePointValues[jj]) + { + extremePoints[jj] = ii; + extremePointValues[jj] = val; + } + else if (val > extremePointValues[jj + 1]) + { + extremePoints[jj + 1] = ii; + extremePointValues[jj + 1] = val; + } + } + return extremePoints; + } + + /// + /// Create a tetrahedron of maximum volume out of the extreme points. + /// This returns four indices in right-handed manner. The first three + /// define the base of the tetrahedron, and face away from the third point. + /// + /// The indices of the extreme points. + /// Array of vertices passed in. + /// The indices of the initial tetrahedron. + private static int[] CreateInitialSimplex(int[] extremePoints, + Vector3[] vertices) + { + int[] initialSimplex = new int[4]; + // Find two most distent extreme points (base line of tetrahedron) + float maxDistance = float.NegativeInfinity; + for (int ii = 0; ii < extremePoints.Length; ii++) + for (int jj = ii + 1; jj < extremePoints.Length; jj++) + { + float distance = (vertices[extremePoints[ii]] - + vertices[extremePoints[jj]]).sqrMagnitude; + if (distance > maxDistance) + { + initialSimplex[0] = extremePoints[ii]; + initialSimplex[1] = extremePoints[jj]; + maxDistance = distance; + } + } + // Find the extreme point most distent from the line + maxDistance = float.NegativeInfinity; + Vector3 normal = vertices[initialSimplex[0]] - + vertices[initialSimplex[1]]; + for (int ii = 0; ii < extremePoints.Length; ii++) + { + Vector3 v = vertices[extremePoints[ii]] - + vertices[initialSimplex[0]]; + Vector3 rejection = Vector3.ProjectOnPlane(v, normal); + float distance = rejection.sqrMagnitude; + if (distance > maxDistance) + { + initialSimplex[2] = extremePoints[ii]; + maxDistance = distance; + } + } + // Find the most distant of all the points from the plane of the + // triangle formed from the first three "initialSimplex" points + maxDistance = float.NegativeInfinity; + Vector3 v1 = vertices[initialSimplex[1]] - vertices[initialSimplex[0]]; + Vector3 v2 = vertices[initialSimplex[2]] - vertices[initialSimplex[0]]; + normal = Vector3.Cross(v1, v2); + for (int ii = 0; ii < vertices.Length; ii++) + { + Vector3 v = vertices[ii] - vertices[initialSimplex[0]]; + float distance = Mathf.Abs(Vector3.Dot(v, normal)); + if (distance > maxDistance) + { + initialSimplex[3] = ii; + maxDistance = distance; + } + } + // Swap the two first vertices if the final point is in front of the + // triangular base plane (this makes all faces of the tetrahedron point) + // outward + Vector4 baseFace = Points2Plane(vertices[initialSimplex[0]], + vertices[initialSimplex[1]], + vertices[initialSimplex[2]]); + if (PointAbovePlane(vertices[initialSimplex[3]], baseFace)) + { + int t = initialSimplex[0]; + initialSimplex[0] = initialSimplex[1]; + initialSimplex[1] = t; + } + return initialSimplex; + } + + /// + /// Create the first four faces and assign all the points to the first face + /// to which they are visible. + /// + /// The indices of the initial simplex. + /// Array of vertices. + /// The initial list of faces with their data. + private static List AssignInitialPointsToFaces( + int[] initialSimplex, Vector3[] vertices) + { + // Create the first four faces + List faceData = new List(); + faceData.Add(new FaceData(initialSimplex[0], initialSimplex[1], + initialSimplex[2], vertices)); + faceData.Add(new FaceData(initialSimplex[0], initialSimplex[2], + initialSimplex[3], vertices)); + faceData.Add(new FaceData(initialSimplex[1], initialSimplex[3], + initialSimplex[2], vertices)); + faceData.Add(new FaceData(initialSimplex[1], initialSimplex[0], + initialSimplex[3], vertices)); + // Assign each point to the first face to which it is visible + for (int ii = 0; ii < vertices.Length; ii++) + foreach (FaceData face in faceData) + if (PointAbovePlane(vertices[ii], face.Plane)) + { + face.VisibleIndices.Add(ii); + break; + } + return faceData; + } + + /// + /// Get a face from the stack which still needs to be processed. + /// + /// The list of faces. + /// The face to process next. + private static FaceData GetUnprocessedFace(List faceStack) + { + foreach (FaceData face in faceStack) + if (face.VisibleIndices.Count > 0) + return face; + return null; + } + + /// + /// Find all the faces which can be seen from the given point. This is the + /// same as if the point were a light and we were looking for all faces + /// which the point illuminated. Faces pointing the opposite direction are + /// ignored. These faces are removed from the stack. + /// + /// The point in question. + /// The list of faces to search. + /// A new list of faces. + private static List ExtractVisibleFaces(Vector3 pt, + List faceStack) + { + List visibleFaces = new List(); + foreach (FaceData face in faceStack) + if (PointAbovePlane(pt, face.Plane)) + visibleFaces.Add(face); + foreach (FaceData face in visibleFaces) + faceStack.Remove(face); + return visibleFaces; + } + + /// + /// Get pairings of all the edges around the set of visible faces. + /// This basically finds one outline around all the given faces. + /// This is returned as a dictionary to reduce data copying between + /// functions. + /// + /// A list of the visible faces. + /// A dictionary with the edge pairs. + private static Dictionary ExtractHorizonEdges( + List visibleFaces) + { + Dictionary edges = new Dictionary(); + foreach (FaceData face in visibleFaces) + for (int ii = 0; ii < face.FaceIndices.Length; ii++) + { + // Get indices of triangle vertices + int idx1 = face.FaceIndices[ii]; + int idx2 = face.FaceIndices[(ii + 1) % face.FaceIndices.Length]; + // Use keys to easily detect and remove duplicate edges + // If an edge appears twice, it is shared by two triangles, + // and not really an edge + string key = idx1 + "," + idx2; + string keyReversed = idx2 + "," + idx1; + if (edges.ContainsKey(key) || edges.ContainsKey(keyReversed)) + { + edges.Remove(key); + edges.Remove(keyReversed); + } + else + edges.Add(key, new int[] { idx1, idx2 }); + } + return edges; + } + + /// + /// Create new faces between the horizon edges and the maximum point. + /// This is somewhat like extruding the edges out to the maximum point to + /// form new faces. + /// + /// Point farthest from current face. + /// List of current visible faces. + /// Array of vertices. + /// Dictionary of pairs of indices. + /// A new list of faces. + private static List CreateNewFaces(int maxPtIndex, + List visibleFaces, Vector3[] vertices, + Dictionary horizonEdges) + { + List newFaces = new List(); + // Create new faces from horizon edges and max point + foreach (int[] edge in horizonEdges.Values) + newFaces.Add(new FaceData(edge[0], edge[1], maxPtIndex, vertices)); + // Assign all points off all visible faces to the first of the new + // faces to which the point is visible + foreach (FaceData face in visibleFaces) + foreach (int idx in face.VisibleIndices) + foreach (FaceData newFace in newFaces) + if (PointAbovePlane(vertices[idx], newFace.Plane)) + { + newFace.VisibleIndices.Add(idx); + break; + } + return newFaces; + } + + /// + /// Convert three points to a plane equation of the form + /// Ax + By + Cz + D = 0. The returned Vector4 contains A, B, C and D. + /// + /// The first point. + /// The second point. + /// The third point. + /// A new Vector4. + private static Vector4 Points2Plane(Vector3 pt1, Vector3 pt2, Vector3 pt3) + { + Vector4 v = Vector3.Cross(pt2 - pt1, pt3 - pt1).normalized; + v.w = -Vector3.Dot(v, pt1); + return v; + } + + /// + /// Checks if the point is on the front face of the plane. + /// This is the same as the point being able to "see" the front of the + /// plane. + /// + /// The point in question. + /// The plane in question. + /// A boolean value. + private static bool PointAbovePlane(Vector3 point, Vector4 plane) + { + return Vector3.Dot(point, plane) + plane.w > 0.0000001f; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs.meta b/Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs.meta rename to Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs.meta index 0a49bc0f..ec41af9e 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs.meta +++ b/Assets/Scripts/BallancePhysics/Utils/ConvexHull.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 166cdcb26120e024aaee6f8e40f80157 +guid: 13e1781f9de661344b0157168e82557c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs b/Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs deleted file mode 100644 index c47c6f02..00000000 --- a/Assets/Scripts/BallancePhysics/Utils/ConvexHullAlgorithm.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace BallancePhysics.Utils -{ - public class ConvexHullAlgorithm - { - public static readonly float Epsilon = 1e-7f; - - private struct VertexData - { - public int index; - public Vector3 vertex; - } - - /// - /// 执行算法（将修改 indices 参数，将以相对平面坐标系(从平面上方看向平面)的逆时针顺序输出凸包索引列表） - /// - /// 引用的索引列表 - /// 顶点列表 - /// 坐标系平面（从平面上方看向平面） - public static void Execute(ref List indices, Vector3[] vertices, Vector3 planeNormal) - { - Quaternion rotation = Quaternion.FromToRotation(planeNormal, Vector3.back); - - int indexCount = indices.Count; - List result = new List(); - - List vertexDatas = new List(indexCount); - - for (int i = 0; i < indexCount; i++) - { - int index = indices[i]; - Vector3 vertex = vertices[index]; - //旋转至切割平面坐标系（从平面上方看向平面） - vertex = rotation * vertex; - vertex.z = 0f; - - VertexData vertexData = new VertexData(); - vertexData.index = index; - vertexData.vertex = vertex; - vertexDatas.Add(vertexData); - } - - //找到y值最小的点作为p0，如果有多个则选择最左边的那个 - float minY = float.MaxValue; - int p0Index = -1; - for (int i = 0; i < indexCount; i++) - { - VertexData vertexData = vertexDatas[i]; - if (vertexData.vertex.y < minY) - { - minY = vertexData.vertex.y; - p0Index = i; - } - else if (vertexData.vertex.y == minY) - { - if (p0Index > -1) - { - if (vertexData.vertex.x < vertexDatas[p0Index].vertex.x) - { - p0Index = i; - } - } - } - } - VertexData p0 = vertexDatas[p0Index]; - - List resultVertexDatas = new List(); - resultVertexDatas.Add(p0); - vertexDatas.RemoveAt(p0Index);//移除p0 - - //计算测试点相对于p0的幅角，并按小到大排序 - vertexDatas.Sort((VertexData a, VertexData b) => - { - Vector3 oa = a.vertex - p0.vertex; - Vector3 ob = b.vertex - p0.vertex; - float angleA = Mathf.Atan2(oa.y, oa.x); - float angleB = Mathf.Atan2(ob.y, ob.x); - if (Mathf.Abs(angleA - angleB) < 1e-4f) - { - return (int)Mathf.Sign(oa.magnitude - ob.magnitude); - } - return (int)Mathf.Sign(angleA - angleB); - - }); - - resultVertexDatas.Add(vertexDatas[0]); - resultVertexDatas.Add(vertexDatas[1]); - //此时 resultVertexDatas 有 p0,p1,p2；而 vertexDatas 移除了p0，vertexDatas[0]为 p1 - - for (int i = 2, len = vertexDatas.Count; i < len; i++) - { - VertexData baseVertex = resultVertexDatas[resultVertexDatas.Count - 2];//从p1开始 - - Vector3 v1 = vertexDatas[i - 1].vertex - baseVertex.vertex;//i等于2时，是 p2-p1 - Vector3 v2 = vertexDatas[i].vertex - baseVertex.vertex;//i等于2时，是 p3-p1 - v1.z = v2.z = 0; - //cross需要判断小数精度，否则三角化时可能出现非凸多边形 - if (Vector3.Cross(v1, v2).z < Epsilon) - { - //if(Vector3.Cross(v1,v2).z<0){ - resultVertexDatas.RemoveAt(resultVertexDatas.Count - 1); - while (resultVertexDatas.Count >= 2) - { - VertexData baseVertex2 = resultVertexDatas[resultVertexDatas.Count - 2]; - Vector3 v12 = resultVertexDatas[resultVertexDatas.Count - 1].vertex - baseVertex2.vertex; - Vector3 v22 = vertexDatas[i].vertex - baseVertex2.vertex; - v12.z = v22.z = 0; - //cross需要判断小数精度，否则三角化时可能出现非凸多边形 - if (Vector3.Cross(v12, v22).z < Epsilon) - { - //if(Vector3.Cross(v12,v22).z<0){ - resultVertexDatas.RemoveAt(resultVertexDatas.Count - 1); - } - else - { - break; - } - } - } - resultVertexDatas.Add(vertexDatas[i]); - } - - indices.Clear(); - - for (int i = 0, len = resultVertexDatas.Count; i < len; i++) - { - indices.Add(resultVertexDatas[i].index); - } - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs b/Assets/Scripts/BallancePhysics/Utils/MathUtils.cs similarity index 94% rename from Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs rename to Assets/Scripts/BallancePhysics/Utils/MathUtils.cs index e3d90ff6..a3e0a4e9 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs +++ b/Assets/Scripts/BallancePhysics/Utils/MathUtils.cs @@ -1,10 +1,10 @@ using System.Runtime.CompilerServices; using Unity.Mathematics; -using UnityEngine; -public class MathUtils +namespace BallancePhysics { - public const float UnityEpsilonNormalSqrt = 1e-15F; + public class MathUtils { + public const float UnityEpsilonNormalSqrt = 1e-15F; public const float UnityEpsilon = 0.00001F; public static float Angle(float3 from, float3 to) @@ -46,4 +46,5 @@ public static RigidTransform DecomposeRigidBodyTransform(in float4x4 localToWorl [MethodImpl(MethodImplOptions.AggressiveInlining)] public static quaternion DecomposeRigidBodyOrientation(in float4x4 localToWorld) => quaternion.LookRotationSafe(localToWorld.c2.xyz, localToWorld.c1.xyz); -} + } +} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs.meta b/Assets/Scripts/BallancePhysics/Utils/MathUtils.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs.meta rename to Assets/Scripts/BallancePhysics/Utils/MathUtils.cs.meta index a1760d6a..b16eacd1 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Utils/MathUtils.cs.meta +++ b/Assets/Scripts/BallancePhysics/Utils/MathUtils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 255296fa5d7e72d419db391552d250df +guid: f749dac4fc138474f908bf67f4a0d2fc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/BallancePhysics/Wapper/PhysicsConstraint.cs b/Assets/Scripts/BallancePhysics/Wapper/PhysicsConstraint.cs index 70649f9b..0405cd55 100644 --- a/Assets/Scripts/BallancePhysics/Wapper/PhysicsConstraint.cs +++ b/Assets/Scripts/BallancePhysics/Wapper/PhysicsConstraint.cs @@ -1,3 +1,4 @@ +using UnityEditor; using UnityEngine; namespace BallancePhysics.Wapper @@ -23,13 +24,15 @@ public enum CoordinateIndex { [Tooltip("较高的“阻尼系数”也意味着运动控制器BB尝试以更慢的速度到达其所需位置。“力系数/阻尼系数”是最重要的值。当该值低于1.0时，运动会更加平滑，不会跳跃或有弹性。")] public float damp_factor = 1.0f; + [EnumFlagProperty] public CoordinateIndex translation_limit; [Tooltip("此参数细分为3对。每对定义一个平移轴的自由度最小值。")] public Vector3 translation_freedom_min; [Tooltip("此参数细分为3对。每对定义一个平移轴的自由度最大值。")] public Vector3 translation_freedom_max; - + + [EnumFlagProperty] public CoordinateIndex rotation_limit; [Tooltip("此参数细分为3对。每对定义一个旋转轴的自由度最小值。")] diff --git a/Assets/Scripts/BallancePhysics/Wapper/PhysicsEnvironment.cs b/Assets/Scripts/BallancePhysics/Wapper/PhysicsEnvironment.cs index f50416c7..f3413f18 100644 --- a/Assets/Scripts/BallancePhysics/Wapper/PhysicsEnvironment.cs +++ b/Assets/Scripts/BallancePhysics/Wapper/PhysicsEnvironment.cs @@ -69,8 +69,8 @@ private void OnDestroy() foreach(var o in list) o.UnPhysicalize(true); + PhysicsApi.API.delete_all_surfaces(Handle); PhysicsApi.API.destroy_environment(Handle); - PhysicsApi.API.delete_all_surfaces(); Handle = IntPtr.Zero; int currentScenseIndex = SceneManager.GetActiveScene().buildIndex; @@ -148,7 +148,7 @@ public int GetSystemGroup(string name) /// 删除物理系统中的所有碰撞层 /// [LuaApiDescription("删除物理系统中的所有碰撞层")] - public void DeleteAllSurfaces() { PhysicsApi.API.delete_all_surfaces(); } + public void DeleteAllSurfaces() { PhysicsApi.API.delete_all_surfaces(Handle); } /// /// 通过ID查找世界中的物理物体 /// diff --git a/Assets/Scripts/BallancePhysics/Wapper/PhysicsObject.cs b/Assets/Scripts/BallancePhysics/Wapper/PhysicsObject.cs index de52f495..ef9d8dd3 100644 --- a/Assets/Scripts/BallancePhysics/Wapper/PhysicsObject.cs +++ b/Assets/Scripts/BallancePhysics/Wapper/PhysicsObject.cs @@ -63,6 +63,9 @@ public class PhysicsObject : MonoBehaviour [Tooltip("是否在gameObject激活时自动切换刚体的激活状态")] [SerializeField] private bool m_AutoControlActive = true; + [Tooltip("是否启用施加在这个物体上的恒力")] + [SerializeField] + private bool m_EnableConstantForce = true; [Tooltip("物体的碰撞层")] [SerializeField] private int m_Layer = -1; @@ -102,6 +105,15 @@ public class PhysicsObject : MonoBehaviour [Tooltip("设置自定义层")] [SerializeField] private int m_CustomLayer = 0; + [Tooltip("设置静态恒力恒力方向")] + [SerializeField] + private Vector3 m_StaticConstantForceDirection = Vector3.forward; + [Tooltip("设置静态恒力恒力")] + [SerializeField] + private float m_StaticConstantForce = 0; + [Tooltip("设置静态恒力恒力方向参考")] + [SerializeField] + private Transform m_ConstantForceDirectionRef = null; #endregion @@ -175,17 +187,34 @@ public void Physicalize() return; } - if (m_UseExistsSurface && m_SurfaceName == "") - Debug.LogWarning("UseExistsSurface is true but this SurfaceName is not set"); - + string surfaceName = m_SurfaceName; bool doNotCreateSurface = false; - if (m_SurfaceName != "" && (PhysicsApi.API.surface_exist_by_name(m_SurfaceName) || m_UseExistsSurface)) - { - Debug.LogWarning("Surface " + m_SurfaceName + " already exist"); + + if (m_UseBall) + doNotCreateSurface = true; //球体就不生成网格 + else if (surfaceName == "") { + //根据当前物体的Mesh自动生成相对的名字 + string scaleName = gameObject.transform.lossyScale != Vector3.one ? ("_" + gameObject.transform.lossyScale.ToString()) : ""; + if(m_Convex.Count == 1) + surfaceName = m_Convex[0].name + scaleName; + else if(m_Concave.Count == 1) + surfaceName = m_Concave[0].name + scaleName; + else { + if(m_Concave.Count == 0 && m_Convex.Count == 0) { + var meshFilter = GetComponent(); + if(meshFilter != null && meshFilter.sharedMesh != null) { + var mesh = meshFilter.sharedMesh; + surfaceName = mesh.name + scaleName; + } + } else + surfaceName = gameObject.name + scaleName; + } + } + else if(PhysicsApi.API.surface_exist_by_name(currentEnvironment.Handle, surfaceName) || m_UseExistsSurface) { + //检查 SurfaceName 是否存在，否则不生成 + Debug.LogWarning("Surface " + surfaceName + " already exist"); doNotCreateSurface = true; } - if(m_UseBall) - doNotCreateSurface = true; List pConvexs = new List(); List pConcavies = new List(); @@ -214,7 +243,7 @@ public void Physicalize() Handle = PhysicsApi.API.physicalize(currentEnvironment.Handle, name, m_Layer, currentEnvironment.GetSystemGroup(m_SystemGroupName), m_SubSystemId, m_SubSystemDontCollideWith, m_Mass, m_Friction, m_Elasticity, m_LinearSpeedDamping, m_RotSpeedDamping, m_BallRadius, m_UseBall, m_EnableConvexHull, m_AutoMassCenter, m_EnableCollision, m_StartFrozen, - m_Fixed, transform.position, m_ShiftMassCenter, transform.rotation, m_UseExistsSurface, m_SurfaceName, + m_Fixed, transform.position, m_ShiftMassCenter, transform.rotation, m_UseExistsSurface, surfaceName, pConvexs.Count, pConvexs, pConcavies.Count, pConcavies, m_ExtraRadius); foreach (var ptr in pConvexs) @@ -463,6 +492,71 @@ public void BeamObjectToNewPosition(Vector3 pos, Quaternion rot, bool optimize_f #region 推动 + [LuaApiDescription("是否启用施加在这个物体上的恒力")] + public bool EnableConstantForce { get => m_EnableConstantForce; set => m_EnableConstantForce = value; } + [LuaApiDescription("设置静态恒力恒力数值")] + public float StaticConstantForce { get => m_StaticConstantForce; set => m_StaticConstantForce = value; } + [LuaApiDescription("设置静态恒力恒力方向")] + public Vector3 StaticConstantForceDirection { get => m_StaticConstantForceDirection; set => m_StaticConstantForceDirection = value; } + [LuaApiDescription("施加在这个物体上的恒力方向参考")] + public Transform ConstantForceDirectionRef { get => m_ConstantForceDirectionRef; set => m_ConstantForceDirectionRef = value; } + + private int m_ConstantForce_ID = 0; + private Dictionary m_ConstantForces = new Dictionary(); + + /// + /// 添加施加在这个物体上的恒力 + /// + /// 推动施加力的向量（世界坐标系） + /// 返回恒力ID，可使用DeleteConstantForce删除恒力 + [LuaApiDescription("添加施加在这个物体上的恒力", "返回恒力ID，可使用DeleteConstantForce删除恒力")] + [LuaApiParamDescription("force", "推动施加力的向量（世界坐标系）")] + public int AddConstantForce(Vector3 force) { + if(m_ConstantForce_ID < int.MaxValue - 1) m_ConstantForce_ID++; + else m_ConstantForce_ID = 0; + + m_ConstantForces.Add(m_ConstantForce_ID, force); + return m_ConstantForce_ID; + } + /// + /// 删除施加在这个物体上的恒力 + /// + /// AddConstantForce 返回的ID + [LuaApiDescription("删除施加在这个物体上的恒力")] + [LuaApiParamDescription("forceId", "AddConstantForce 返回的ID")] + public void DeleteConstantForce(int forceId) { + m_ConstantForces.Remove(forceId); + } + /// + /// 清除所有施加在这个物体上的恒力 + /// + [LuaApiDescription("清除所有施加在这个物体上的恒力")] + public void ClearConstantForce() { + m_ConstantForces.Clear(); + m_ConstantForce_ID = 0; + } + + private void doApplyConstantForce() { + Transform dref = ConstantForceDirectionRef == null ? transform : ConstantForceDirectionRef; + foreach(var f in m_ConstantForces) { + Impluse(dref.TransformVector(f.Value) * Time.fixedDeltaTime); + } + if(m_StaticConstantForce > 0) + Impluse(dref.TransformVector(m_StaticConstantForceDirection) * m_StaticConstantForce * Time.fixedDeltaTime); + } + + /// + /// 给物体施加一个推动 + /// + /// 推动坐标（世界坐标系） + /// 力的方向和大小（世界坐标系） + [LuaApiDescription("给物体施加一个推动")] + [LuaApiParamDescription("pos", "推动施加力的坐标（世界坐标系）")] + [LuaApiParamDescription("impluse", "力的方向和大小（kg*m/s, 世界坐标系）")] + public void Impluse(Vector3 impluse) { + Impluse(Vector3.zero, impluse); + } + /// /// 给物体施加一个推动 /// @@ -701,6 +795,7 @@ private void CreateComponents() { #endregion private void OnDestroy() { + m_ConstantForces.Clear(); if(IsPhysicalized) UnPhysicalize(true); } @@ -708,6 +803,8 @@ private void Awake() { if(!m_DoNotAutoCreateAtAwake) Physicalize(); } - + private void FixedUpdate() { + if(EnableConstantForce) doApplyConstantForce(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Editor/Game/GameLuaObjectHostInspector.cs b/Assets/Scripts/Editor/Game/GameLuaObjectHostInspector.cs index a6704c74..b8d88ddf 100644 --- a/Assets/Scripts/Editor/Game/GameLuaObjectHostInspector.cs +++ b/Assets/Scripts/Editor/Game/GameLuaObjectHostInspector.cs @@ -213,12 +213,25 @@ private void InitVarsList() GUI.Label(rect, "类全名"); if(pValGo.objectReferenceValue != null && pValGo.objectReferenceValue is GameObject) { List componentNames = new List(); + Dictionary componentNameConter = new Dictionary(); int selectIndex = -1, i = 0; foreach(Component c in ((GameObject)pValGo.objectReferenceValue).GetComponents()) { - string s = c.GetType().FullName; - componentNames.Add(s); - if(selectIndex == -1 && s == pVal.stringValue) selectIndex = i; - i++; + Type t = c.GetType(); + if(t != null) { + string s = t.FullName; + string str = ""; + if(componentNames.Contains(s)) { + componentNameConter[s] = componentNameConter[s] + 1; + str = s + ":" + componentNameConter[s]; + } + else { + str = s; + componentNameConter.Add(s, 0); + } + componentNames.Add(str); + if(selectIndex == -1 && str == pVal.stringValue) selectIndex = i; + i++; + } } rect.x += 40; rect.width -= 40; diff --git a/Assets/Scripts/Game/Small/TiggerTester.cs b/Assets/Scripts/Game/Small/TiggerTester.cs new file mode 100644 index 00000000..50cf215e --- /dev/null +++ b/Assets/Scripts/Game/Small/TiggerTester.cs @@ -0,0 +1,25 @@ +using Ballance2.LuaHelpers; +using UnityEngine; + +namespace Ballance2.Game +{ + [LuaApiDescription("Tigger检查脚本")] + [SLua.CustomLuaClass] + public class TiggerTester : MonoBehaviour + { + [SLua.CustomLuaClass] + public delegate void OnTiggerTesterEventCallback(GameObject self, GameObject other); + + public OnTiggerTesterEventCallback onTriggerEnter; + public OnTiggerTesterEventCallback onTriggerExit; + + private void OnTriggerEnter(Collider other) { + if(onTriggerEnter != null) + onTriggerEnter.Invoke(gameObject, other.gameObject); + } + private void OnTriggerExit(Collider other) { + if(onTriggerExit != null) + onTriggerExit.Invoke(gameObject, other.gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs.meta b/Assets/Scripts/Game/Small/TiggerTester.cs.meta similarity index 83% rename from Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs.meta rename to Assets/Scripts/Game/Small/TiggerTester.cs.meta index 7e1247a0..ded56418 100644 --- a/Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs.meta +++ b/Assets/Scripts/Game/Small/TiggerTester.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 048b89f15c05dd842a2ca9934d1d1049 +guid: 9a9b1c55d1172884488b14c092689dbd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/LuaHelpers/LuaStaticDefine/Ballance2.lua b/Assets/Scripts/LuaHelpers/LuaStaticDefine/Ballance2.lua index 363df692..3a0f65c6 100644 --- a/Assets/Scripts/LuaHelpers/LuaStaticDefine/Ballance2.lua +++ b/Assets/Scripts/LuaHelpers/LuaStaticDefine/Ballance2.lua @@ -26,7 +26,11 @@ UnityEngine.UI = UnityEngineUIGlobalNamespace UnityEngine.Yield = function (wait) end JetBrains = JetBrainsGlobalNamespace Unity = UnityGlobalNamespace +---创建类接口 +CreateClass = {} PhysicsRT = {} +BallancePhysics = {} +BallancePhysics.Wapper = {} Ballance2.Sys = {} Ballance2.Sys.Bridge = {} Ballance2.Sys.Debug = {} diff --git a/Assets/Scripts/PhysicsSystem/Plugins.meta b/Assets/Scripts/PhysicsSystem/Plugins.meta deleted file mode 100644 index 5816396d..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cb6d3f801ee1ba44a99cc49a1479b49a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x64.meta b/Assets/Scripts/PhysicsSystem/Plugins/x64.meta deleted file mode 100644 index d16c9d5c..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8d1dbd1b7343cfa4ba4f8b0000b8dba0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll b/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll deleted file mode 100644 index 2420a8ca..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll.meta b/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll.meta deleted file mode 100644 index 0d677230..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RT.dll.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: 1a77abf6ecc3ed548a973b0d3d8e9542 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll b/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll deleted file mode 100644 index b39f46d6..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll.meta b/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll.meta deleted file mode 100644 index d3681c0a..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x64/Physics_RTd.dll.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: e4cea44b0c00d42488103b029551861b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x86.meta b/Assets/Scripts/PhysicsSystem/Plugins/x86.meta deleted file mode 100644 index c5109f5b..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x86.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 38451d517f715a6499af7c0ac1514d42 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll b/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll deleted file mode 100644 index dd36c775..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll.meta b/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll.meta deleted file mode 100644 index 9062baab..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RT.dll.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: d1560e066c3f9b841a37be510c96d97f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: x86 - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: None - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll b/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll deleted file mode 100644 index f3a72579..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll.meta b/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll.meta deleted file mode 100644 index 53dbe64f..00000000 --- a/Assets/Scripts/PhysicsSystem/Plugins/x86/Physics_RTd.dll.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: d1060d67738e6fb42bc99fcfe14166b3 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86 - DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script.meta b/Assets/Scripts/PhysicsSystem/Script.meta deleted file mode 100644 index da3d0c25..00000000 --- a/Assets/Scripts/PhysicsSystem/Script.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ea7a7c086280e764494de332b1407400 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Api.meta b/Assets/Scripts/PhysicsSystem/Script/Api.meta deleted file mode 100644 index 8d336ca0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Api.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 65cfba527aa23fb45891540259e942f7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs b/Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs deleted file mode 100644 index f940ad7d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Api/ApiDefine.cs +++ /dev/null @@ -1,1855 +0,0 @@ -using System; -using System.Linq; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace PhysicsRT -{ - #region 函数定义 - - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnTestAssert(); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateVec3(float x, float y, float z); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateVec4(float x, float y, float z, float w); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnCommonDelete(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateTransform(float px, float py, float pz, float rx, float ry, float rz, float rw, float sx, float sy, float sz); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyVec4(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyVec3(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyTransform(IntPtr ptr); - - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateRigidBody( - IntPtr world, - IntPtr shape, IntPtr position, IntPtr rot, - IntPtr name, - int motionType, int qualityType, float friction, float restitution, float mass, int active, - int layer, int systemGroup, int subSystemId, int subSystemDontCollideWith, - int isTiggerVolume, int addContactListener, - float gravityFactor, float linearDamping, float angularDamping, IntPtr centerOfMass, IntPtr inertiaTensor, - IntPtr linearVelocity, IntPtr angularVelocity, float maxLinearVelocity, float maxAngularVelocity, IntPtr massProperties); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnActiveRigidBody(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDeactiveRigidBody(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyMass(IntPtr body, float mass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyFriction(IntPtr body, float friction); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyRestitution(IntPtr body, float restitution); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyAngularDamping(IntPtr body, float angularDamping); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyLinearDampin(IntPtr body, float linearDamping); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyCenterOfMass(IntPtr body, IntPtr centerOfMass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyPosition(IntPtr body, IntPtr pos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyPositionAndRotation(IntPtr body, IntPtr pos, IntPtr roate); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyMotionType(IntPtr body, int newState); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyRigidBody(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyGravityFactor(IntPtr body, float gravityFactor); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetConvexHullResultTriangles(IntPtr result, IntPtr trianglesBuffer, int count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetConvexHullResultVertices(IntPtr result, IntPtr pointsBuffer, int numPoints); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnBuild3DPointsConvexHull(IntPtr points, int numPoints); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnBuild3DFromPlaneConvexHull(IntPtr panels, int numPanels); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeShapeVolumeMassProperties(IntPtr shape, float mass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeBoxSurfaceMassProperties(IntPtr halfExtents, float mass, float surfaceThickness); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeBoxVolumeMassProperties(IntPtr halfExtents, float mass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeCapsuleVolumeMassProperties(IntPtr startAxis, IntPtr endAxis, float radius, float mass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeCylinderVolumeMassProperties(IntPtr startAxis, IntPtr endAxis, float radius, float mass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeSphereVolumeMassProperties(float radius, float sphereMass); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeSphereSurfaceMassProperties(float radius, float mass, float surfaceThickness); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnComputeTriangleSurfaceMassProperties(IntPtr v0, IntPtr v1, IntPtr v2, float mass, float surfaceThickness); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateBoxShape(IntPtr boxSize, float radius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateSphereShape(float radius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateCapsuleShape(IntPtr start, IntPtr end, float radius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateCylindeShape(IntPtr start, IntPtr end, float radius, float paddingRadius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateTriangleShape(IntPtr v0, IntPtr v1, IntPtr v2); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateConvexVerticesShape(IntPtr vertices, int numVertices, float convexRadius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateConvexVerticesShapeByConvexHullResult(IntPtr result, float convexRadius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateConvexTranslateShape(IntPtr child, IntPtr translation); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateConvexTransformShape(IntPtr child, IntPtr transform); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateListShape(IntPtr childs, int childCount); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateStaticCompoundShape(IntPtr childs, IntPtr transforms, int childCount, int layout); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnStaticCompoundShapeSetInstanceEnabled(IntPtr pStaticCompoundShape, int id, int enabled); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnStaticCompoundShapeIsInstanceEnabled(IntPtr pStaticCompoundShape, int id); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnStaticCompoundShapeEnableAllInstancesAndShapeKeys(IntPtr pStaticCompoundShape); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyShape(IntPtr s); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreatePhysicsWorld(IntPtr gravity, - int solverIterationCount, float broadPhaseWorldSize, float collisionTolerance, - bool bContinuous, bool bVisualDebugger, uint layerMask, IntPtr layerToMask, int stableSolverOn, - IntPtr onConstraintBreakingCallback, IntPtr onBodyTriggerEventCallback, IntPtr onBodyContactEventCallback, IntPtr onPhantomOverlapCallback, IntPtr onMaxPositionExceededCallback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyPhysicsWorld(IntPtr world); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnStepPhysicsWorld(IntPtr world, float timestep); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetPhysicsWorldGravity(IntPtr world, IntPtr gravity); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnUpdateAllPhysicsWorldBodys(IntPtr world); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetPhysicsWorldCollisionLayerMasks(IntPtr world, uint layerId, uint toMask, int enable, int forceUpdate); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyLayer(IntPtr body, int layer); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateMatrix4(IntPtr r, int isMatrix4); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyMatrix4(IntPtr r); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyLinearVelocity(IntPtr body, IntPtr v); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyAngularVelocity(IntPtr body, IntPtr v); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyPosition(IntPtr body, IntPtr outPos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyRotation(IntPtr body, IntPtr outRot); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyAngularVelocity(IntPtr body, IntPtr outPos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyLinearVelocity(IntPtr body, IntPtr outPos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyCenterOfMassInWorld(IntPtr body, IntPtr outPos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnGetRigidBodyPointVelocity(IntPtr body, IntPtr pt, IntPtr outPos); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyResetCenterOfMass(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyResetInertiaTensor(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyInertiaTensor(IntPtr body, IntPtr inertiaTensor); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyMaxLinearVelocity(IntPtr body, float v); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyMaxAngularVelocity(IntPtr body, float v); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestoryConstraints(IntPtr constraints); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateBallAndSocketConstraint(IntPtr body, IntPtr otherBody, IntPtr povit, IntPtr breakable, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateFixedConstraint(IntPtr body, IntPtr otherBody, IntPtr povit, IntPtr breakable, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateStiffSpringConstraint(IntPtr body, IntPtr otherBody, IntPtr povitAW, IntPtr povitBW, float springMin, float springMax, IntPtr breakable, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateHingeConstraint(IntPtr body, IntPtr otherBody, IntPtr povit, IntPtr axis, IntPtr breakable, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateLimitedHingeConstraint(IntPtr body, IntPtr otherBody, IntPtr povit, IntPtr axis, float agularLimitMin, float agularLimitMax, IntPtr breakable, IntPtr motorData, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateWheelConstraint(IntPtr wheelRigidBody, IntPtr chassis, IntPtr povit, IntPtr axle, IntPtr suspension, IntPtr steering, float suspensionLimitMin, float suspensionLimitMax, float suspensionStrength, float suspensionDamping, IntPtr breakable, int priority); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreatePulleyConstraint(IntPtr body, IntPtr otherBody, IntPtr bodyPivot0, IntPtr bodyPivots1, IntPtr worldPivots0, IntPtr worldPivots1, float leverageRatio, IntPtr breakable, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreatePrismaticConstraint(IntPtr body, IntPtr otherBody, IntPtr povit, IntPtr axis, int allowRotationAroundAxis, float mmax, float mmin, float mag, IntPtr breakable, IntPtr motorData, int priority, int stabilized); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateCogWheelConstraint(IntPtr body, IntPtr otherBody, IntPtr rotationPivotA, IntPtr rotationAxisA, float radiusA, IntPtr rotationPivotB, IntPtr rotationAxisB, float radiusB, IntPtr breakable, int priority); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyForce(IntPtr body, float delteTime, IntPtr force); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyForceAtPoint(IntPtr body, float delteTime, IntPtr force, IntPtr point); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyTorque(IntPtr body, float delteTime, IntPtr torque); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyAngularImpulse(IntPtr body, IntPtr imp); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyLinearImpulse(IntPtr body, IntPtr imp); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnRigidBodyApplyPointImpulse(IntPtr body, IntPtr imp, IntPtr point); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnIsConstraintBroken(IntPtr constraint); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetConstraintBroken(IntPtr constraint, int broken, float force); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetRigidBodyId(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetConstraintId(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetConstraintEnable(IntPtr constraint, int enable); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnPhysicsWorldRayCastBody(IntPtr world, IntPtr from, IntPtr to, int rayLayer, IntPtr outResult); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnPhysicsWorldRayCastHit(IntPtr world, IntPtr from, IntPtr to, int rayLayer, int castAll, IntPtr outResult); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetVersion(); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetName([MarshalAs(UnmanagedType.LPStr)] string name); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateBvCompressedMeshShape(IntPtr vertices, int numVertices, IntPtr triangles, int numTriangles, float convexRadius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateSimpleMeshShape(IntPtr vertices, int numVertices, IntPtr triangles, int numTriangles, float convexRadius); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateAabbPhantom(IntPtr world, IntPtr min, IntPtr max, int enableListener, int layer); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetAabbPhantomMinMax(IntPtr phantom, IntPtr min, IntPtr max); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnGetAabbPhantomOverlappingCollidables(IntPtr phantom, ref int outLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroyPhantom(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetPhantomId(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate IntPtr fnCreateSpringAction(IntPtr world, IntPtr body1, IntPtr body2, IntPtr position1, IntPtr position2, float springStrength, float springDamping, float springRestLength, int onCompression, int onExtension); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnDestroySpringAction(IntPtr world, IntPtr spring); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetRigidBodyCollisionFilterInfo(IntPtr body); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void fnSetRigidBodyCollisionFilterInfo(IntPtr body, int layer, int systemGroup, int subSystemId, int subSystemDontCollideWith); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate int fnGetNewSystemGroup(IntPtr world); - - /// Return Type: void - ///constraint: sPhysicsConstraints* - ///forceMagnitude: float - ///removed: int - [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] - public delegate void fnOnConstraintBreakingCallback(IntPtr constraint, int id, float forceMagnitude, int removed); - [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] - public delegate void fnOnBodyTriggerEventCallback(IntPtr body, IntPtr bodyOther, int id, int otherId, int type); - [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] - public delegate void fnOnBodyContactEventCallback(IntPtr body, IntPtr bodyOther, int id, int otherId, IntPtr data); - [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] - public delegate void fnOnPhantomOverlapCallback(IntPtr phantom, IntPtr bodyOther, int id, int otherId, int type); - [UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] - public delegate void fnOnMaxPositionExceededCallback(IntPtr body, int id); - - #endregion - - #region 异常 - - public class ApiNotFoundException : Exception - { - public ApiNotFoundException(string name) : base(name + " api not found") { } - } - public class ApiException : Exception - { - public ApiException(string msg) : base(msg) { } - } - - #endregion - - public class ApiStruct - { - public const int Version = 2301; - public bool InitSuccess { get; private set; } = false; - - //获取所有函数指针 - internal void initAll(IntPtr apiArrayPtr, int len) - { - int i = 0; - IntPtr[] apiArray = new IntPtr[len]; - Marshal.Copy(apiArrayPtr, apiArray, 0, len); - - _GetVersion = Marshal.GetDelegateForFunctionPointer(apiArray[254]); - _SetName = Marshal.GetDelegateForFunctionPointer(apiArray[255]); - - var v = _GetVersion(); - if(v != Version) - throw new ApiException("Native lib version is not compatible with this (" + v + " !=" + Version + ")"); - - _CommonDelete = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateVec3 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateTransform = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateVec4 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyVec4 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyVec3 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyTransform = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreatePhysicsWorld = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyPhysicsWorld = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _StepPhysicsWorld = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetPhysicsWorldGravity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _UpdateAllPhysicsWorldBodys = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateRigidBody = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ActiveRigidBody = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DeactiveRigidBody = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyMass = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyFriction = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyRestitution = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyCenterOfMass = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyPosition = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyPositionAndRotation = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyAngularDamping = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyLinearDampin = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyMotionType = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyGravityFactor = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetConvexHullResultTriangles = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetConvexHullResultVertices = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _Build3DPointsConvexHull = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _Build3DFromPlaneConvexHull = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyRigidBody = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeShapeVolumeMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeBoxSurfaceMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeBoxVolumeMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeCapsuleVolumeMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeCylinderVolumeMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeSphereVolumeMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeSphereSurfaceMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _ComputeTriangleSurfaceMassProperties = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateBoxShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateSphereShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateCapsuleShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateCylindeShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateTriangleShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateConvexVerticesShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateConvexVerticesShapeByConvexHullResult = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateSimpleMeshShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateConvexTranslateShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateConvexTransformShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateListShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateStaticCompoundShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _StaticCompoundShapeSetInstanceEnabled = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _StaticCompoundShapeIsInstanceEnabled = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _StaticCompoundShapeEnableAllInstancesAndShapeKeys = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _TestAssert = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyLayer = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetPhysicsWorldCollisionLayerMasks = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateMatrix4 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyMatrix4 = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyLinearVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyAngularVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyInertiaTensor = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyPosition = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyRotation = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyAngularVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyLinearVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyCenterOfMassInWorld = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyPointVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyResetCenterOfMass = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyResetInertiaTensor = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyMaxLinearVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyMaxAngularVelocity = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestoryConstraints = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateBallAndSocketConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateFixedConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateStiffSpringConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateHingeConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateLimitedHingeConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateWheelConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreatePulleyConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreatePrismaticConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateCogWheelConstraint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyForce = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyForceAtPoint = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyTorque = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyAngularImpulse = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyLinearImpulse = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _RigidBodyApplyPointImpulse = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _IsConstraintBroken = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetConstraintBroken = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyId = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetConstraintId = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetConstraintEnable = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _PhysicsWorldRayCastBody = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _PhysicsWorldRayCastHit = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateBvCompressedMeshShape = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateAabbPhantom = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetAabbPhantomMinMax = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetAabbPhantomOverlappingCollidables = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroyPhantom = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetPhantomId = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _CreateSpringAction = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _DestroySpringAction = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetRigidBodyCollisionFilterInfo = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _SetRigidBodyCollisionFilterInfo = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - _GetNewSystemGroup = Marshal.GetDelegateForFunctionPointer(apiArray[i++]); - - InitSuccess = true; - } - - private fnTestAssert _TestAssert; - private fnCommonDelete _CommonDelete; - private fnCreateVec3 _CreateVec3; - private fnCreateTransform _CreateTransform; - private fnCreateVec4 _CreateVec4; - private fnDestroyVec4 _DestroyVec4; - private fnDestroyVec3 _DestroyVec3; - private fnDestroyTransform _DestroyTransform; - private fnCreatePhysicsWorld _CreatePhysicsWorld; - private fnDestroyPhysicsWorld _DestroyPhysicsWorld; - private fnStepPhysicsWorld _StepPhysicsWorld; - private fnSetPhysicsWorldGravity _SetPhysicsWorldGravity; - private fnUpdateAllPhysicsWorldBodys _UpdateAllPhysicsWorldBodys; - private fnCreateRigidBody _CreateRigidBody; - private fnActiveRigidBody _ActiveRigidBody; - private fnDeactiveRigidBody _DeactiveRigidBody; - private fnSetRigidBodyMass _SetRigidBodyMass; - private fnSetRigidBodyFriction _SetRigidBodyFriction; - private fnSetRigidBodyRestitution _SetRigidBodyRestitution; - private fnSetRigidBodyCenterOfMass _SetRigidBodyCenterOfMass; - private fnSetRigidBodyAngularDamping _SetRigidBodyAngularDamping; - private fnSetRigidBodyLinearDampin _SetRigidBodyLinearDampin; - private fnSetRigidBodyPosition _SetRigidBodyPosition; - private fnSetRigidBodyPositionAndRotation _SetRigidBodyPositionAndRotation; - private fnSetRigidBodyMotionType _SetRigidBodyMotionType; - private fnSetRigidBodyGravityFactor _SetRigidBodyGravityFactor; - private fnGetConvexHullResultTriangles _GetConvexHullResultTriangles; - private fnGetConvexHullResultVertices _GetConvexHullResultVertices; - private fnBuild3DPointsConvexHull _Build3DPointsConvexHull; - private fnBuild3DFromPlaneConvexHull _Build3DFromPlaneConvexHull; - private fnDestroyRigidBody _DestroyRigidBody; - private fnComputeShapeVolumeMassProperties _ComputeShapeVolumeMassProperties; - private fnComputeBoxSurfaceMassProperties _ComputeBoxSurfaceMassProperties; - private fnComputeBoxVolumeMassProperties _ComputeBoxVolumeMassProperties; - private fnComputeCapsuleVolumeMassProperties _ComputeCapsuleVolumeMassProperties; - private fnComputeCylinderVolumeMassProperties _ComputeCylinderVolumeMassProperties; - private fnComputeSphereVolumeMassProperties _ComputeSphereVolumeMassProperties; - private fnComputeSphereSurfaceMassProperties _ComputeSphereSurfaceMassProperties; - private fnComputeTriangleSurfaceMassProperties _ComputeTriangleSurfaceMassProperties; - private fnCreateBoxShape _CreateBoxShape; - private fnCreateSphereShape _CreateSphereShape; - private fnCreateCapsuleShape _CreateCapsuleShape; - private fnCreateCylindeShape _CreateCylindeShape; - private fnCreateTriangleShape _CreateTriangleShape; - private fnCreateConvexVerticesShape _CreateConvexVerticesShape; - private fnCreateConvexVerticesShapeByConvexHullResult _CreateConvexVerticesShapeByConvexHullResult; - private fnCreateSimpleMeshShape _CreateSimpleMeshShape; - private fnCreateConvexTranslateShape _CreateConvexTranslateShape; - private fnCreateConvexTransformShape _CreateConvexTransformShape; - private fnCreateListShape _CreateListShape; - private fnCreateStaticCompoundShape _CreateStaticCompoundShape; - private fnStaticCompoundShapeSetInstanceEnabled _StaticCompoundShapeSetInstanceEnabled; - private fnStaticCompoundShapeIsInstanceEnabled _StaticCompoundShapeIsInstanceEnabled; - private fnStaticCompoundShapeEnableAllInstancesAndShapeKeys _StaticCompoundShapeEnableAllInstancesAndShapeKeys; - private fnDestroyShape _DestroyShape; - private fnSetPhysicsWorldCollisionLayerMasks _SetPhysicsWorldCollisionLayerMasks; - private fnSetRigidBodyLayer _SetRigidBodyLayer; - private fnCreateMatrix4 _CreateMatrix4; - private fnDestroyMatrix4 _DestroyMatrix4; - private fnSetRigidBodyLinearVelocity _SetRigidBodyLinearVelocity; - private fnSetRigidBodyAngularVelocity _SetRigidBodyAngularVelocity; - private fnGetRigidBodyPosition _GetRigidBodyPosition; - private fnGetRigidBodyRotation _GetRigidBodyRotation; - private fnGetRigidBodyAngularVelocity _GetRigidBodyAngularVelocity; - private fnGetRigidBodyLinearVelocity _GetRigidBodyLinearVelocity; - private fnGetRigidBodyCenterOfMassInWorld _GetRigidBodyCenterOfMassInWorld; - private fnGetRigidBodyPointVelocity _GetRigidBodyPointVelocity; - private fnRigidBodyResetCenterOfMass _RigidBodyResetCenterOfMass; - private fnRigidBodyResetInertiaTensor _RigidBodyResetInertiaTensor; - private fnSetRigidBodyInertiaTensor _SetRigidBodyInertiaTensor; - private fnSetRigidBodyMaxLinearVelocity _SetRigidBodyMaxLinearVelocity; - private fnSetRigidBodyMaxAngularVelocity _SetRigidBodyMaxAngularVelocity; - private fnDestoryConstraints _DestoryConstraints; - private fnCreateBallAndSocketConstraint _CreateBallAndSocketConstraint; - private fnCreateFixedConstraint _CreateFixedConstraint; - private fnCreateStiffSpringConstraint _CreateStiffSpringConstraint; - private fnCreateHingeConstraint _CreateHingeConstraint; - private fnCreateLimitedHingeConstraint _CreateLimitedHingeConstraint; - private fnCreateWheelConstraint _CreateWheelConstraint; - private fnCreatePulleyConstraint _CreatePulleyConstraint; - private fnCreatePrismaticConstraint _CreatePrismaticConstraint; - private fnCreateCogWheelConstraint _CreateCogWheelConstraint; - private fnRigidBodyApplyForce _RigidBodyApplyForce; - private fnRigidBodyApplyForceAtPoint _RigidBodyApplyForceAtPoint; - private fnRigidBodyApplyTorque _RigidBodyApplyTorque; - private fnRigidBodyApplyAngularImpulse _RigidBodyApplyAngularImpulse; - private fnRigidBodyApplyLinearImpulse _RigidBodyApplyLinearImpulse; - private fnRigidBodyApplyPointImpulse _RigidBodyApplyPointImpulse; - private fnIsConstraintBroken _IsConstraintBroken; - private fnSetConstraintBroken _SetConstraintBroken; - private fnGetRigidBodyId _GetRigidBodyId; - private fnGetConstraintId _GetConstraintId; - private fnSetConstraintEnable _SetConstraintEnable; - private fnPhysicsWorldRayCastBody _PhysicsWorldRayCastBody; - private fnPhysicsWorldRayCastHit _PhysicsWorldRayCastHit; - private fnGetVersion _GetVersion; - private fnCreateBvCompressedMeshShape _CreateBvCompressedMeshShape; - private fnCreateAabbPhantom _CreateAabbPhantom; - private fnSetAabbPhantomMinMax _SetAabbPhantomMinMax; - private fnGetAabbPhantomOverlappingCollidables _GetAabbPhantomOverlappingCollidables; - private fnDestroyPhantom _DestroyPhantom; - private fnGetPhantomId _GetPhantomId; - private fnSetName _SetName; - private fnCreateSpringAction _CreateSpringAction; - private fnGetRigidBodyCollisionFilterInfo _GetRigidBodyCollisionFilterInfo; - private fnSetRigidBodyCollisionFilterInfo _SetRigidBodyCollisionFilterInfo; - private fnDestroySpringAction _DestroySpringAction; - private fnGetNewSystemGroup _GetNewSystemGroup; - - public int GetRigidBodyCollisionFilterInfo(IntPtr body) { - if (_GetRigidBodyCollisionFilterInfo == null) - throw new ApiNotFoundException("GetRigidBodyCollisionFilterInfo"); - var rs = _GetRigidBodyCollisionFilterInfo(body); - ApiExceptionCheck(); - return rs; - } - public void SetRigidBodyCollisionFilterInfo(IntPtr body, int layer, int systemGroup, int subSystemId, int subSystemDontCollideWith) { - if (_SetRigidBodyCollisionFilterInfo == null) - throw new ApiNotFoundException("SetRigidBodyCollisionFilterInfo"); - _SetRigidBodyCollisionFilterInfo(body, layer, systemGroup, subSystemId, subSystemDontCollideWith); - ApiExceptionCheck(); - } - public int GetNewSystemGroup(IntPtr world) { - if (_GetNewSystemGroup == null) - throw new ApiNotFoundException("GetNewSystemGroup"); - var rs = _GetNewSystemGroup(world); - ApiExceptionCheck(); - return rs; - } - - public void SetName(string name) { _SetName(name); } - public int GetVersion() { return _GetVersion(); } - public int BoolToInt(bool a) { - return a ? 1 : 0; - } - private IntPtr Matrix4x4ToNative9(Matrix4x4 a) { - - IntPtr ptr = Marshal.AllocHGlobal(Marshal.SizeOf() * 9); - float [] ar = new float[9]; - int i = 0; - ar[i++] = a[0,0]; - ar[i++] = a[0,1]; - ar[i++] = a[0,2]; - ar[i++] = a[1,0]; - ar[i++] = a[1,1]; - ar[i++] = a[1,2]; - ar[i++] = a[2,0]; - ar[i++] = a[2,1]; - ar[i++] = a[2,2]; - - IntPtr mptr = _CreateMatrix4(ptr, 0); - Marshal.FreeHGlobal(ptr); - return mptr; - } - private IntPtr Matrix4x4ToNative16(Matrix4x4 a) { - IntPtr ptr = Marshal.AllocHGlobal(Marshal.SizeOf() * 16); - float [] ar = new float[16]; - int i = 0; - IntPtr mptr = _CreateMatrix4(ptr, 1); - - ar[i++] = a[0,0]; - ar[i++] = a[0,1]; - ar[i++] = a[0,2]; - ar[i++] = a[0,3]; - ar[i++] = a[1,0]; - ar[i++] = a[1,1]; - ar[i++] = a[1,2]; - ar[i++] = a[1,3]; - ar[i++] = a[2,0]; - ar[i++] = a[2,1]; - ar[i++] = a[2,2]; - ar[i++] = a[2,3]; - ar[i++] = a[3,0]; - ar[i++] = a[3,1]; - ar[i++] = a[3,2]; - ar[i++] = a[3,3]; - - Marshal.FreeHGlobal(ptr); - return mptr; - } - private IntPtr Vector3ToNative3(Vector3 a) { - return _CreateVec3(a.x, a.y, a.z); - } - private IntPtr Vector4ToNative4(Vector4 a) { - return _CreateVec4(a.x, a.y, a.z, a.w); - } - private IntPtr QuaternionToNative4(Quaternion a) { - return _CreateVec4(a.x, a.y, a.z, a.w); - } - private IntPtr TransformToNative(Vector3 pos, Quaternion rot, Vector3 scale) { - return _CreateTransform(pos.x, pos.y, pos.z, rot.x, rot.y, rot.z, rot.w, scale.x, scale.y, rot.z); - } - private void FreeNativeMatrix4x4(IntPtr a) { - _DestroyMatrix4(a); - } - private void FreeNativeVector3(IntPtr a) { - _DestroyVec3(a); - } - private void FreeNativeVector4(IntPtr a) { - _DestroyVec4(a); - } - private void FreeNativeTransform(IntPtr a) { - _DestroyTransform(a); - } - - private void ApiExceptionCheck() { - var exp = PhysicsApi.checkException(); - if (exp != null) - throw new ApiException(exp); - } - - public int PhysicsWorldRayCastBody(IntPtr world, Vector3 from, Vector3 to, int rayLayer, out sRayCastResult outResult) { - if (_PhysicsWorldRayCastBody == null) - throw new ApiNotFoundException("PhysicsWorldRayCastBody"); - - var outPtr = Marshal.AllocHGlobal(Marshal.SizeOf()); - var fromPtr = Vector3ToNative3(from); - var toPtr = Vector3ToNative3(to); - var rs = _PhysicsWorldRayCastBody(world, fromPtr, toPtr, rayLayer, outPtr); - FreeNativeVector3(fromPtr); - FreeNativeVector3(toPtr); - - if(rs > 0) { - var rsPtr = Marshal.ReadIntPtr(outPtr); - outResult = Marshal.PtrToStructure(rsPtr); - _CommonDelete(rsPtr); - } else { - outResult = default(sRayCastResult); - } - Marshal.FreeHGlobal(outPtr); - - ApiExceptionCheck(); - - return rs; - } - public int PhysicsWorldRayCastHit(IntPtr world, Vector3 from, Vector3 to, int rayLayer, bool castAll, out sRayCastResult[] outResult) { - if (_PhysicsWorldRayCastHit == null) - throw new ApiNotFoundException("PhysicsWorldRayCastHit"); - - var outPtr = Marshal.AllocHGlobal(Marshal.SizeOf()); - var fromPtr = Vector3ToNative3(from); - var toPtr = Vector3ToNative3(to); - var rs = _PhysicsWorldRayCastHit(world, fromPtr, toPtr, rayLayer, BoolToInt(castAll), outPtr); - FreeNativeVector3(fromPtr); - FreeNativeVector3(toPtr); - - if(rs > 0) { - - if(castAll) { - var rsPtr = Marshal.ReadIntPtr(outPtr); - var rsPtrArr = new IntPtr[rs]; - Marshal.Copy(rsPtr, rsPtrArr, 0, rs); - outResult = new sRayCastResult[rs]; - for(int i = 0; i < rs; i++) - outResult[i] = Marshal.PtrToStructure(rsPtrArr[i]); - _CommonDelete(rsPtr); - } else { - var rsPtr = Marshal.ReadIntPtr(outPtr); - outResult = new sRayCastResult[1]; - outResult[0] = Marshal.PtrToStructure(rsPtr); - _CommonDelete(rsPtr); - } - } else { - outResult = null; - } - Marshal.FreeHGlobal(outPtr); - - ApiExceptionCheck(); - - return rs; - } - - private IntPtr ConstraintBreakDataToNative(sConstraintBreakData data) { - if(data.breakable) { - IntPtr rs = Marshal.AllocHGlobal(Marshal.SizeOf(data)); - Marshal.StructureToPtr(data, rs, false); - return rs; - } - return IntPtr.Zero; - } - private IntPtr ConstraintMotorDataToNative(sConstraintMotorData data) { - if(data.enable) { - IntPtr rs = Marshal.AllocHGlobal(Marshal.SizeOf(data)); - Marshal.StructureToPtr(data, rs, false); - return rs; - } - return IntPtr.Zero; - } - - public IntPtr CreateBallAndSocketConstraint(IntPtr body, IntPtr otherBody, Vector3 povit, sConstraintBreakData breakable, ConstraintPriority priority, bool stabilized) { - if (_CreateBallAndSocketConstraint == null) - throw new ApiNotFoundException("CreateBallAndSocketConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateBallAndSocketConstraint(body, otherBody, povitPtr, breakablePtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateFixedConstraint(IntPtr body, IntPtr otherBody, Vector3 povit, sConstraintBreakData breakable, ConstraintPriority priority, bool stabilized) { - if (_CreateFixedConstraint == null) - throw new ApiNotFoundException("CreateFixedConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateFixedConstraint(body, otherBody, povitPtr, breakablePtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateStiffSpringConstraint(IntPtr body, IntPtr otherBody, Vector3 povitAW, Vector3 povitBW, float springMin, float springMax, sConstraintBreakData breakable, ConstraintPriority priority, bool stabilized) { - if (_CreateStiffSpringConstraint == null) - throw new ApiNotFoundException("CreateStiffSpringConstraint"); - - var povitAWPtr = Vector3ToNative3(povitAW); - var povitBWPtr = Vector3ToNative3(povitBW); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateStiffSpringConstraint(body, otherBody, povitAWPtr, povitBWPtr, springMin, springMax, breakablePtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitAWPtr); - FreeNativeVector3(povitBWPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateHingeConstraint(IntPtr body, IntPtr otherBody, Vector3 povit, Vector3 axis, sConstraintBreakData breakable, ConstraintPriority priority, bool stabilized) { - if (_CreateHingeConstraint == null) - throw new ApiNotFoundException("CreateHingeConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var axisPtr = Vector3ToNative3(axis); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateHingeConstraint(body, otherBody, povitPtr, axisPtr, breakablePtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitPtr); - FreeNativeVector3(axisPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateLimitedHingeConstraint(IntPtr body, IntPtr otherBody, Vector3 povit, Vector3 axis, float agularLimitMin, float agularLimitMax, sConstraintBreakData breakable, sConstraintMotorData motorData, ConstraintPriority priority, bool stabilized) { - if (_CreateLimitedHingeConstraint == null) - throw new ApiNotFoundException("CreateLimitedHingeConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var axisPtr = Vector3ToNative3(axis); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var motoDataPtr = ConstraintMotorDataToNative(motorData); - var rs = _CreateLimitedHingeConstraint(body, otherBody, povitPtr, axisPtr, agularLimitMin, agularLimitMax, breakablePtr, motoDataPtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitPtr); - FreeNativeVector3(axisPtr); - Marshal.FreeHGlobal(breakablePtr); - Marshal.FreeHGlobal(motoDataPtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateWheelConstraint(IntPtr wheelRigidBody, IntPtr chassis, Vector3 povit, Vector3 axle, Vector3 suspension, Vector3 steering, float suspensionLimitMin, float suspensionLimitMax, float suspensionStrength, float suspensionDamping, sConstraintBreakData breakable, ConstraintPriority priority) { - if (_CreateWheelConstraint == null) - throw new ApiNotFoundException("CreateWheelConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var axlePtr = Vector3ToNative3(axle); - var suspensionPtr = Vector3ToNative3(suspension); - var steeringPtr = Vector3ToNative3(steering); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateWheelConstraint(wheelRigidBody, chassis, povitPtr, axlePtr, suspensionPtr, steeringPtr, suspensionLimitMin, suspensionLimitMax, suspensionStrength, suspensionDamping, breakablePtr, (int)priority); - FreeNativeVector3(axlePtr); - FreeNativeVector3(povitPtr); - FreeNativeVector3(suspensionPtr); - FreeNativeVector3(steeringPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreatePulleyConstraint(IntPtr body, IntPtr otherBody, Vector3 bodyPivot0, Vector3 bodyPivots1, Vector3 worldPivots0, Vector3 worldPivots1, float leverageRatio, sConstraintBreakData breakable, ConstraintPriority priority, bool stabilized) { - if (_CreatePulleyConstraint == null) - throw new ApiNotFoundException("CreatePulleyConstraint"); - - var bodyPivot0Ptr = Vector3ToNative3(bodyPivot0); - var bodyPivots1Ptr = Vector3ToNative3(bodyPivots1); - var worldPivots0Ptr = Vector3ToNative3(worldPivots0); - var worldPivots1Ptr = Vector3ToNative3(worldPivots1); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreatePulleyConstraint(body, otherBody, bodyPivot0Ptr, bodyPivots1Ptr, worldPivots0Ptr, worldPivots1Ptr, leverageRatio, breakablePtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(bodyPivot0Ptr); - FreeNativeVector3(bodyPivots1Ptr); - FreeNativeVector3(worldPivots0Ptr); - FreeNativeVector3(worldPivots1Ptr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreatePrismaticConstraint(IntPtr body, IntPtr otherBody, Vector3 povit, Vector3 axis, bool allowRotationAroundAxis, float mmax, float mmin, float mag, sConstraintBreakData breakable, sConstraintMotorData motorData, ConstraintPriority priority, bool stabilized) { - if (_CreatePrismaticConstraint == null) - throw new ApiNotFoundException("CreatePrismaticConstraint"); - - var povitPtr = Vector3ToNative3(povit); - var axisPtr = Vector3ToNative3(axis); - - var breakablePtr = ConstraintBreakDataToNative(breakable); - var motoDataPtr = ConstraintMotorDataToNative(motorData); - var rs = _CreatePrismaticConstraint(body, otherBody, povitPtr, axisPtr, BoolToInt(allowRotationAroundAxis), mmax, mmin, mag, breakablePtr, motoDataPtr, (int)priority, BoolToInt(stabilized)); - FreeNativeVector3(povitPtr); - FreeNativeVector3(axisPtr); - Marshal.FreeHGlobal(breakablePtr); - Marshal.FreeHGlobal(motoDataPtr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateCogWheelConstraint(IntPtr body, IntPtr otherBody, Vector3 rotationPivotA, Vector3 rotationAxisA, float radiusA, Vector3 rotationPivotB, Vector3 rotationAxisB, float radiusB, sConstraintBreakData breakable, ConstraintPriority priority) { - if (_CreateCogWheelConstraint == null) - throw new ApiNotFoundException("CreateCogWheelConstraint"); - - var rotationPivotAPtr = Vector3ToNative3(rotationPivotA); - var rotationAxisAPtr = Vector3ToNative3(rotationAxisA); - var rotationPivotBPtr = Vector3ToNative3(rotationPivotB); - var rotationAxisBPtr = Vector3ToNative3(rotationAxisB); - var breakablePtr = ConstraintBreakDataToNative(breakable); - var rs = _CreateCogWheelConstraint(body, otherBody, rotationPivotAPtr, rotationAxisAPtr, radiusA, rotationPivotBPtr, rotationAxisBPtr, radiusB, breakablePtr, (int)priority); - FreeNativeVector3(rotationPivotAPtr); - FreeNativeVector3(rotationAxisAPtr); - FreeNativeVector3(rotationPivotBPtr); - FreeNativeVector3(rotationAxisBPtr); - Marshal.FreeHGlobal(breakablePtr); - - ApiExceptionCheck(); - - return rs; - } - - public IntPtr CreateSpringAction(IntPtr world, IntPtr body1, IntPtr body2, Vector3 position1, Vector3 position2, float springStrength, float springDamping, float springRestLength, bool onCompression, bool onExtension) { - if (_CreateSpringAction == null) - throw new ApiNotFoundException("CreateSpringAction"); - - var position1Ptr = Vector3ToNative3(position1); - var position2Ptr = Vector3ToNative3(position2); - var rs = _CreateSpringAction(world, body1, body2, position1Ptr, position2Ptr, springStrength, springDamping, springRestLength, BoolToInt(onCompression), BoolToInt(onExtension)); - FreeNativeVector3(position1Ptr); - FreeNativeVector3(position2Ptr); - - ApiExceptionCheck(); - - return rs; - } - public void DestroySpringAction(IntPtr world, IntPtr spring) { - if (_DestroySpringAction == null) - throw new ApiNotFoundException("DestroySpringAction"); - - _DestroySpringAction(world, spring); - - ApiExceptionCheck(); - } - - public int GetRigidBodyId(IntPtr body) { - if (_GetRigidBodyId == null) - throw new ApiNotFoundException("GetRigidBodyId"); - - var rs = _GetRigidBodyId(body); - - ApiExceptionCheck(); - - return rs; - } - public int GetConstraintId(IntPtr body) { - if (_GetConstraintId == null) - throw new ApiNotFoundException("GetConstraintId"); - - var rs = _GetConstraintId(body); - - ApiExceptionCheck(); - - return rs; - } - public void SetConstraintBroken(IntPtr constraint, bool broken, float force) { - if (_SetConstraintBroken == null) - throw new ApiNotFoundException("_SetConstraintBroken"); - - _SetConstraintBroken(constraint, BoolToInt(broken), force); - - ApiExceptionCheck(); - } - public void SetConstraintEnable(IntPtr constraint, bool enable) { - if (_SetConstraintEnable == null) - throw new ApiNotFoundException("SetConstraintEnable"); - - _SetConstraintEnable(constraint, BoolToInt(enable)); - - ApiExceptionCheck(); - } - public void DestoryConstraints(IntPtr constraint) { - if (_DestoryConstraints == null) - throw new ApiNotFoundException("DestoryConstraints"); - - _DestoryConstraints(constraint); - - ApiExceptionCheck(); - } - public bool IsConstraintBroken(IntPtr constraint) { - if (_IsConstraintBroken == null) - throw new ApiNotFoundException("IsConstraintBroken"); - - var rs = _IsConstraintBroken(constraint) > 0; - - ApiExceptionCheck(); - - return rs; - } - public void SetRigidBodyInertiaTensor(IntPtr body, Matrix4x4 inertiaTensor) { - if (_SetRigidBodyInertiaTensor == null) - throw new ApiNotFoundException("SetRigidBodyInertiaTensor"); - - IntPtr nPtr = Matrix4x4ToNative9(inertiaTensor); - _SetRigidBodyInertiaTensor(body, nPtr); - FreeNativeMatrix4x4(nPtr); - - ApiExceptionCheck(); - } - public void SetRigidBodyLinearVelocity(IntPtr body, Vector3 velocity) { - if (_SetRigidBodyLinearVelocity == null) - throw new ApiNotFoundException("_SetRigidBodyLinearVelocity"); - - IntPtr nVelocityPtr = Vector3ToNative3(velocity); - _SetRigidBodyLinearVelocity(body, nVelocityPtr); - FreeNativeVector3(nVelocityPtr); - - ApiExceptionCheck(); - } - public void SetRigidBodyAngularVelocity(IntPtr body, Vector3 velocity) { - if (_SetRigidBodyAngularVelocity == null) - throw new ApiNotFoundException("_SetRigidBodyAngularVelocity"); - - IntPtr nVelocityPtr = Vector3ToNative3(velocity); - _SetRigidBodyAngularVelocity(body, nVelocityPtr); - FreeNativeVector3(nVelocityPtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyForce(IntPtr body, float delteTime, Vector3 force) { - if (_RigidBodyApplyForce == null) - throw new ApiNotFoundException("RigidBodyApplyForce"); - - IntPtr forcePtr = Vector3ToNative3(force); - _RigidBodyApplyForce(body, delteTime, forcePtr); - FreeNativeVector3(forcePtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyForceAtPoint(IntPtr body, float delteTime, Vector3 force, Vector3 point) { - if (_RigidBodyApplyForceAtPoint == null) - throw new ApiNotFoundException("RigidBodyApplyForceAtPoint"); - - IntPtr forcePtr = Vector3ToNative3(force); - IntPtr pointPtr = Vector3ToNative3(point); - _RigidBodyApplyForceAtPoint(body, delteTime, forcePtr, pointPtr); - FreeNativeVector3(forcePtr); - FreeNativeVector3(pointPtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyTorque(IntPtr body, float delteTime, Vector3 torque) { - if (_RigidBodyApplyTorque == null) - throw new ApiNotFoundException("RigidBodyApplyTorque"); - - IntPtr forcePtr = Vector3ToNative3(torque); - _RigidBodyApplyTorque(body, delteTime, forcePtr); - FreeNativeVector3(forcePtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyAngularImpulse(IntPtr body, Vector3 imp) { - if (_RigidBodyApplyAngularImpulse == null) - throw new ApiNotFoundException("RigidBodyApplyAngularImpulse"); - - IntPtr forcePtr = Vector3ToNative3(imp); - _RigidBodyApplyAngularImpulse(body, forcePtr); - FreeNativeVector3(forcePtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyLinearImpulse(IntPtr body, Vector3 imp) { - if (_RigidBodyApplyForce == null) - throw new ApiNotFoundException("RigidBodyApplyLinearImpulse"); - - IntPtr forcePtr = Vector3ToNative3(imp); - _RigidBodyApplyLinearImpulse(body, forcePtr); - FreeNativeVector3(forcePtr); - - ApiExceptionCheck(); - } - public void RigidBodyApplyPointImpulse(IntPtr body, Vector3 imp, Vector3 point) { - if (_RigidBodyApplyPointImpulse == null) - throw new ApiNotFoundException("RigidBodyApplyPointImpulse"); - - IntPtr impPtr = Vector3ToNative3(imp); - IntPtr pointPtr = Vector3ToNative3(point); - _RigidBodyApplyPointImpulse(body, impPtr, pointPtr); - FreeNativeVector3(impPtr); - FreeNativeVector3(pointPtr); - - ApiExceptionCheck(); - } - public void GetRigidBodyPosition(IntPtr body, out Vector3 outPos) { - if (_GetRigidBodyPosition == null) - throw new ApiNotFoundException("GetRigidBodyPosition"); - - IntPtr ptr = Vector3ToNative3(Vector3.zero); - _GetRigidBodyPosition(body, ptr); - outPos = sVec3.FromNativeToVector3(ptr); - FreeNativeVector3(ptr); - - ApiExceptionCheck(); - } - public void GetRigidBodyRotation(IntPtr body, out Vector4 outRot) { - if (_GetRigidBodyRotation == null) - throw new ApiNotFoundException("GetRigidBodyRotation"); - - IntPtr ptr = Vector4ToNative4(Vector4.zero); - _GetRigidBodyRotation(body, ptr); - outRot = sVec4.FromNativeToVector4(ptr); - FreeNativeVector4(ptr); - - ApiExceptionCheck(); - } - public void GetRigidBodyAngularVelocity(IntPtr body, out Vector3 outVelocity) { - if (_GetRigidBodyAngularVelocity == null) - throw new ApiNotFoundException("GetRigidBodyAngularVelocity"); - - IntPtr ptr = Vector3ToNative3(Vector3.zero); - _GetRigidBodyAngularVelocity(body, ptr); - outVelocity = sVec3.FromNativeToVector3(ptr); - FreeNativeVector3(ptr); - - ApiExceptionCheck(); - } - public void GetRigidBodyLinearVelocity(IntPtr body, out Vector3 outVelocity) { - if (_GetRigidBodyLinearVelocity == null) - throw new ApiNotFoundException("GetRigidBodyLinearVelocity"); - - IntPtr ptr = Vector3ToNative3(Vector3.zero); - _GetRigidBodyLinearVelocity(body, ptr); - outVelocity = sVec3.FromNativeToVector3(ptr); - FreeNativeVector3(ptr); - - ApiExceptionCheck(); - } - public void GetRigidBodyCenterOfMassInWorld(IntPtr body, out Vector3 outCenterOfMassInWorld) { - if (_GetRigidBodyCenterOfMassInWorld == null) - throw new ApiNotFoundException("GetRigidBodyCenterOfMassInWorld"); - - IntPtr ptr = Vector3ToNative3(Vector3.zero); - _GetRigidBodyCenterOfMassInWorld(body, ptr); - outCenterOfMassInWorld = sVec3.FromNativeToVector3(ptr); - FreeNativeVector3(ptr); - - ApiExceptionCheck(); - } - public void GetRigidBodyPointVelocity(IntPtr body, Vector3 pt, out Vector3 ououtVelocity) { - if (_GetRigidBodyPointVelocity == null) - throw new ApiNotFoundException("GetRigidBodyPointVelocity"); - - IntPtr nPtPtr = Vector3ToNative3(pt); - IntPtr ptr = Vector3ToNative3(Vector3.zero); - _GetRigidBodyPointVelocity(body, nPtPtr, ptr); - ououtVelocity = sVec3.FromNativeToVector3(ptr); - FreeNativeVector3(ptr); - FreeNativeVector3(nPtPtr); - - ApiExceptionCheck(); - } - public void RigidBodyResetCenterOfMass(IntPtr body) { - if (_RigidBodyResetCenterOfMass == null) - throw new ApiNotFoundException("RigidBodyResetCenterOfMass"); - - _RigidBodyResetCenterOfMass(body); - - ApiExceptionCheck(); - } - public void RigidBodyResetInertiaTensor(IntPtr body) { - if (_RigidBodyResetInertiaTensor == null) - throw new ApiNotFoundException("RigidBodyResetInertiaTensor"); - - _RigidBodyResetInertiaTensor(body); - - ApiExceptionCheck(); - } - - public void CommonDelete(IntPtr ptr) - { - if (_CommonDelete == null) - throw new ApiNotFoundException("CommonDelete"); - if (ptr == IntPtr.Zero) - throw new ApiException("ptr is nullptr"); - - _CommonDelete(ptr); - } - public IntPtr CreateTransform(float px, float py, float pz, float rx, float ry, float rz, float rw, float sx, float sy, float sz) { - if (_CreateTransform == null) - throw new ApiNotFoundException("CreateTransform"); - return _CreateTransform( px, py, pz, rx, ry, rz, rw, sx, sy, sz); - } - public void DestroyTransform(IntPtr ptr) - { - if (_DestroyTransform == null) - throw new ApiNotFoundException("DestroyTransform"); - _DestroyTransform(ptr); - } - - public void ActiveRigidBody(IntPtr ptr) - { - if (_ActiveRigidBody== null) - throw new ApiNotFoundException("ActiveRigidBody"); - _ActiveRigidBody(ptr); - } - public void DeactiveRigidBody(IntPtr ptr) - { - if (_DeactiveRigidBody == null) - throw new ApiNotFoundException("DeactiveRigidBody"); - _DeactiveRigidBody(ptr); - } - public IntPtr CreateRigidBody(IntPtr world, IntPtr shape, Vector3 position, Quaternion rot, - string name, int motionType, int qualityType, float friction, - float restitution, float mass, int active, int layer, int systemGroup, int subSystemId, int subSystemDontCollideWith, bool isTiggerVolume, bool addContactListener, float gravityFactor, float linearDamping, float angularDamping, - Vector3 centerOfMass, Matrix4x4 inertiaTensor, Vector3 linearVelocity, Vector3 angularVelocity, float maxLinearVelocity, float maxAngularVelocity, IntPtr massProperties, bool autoComputeCenterOfMass) - { - if (_CreateRigidBody == null) - throw new ApiNotFoundException("CreateRigidBody"); - - var nPtrPosition = Vector3ToNative3(position); - var nPtrRot = QuaternionToNative4(rot); - var nPtrInertiaTensor = inertiaTensor == Matrix4x4.identity ? IntPtr.Zero : Matrix4x4ToNative9(inertiaTensor); - var nPtrCenterOfMass = Vector3ToNative3(centerOfMass); - var nPtrLinearVelocity = Vector3ToNative3(linearVelocity); - var nPtrAngularVelocity = Vector3ToNative3(angularVelocity); - var nPtrName = Marshal.StringToHGlobalAnsi(name); - - var rs = _CreateRigidBody( - world, shape, nPtrPosition, nPtrRot, nPtrName, motionType, qualityType, - friction, restitution, mass, active, layer, systemGroup, subSystemId, subSystemDontCollideWith, - BoolToInt(isTiggerVolume), BoolToInt(addContactListener), gravityFactor, linearDamping, - angularDamping, autoComputeCenterOfMass ? IntPtr.Zero : nPtrCenterOfMass, nPtrInertiaTensor, nPtrLinearVelocity, nPtrAngularVelocity, - maxLinearVelocity, maxAngularVelocity, - massProperties); - - if(nPtrInertiaTensor != IntPtr.Zero) - FreeNativeMatrix4x4(nPtrInertiaTensor); - FreeNativeVector3(nPtrPosition); - FreeNativeVector4(nPtrRot); - FreeNativeVector3(nPtrCenterOfMass); - FreeNativeVector3(nPtrLinearVelocity); - FreeNativeVector3(nPtrAngularVelocity); - Marshal.FreeHGlobal(nPtrName); - - ApiExceptionCheck(); - - return rs; - } - public void SetRigidBodyMass(IntPtr body, float mass) - { - if (_SetRigidBodyMass == null) - throw new ApiNotFoundException("SetRigidBodyMass"); - - _SetRigidBodyMass(body, mass); - - ApiExceptionCheck(); - } - public void SetRigidBodyFriction(IntPtr body, float friction) - { - if (_SetRigidBodyFriction == null) - throw new ApiNotFoundException("SetRigidBodyFriction"); - - _SetRigidBodyFriction(body, friction); - - ApiExceptionCheck(); - } - public void SetRigidBodyRestitution(IntPtr body, float restitution) - { - if (_SetRigidBodyFriction == null) - throw new ApiNotFoundException("SetRigidBodyFriction"); - - _SetRigidBodyFriction(body, restitution); - - ApiExceptionCheck(); - } - public void SetRigidBodyAngularDamping(IntPtr body, float angularDamping) - { - if (_SetRigidBodyAngularDamping == null) - throw new ApiNotFoundException("SetRigidBodyAngularDamping"); - - _SetRigidBodyAngularDamping(body, angularDamping); - - ApiExceptionCheck(); - } - public void SetRigidBodyLinearDampin(IntPtr body, float linearDamping) - { - if (_SetRigidBodyLinearDampin == null) - throw new ApiNotFoundException("SetRigidBodyLinearDampin"); - - _SetRigidBodyLinearDampin(body, linearDamping); - - ApiExceptionCheck(); - } - public void SetRigidBodyCenterOfMass(IntPtr body, Vector3 centerOfMass) - { - if (_SetRigidBodyCenterOfMass == null) - throw new ApiNotFoundException("SetRigidBodyCenterOfMass"); - - var nPtrCenterOfMass = Vector3ToNative3(centerOfMass); - _SetRigidBodyCenterOfMass(body, nPtrCenterOfMass); - FreeNativeVector3(nPtrCenterOfMass); - - ApiExceptionCheck(); - } - public void SetRigidBodyPosition(IntPtr body, Vector3 pos) - { - if (_SetRigidBodyPosition == null) - throw new ApiNotFoundException("SetRigidBodyPosition"); - - var nPtrPos = Vector3ToNative3(pos); - _SetRigidBodyPosition(body, nPtrPos); - FreeNativeVector3(nPtrPos); - - ApiExceptionCheck(); - } - public void SetRigidBodyPositionAndRotation(IntPtr body, Vector3 pos, Quaternion roate) - { - if (_SetRigidBodyPositionAndRotation == null) - throw new ApiNotFoundException("SetRigidBodyPositionAndRotation"); - - var nPtrPos = Vector3ToNative3(pos); - var nPtrRot = QuaternionToNative4(roate); - _SetRigidBodyPositionAndRotation(body, nPtrPos, nPtrRot); - FreeNativeVector3(nPtrPos); - FreeNativeVector4(nPtrRot); - - ApiExceptionCheck(); - } - public void SetRigidBodyMotionType(IntPtr body, int newState) - { - if (_SetRigidBodyMotionType == null) - throw new ApiNotFoundException("SetRigidBodyMotionType"); - - _SetRigidBodyMotionType(body, newState); - - ApiExceptionCheck(); - } - public void SetRigidBodyLayer(IntPtr body, int layer) - { - if (_SetRigidBodyLayer == null) - throw new ApiNotFoundException("SetRigidBodyLayer"); - - _SetRigidBodyLayer(body, layer); - - ApiExceptionCheck(); - } - public void SetRigidBodyMaxLinearVelocity(IntPtr body, float v) - { - if (_SetRigidBodyMaxLinearVelocity == null) - throw new ApiNotFoundException("SetRigidBodyMaxLinearVelocity"); - - _SetRigidBodyMaxLinearVelocity(body, v); - - ApiExceptionCheck(); - } - public void SetRigidBodyMaxAngularVelocity(IntPtr body, float v) - { - if (_SetRigidBodyMaxAngularVelocity == null) - throw new ApiNotFoundException("SetRigidBodyMaxAngularVelocity"); - - _SetRigidBodyMaxAngularVelocity(body, v); - - ApiExceptionCheck(); - } - public void DestroyRigidBody(IntPtr body) - { - if (_DestroyRigidBody == null) - throw new ApiNotFoundException("DestroyRigidBody"); - - _DestroyRigidBody(body); - - ApiExceptionCheck(); - } - public void SetRigidBodyGravityFactor(IntPtr body, float gravityFactor) - { - if (_SetRigidBodyGravityFactor == null) - throw new ApiNotFoundException("SetRigidBodyGravityFactor"); - - _SetRigidBodyGravityFactor(body, gravityFactor); - - ApiExceptionCheck(); - } - public void GetConvexHullResultTriangles(IntPtr result, IntPtr trianglesBuffer, int count) - { - if (_GetConvexHullResultTriangles == null) - throw new ApiNotFoundException("GetConvexHullResultTriangles"); - - _GetConvexHullResultTriangles(result, trianglesBuffer, count); - - ApiExceptionCheck(); - } - public void GetConvexHullResultVertices(IntPtr result, IntPtr pointsBuffer, int numPoints) - { - if (_GetConvexHullResultVertices == null) - throw new ApiNotFoundException("GetConvexHullResultVertices"); - - _GetConvexHullResultVertices(result, pointsBuffer, numPoints); - - ApiExceptionCheck(); - } - public IntPtr Build3DPointsConvexHull(Vector3[] points) - { - if (_Build3DPointsConvexHull == null) - throw new ApiNotFoundException("Build3DPointsConvexHull"); - - float[] verticesArr = new float[points.Length * 3]; - for (int i = 0; i < points.Length; i++) - { - verticesArr[i * 3 + 0] = points[i].x; - verticesArr[i * 3 + 1] = points[i].y; - verticesArr[i * 3 + 2] = points[i].z; - } - - int bufferSize = Marshal.SizeOf() * verticesArr.Length; - IntPtr verticesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(verticesArr, 0, verticesBuffer, verticesArr.Length); - - var rs = _Build3DPointsConvexHull(verticesBuffer, points.Length); - - Marshal.FreeHGlobal(verticesBuffer); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr Build3DFromPlaneConvexHull(IntPtr panels, int numPanels) - { - if (_Build3DFromPlaneConvexHull == null) - throw new ApiNotFoundException("Build3DFromPlaneConvexHull"); - - var rs = _Build3DFromPlaneConvexHull(panels, numPanels); - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeShapeVolumeMassProperties(IntPtr shape, float mass) - { - if (_ComputeShapeVolumeMassProperties == null) - throw new ApiNotFoundException("ComputeShapeVolumeMassProperties"); - - var rs = _ComputeShapeVolumeMassProperties(shape, mass); - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeBoxSurfaceMassProperties(Vector3 halfExtents, float mass, float surfaceThickness) - { - if (_ComputeBoxSurfaceMassProperties == null) - throw new ApiNotFoundException("ComputeBoxSurfaceMassProperties"); - - var p0 = Vector3ToNative3(halfExtents); - var rs = _ComputeBoxSurfaceMassProperties(p0, mass, surfaceThickness); - FreeNativeVector3(p0); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeBoxVolumeMassProperties(Vector3 halfExtents, float mass) - { - if (_ComputeBoxVolumeMassProperties == null) - throw new ApiNotFoundException("ComputeBoxVolumeMassProperties"); - - var p0 = Vector3ToNative3(halfExtents); - var rs = _ComputeBoxVolumeMassProperties(p0, mass); - FreeNativeVector3(p0); - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeCapsuleVolumeMassProperties(Vector3 startAxis, Vector3 endAxis, float radius, float mass) - { - if (_ComputeCapsuleVolumeMassProperties == null) - throw new ApiNotFoundException("ComputeCapsuleVolumeMassProperties"); - - var pStartAxis = Vector3ToNative3(startAxis); - var pEndAxis = Vector3ToNative3(endAxis); - - var rs = _ComputeCapsuleVolumeMassProperties(pStartAxis, pEndAxis, radius, mass); - - FreeNativeVector3(pStartAxis); - FreeNativeVector3(pEndAxis); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeCylinderVolumeMassProperties(Vector3 startAxis, Vector3 endAxis, float radius, float mass) - { - if (_ComputeCylinderVolumeMassProperties == null) - throw new ApiNotFoundException("ComputeCylinderVolumeMassProperties"); - - var pStartAxis = Vector3ToNative3(startAxis); - var pEndAxis = Vector3ToNative3(endAxis); - - var rs = _ComputeCylinderVolumeMassProperties(pStartAxis, pEndAxis, radius, mass); - - FreeNativeVector3(pStartAxis); - FreeNativeVector3(pEndAxis); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeSphereVolumeMassProperties(float radius, float sphereMass) - { - if (_ComputeSphereVolumeMassProperties == null) - throw new ApiNotFoundException("ComputeSphereVolumeMassProperties"); - - var rs = _ComputeSphereVolumeMassProperties(radius, sphereMass); - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeSphereSurfaceMassProperties(float radius, float mass, float surfaceThickness) - { - if (_ComputeSphereSurfaceMassProperties == null) - throw new ApiNotFoundException("ComputeSphereSurfaceMassProperties"); - - var rs = _ComputeSphereSurfaceMassProperties(radius, mass, surfaceThickness); - ApiExceptionCheck(); - - return rs; - } - public IntPtr ComputeTriangleSurfaceMassProperties(Vector3 v0, Vector3 v1, Vector3 v2, float mass, float surfaceThickness) - { - if (_ComputeTriangleSurfaceMassProperties == null) - throw new ApiNotFoundException("ComputeTriangleSurfaceMassProperties"); - - var p0 = Vector3ToNative3(v0); - var p1 = Vector3ToNative3(v1); - var p2 = Vector3ToNative3(v2); - - var rs = _ComputeTriangleSurfaceMassProperties(p0, p1, p2, mass, surfaceThickness); - - FreeNativeVector3(p0); - FreeNativeVector3(p1); - FreeNativeVector3(p2); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateBoxShape(Vector3 boxSize, float radius) - { - if (_CreateBoxShape == null) - throw new ApiNotFoundException("CreateBoxShape"); - - var p0 = Vector3ToNative3(boxSize); - - var rs = _CreateBoxShape(p0, radius); - - FreeNativeVector3(p0); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateSphereShape(float radius) - { - if (_CreateSphereShape == null) - throw new ApiNotFoundException("CreateSphereShape"); - - var rs = _CreateSphereShape(radius); - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateCapsuleShape(Vector3 start, Vector3 end, float radius) - { - if (_CreateCapsuleShape == null) - throw new ApiNotFoundException("CreateCapsuleShape"); - - var pStart = Vector3ToNative3(start); - var pEnd = Vector3ToNative3(end); - - var rs = _CreateCapsuleShape(pStart, pEnd, radius); - - FreeNativeVector3(pStart); - FreeNativeVector3(pEnd); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateCylindeShape(Vector3 start, Vector3 end, float radius, float paddingRadius) - { - if (_CreateCylindeShape == null) - throw new ApiNotFoundException("CreateCylindeShape"); - - var pStart = Vector3ToNative3(start); - var pEnd = Vector3ToNative3(end); - - var rs = _CreateCylindeShape(pStart, pEnd, radius, paddingRadius); - - FreeNativeVector3(pStart); - FreeNativeVector3(pEnd); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateTriangleShape(Vector3 v0, Vector3 v1, Vector3 v2) - { - if (_CreateTriangleShape == null) - throw new ApiNotFoundException("CreateTriangleShape"); - - var p0 = Vector3ToNative3(v0); - var p1 = Vector3ToNative3(v1); - var p2 = Vector3ToNative3(v2); - - var rs = _CreateTriangleShape(p0, p1, p2); - - FreeNativeVector3(p0); - FreeNativeVector3(p1); - FreeNativeVector3(p2); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateConvexVerticesShape(Vector3[] vertices, float convexRadius) - { - if (_CreateConvexVerticesShape == null) - throw new ApiNotFoundException("CreateConvexVerticesShape"); - - float[] verticesArr = new float[vertices.Length * 3]; - for (int i = 0; i < vertices.Length; i++) - { - verticesArr[i * 3 + 0] = vertices[i].x; - verticesArr[i * 3 + 1] = vertices[i].y; - verticesArr[i * 3 + 2] = vertices[i].z; - } - - int bufferSize = Marshal.SizeOf() * verticesArr.Length; - IntPtr verticesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(verticesArr, 0, verticesBuffer, verticesArr.Length); - - var rs = _CreateConvexVerticesShape(verticesBuffer, verticesArr.Length, convexRadius); - - Marshal.FreeHGlobal(verticesBuffer); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateConvexVerticesShapeByConvexHullResult(IntPtr result, float convexRadius) - { - if (_CreateConvexVerticesShapeByConvexHullResult == null) - throw new ApiNotFoundException("CreateConvexVerticesShapeByConvexHullResult"); - - var rs = _CreateConvexVerticesShapeByConvexHullResult(result, convexRadius); - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateSimpleMeshShape(Vector3[] vertices, int[] triangles, float convexRadius) { - if (_CreateSimpleMeshShape == null) - throw new ApiNotFoundException("CreateSimpleMeshShape"); - - float[] verticesArr = new float[vertices.Length * 3]; - for (int i = 0; i < vertices.Length; i++) - { - verticesArr[i * 3 + 0] = vertices[i].x; - verticesArr[i * 3 + 1] = vertices[i].y; - verticesArr[i * 3 + 2] = vertices[i].z; - } - - int bufferSize = Marshal.SizeOf() * verticesArr.Length; - IntPtr verticesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(verticesArr, 0, verticesBuffer, verticesArr.Length); - - bufferSize = Marshal.SizeOf() * triangles.Length; - IntPtr trianglesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(triangles, 0, trianglesBuffer, triangles.Length); - - var rs = _CreateSimpleMeshShape(verticesBuffer, verticesArr.Length, trianglesBuffer, triangles.Length, convexRadius); - - Marshal.FreeHGlobal(trianglesBuffer); - Marshal.FreeHGlobal(verticesBuffer); - - ApiExceptionCheck(); - return rs; - } - public IntPtr CreateBvCompressedMeshShape(Vector3[] vertices, int[] triangles, float convexRadius) { - if (_CreateBvCompressedMeshShape == null) - throw new ApiNotFoundException("CreateBvCompressedMeshShape"); - - float[] verticesArr = new float[vertices.Length * 3]; - for (int i = 0; i < vertices.Length; i++) - { - verticesArr[i * 3 + 0] = vertices[i].x; - verticesArr[i * 3 + 1] = vertices[i].y; - verticesArr[i * 3 + 2] = vertices[i].z; - } - - int bufferSize = Marshal.SizeOf() * verticesArr.Length; - IntPtr verticesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(verticesArr, 0, verticesBuffer, verticesArr.Length); - - bufferSize = Marshal.SizeOf() * triangles.Length; - IntPtr trianglesBuffer = Marshal.AllocHGlobal(bufferSize); - Marshal.Copy(triangles, 0, trianglesBuffer, triangles.Length); - - var rs = _CreateBvCompressedMeshShape(verticesBuffer, verticesArr.Length, trianglesBuffer, triangles.Length, convexRadius); - - Marshal.FreeHGlobal(trianglesBuffer); - Marshal.FreeHGlobal(verticesBuffer); - - ApiExceptionCheck(); - return rs; - } - public IntPtr CreateConvexTranslateShape(IntPtr child, Vector3 translation) - { - if (_CreateConvexTranslateShape == null) - throw new ApiNotFoundException("CreateConvexTranslateShape"); - - var ptr = Vector3ToNative3(translation); - - var rs = _CreateConvexTranslateShape(child, ptr); - - FreeNativeVector3(ptr); - - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateConvexTransformShape(IntPtr child, IntPtr transform) - { - if (_CreateConvexTransformShape == null) - throw new ApiNotFoundException("CreateConvexTransformShape"); - - var rs = _CreateConvexTransformShape(child, transform); - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateListShape(IntPtr childs, int childCount) - { - if (_CreateListShape == null) - throw new ApiNotFoundException("CreateListShape"); - - var rs = _CreateListShape(childs, childCount); - ApiExceptionCheck(); - - return rs; - } - public IntPtr CreateStaticCompoundShape(IntPtr childs, IntPtr transforms, int childCount, int layout) - { - if (_CreateStaticCompoundShape == null) - throw new ApiNotFoundException("CreateStaticCompoundShape"); - - var rs = _CreateStaticCompoundShape(childs, transforms, childCount, layout); - ApiExceptionCheck(); - - return rs; - } - public void StaticCompoundShapeSetInstanceEnabled(IntPtr pStaticCompoundShape, int id, int enabled) - { - if (_StaticCompoundShapeSetInstanceEnabled == null) - throw new ApiNotFoundException("StaticCompoundShapeSetInstanceEnabled"); - - _StaticCompoundShapeSetInstanceEnabled(pStaticCompoundShape, id, enabled); - - ApiExceptionCheck(); - } - public int StaticCompoundShapeIsInstanceEnabled(IntPtr pStaticCompoundShape, int id) - { - if (_StaticCompoundShapeIsInstanceEnabled == null) - throw new ApiNotFoundException("StaticCompoundShapeIsInstanceEnabled"); - - var rs = _StaticCompoundShapeIsInstanceEnabled(pStaticCompoundShape, id); - ApiExceptionCheck(); - - return rs; - } - public void StaticCompoundShapeEnableAllInstancesAndShapeKeys(IntPtr pStaticCompoundShape) - { - if (_StaticCompoundShapeEnableAllInstancesAndShapeKeys == null) - throw new ApiNotFoundException("StaticCompoundShapeEnableAllInstancesAndShapeKeys"); - - _StaticCompoundShapeEnableAllInstancesAndShapeKeys(pStaticCompoundShape); - - ApiExceptionCheck(); - } - public void DestroyShape(IntPtr s) - { - if (_DestroyShape == null) - throw new ApiNotFoundException("DestroyShape"); - - _DestroyShape(s); - - ApiExceptionCheck(); - } - public IntPtr CreateAabbPhantom(IntPtr world, Vector3 min, Vector3 max, bool enableListener, int layer) { - if (_CreateAabbPhantom == null) - throw new ApiNotFoundException("CreateAabbPhantom"); - - var minPtr = Vector3ToNative3(min); - var maxPtr = Vector3ToNative3(max); - var rs = _CreateAabbPhantom(world, minPtr, maxPtr, BoolToInt(enableListener), layer); - FreeNativeVector3(minPtr); - FreeNativeVector3(maxPtr); - ApiExceptionCheck(); - return rs; - } - public void SetAabbPhantomMinMax(IntPtr phantom, Vector3 min, Vector3 max) { - if (_SetAabbPhantomMinMax == null) - throw new ApiNotFoundException("SetAabbPhantomMinMax"); - - var minPtr = Vector3ToNative3(min); - var maxPtr = Vector3ToNative3(max); - _SetAabbPhantomMinMax(phantom, minPtr, maxPtr); - FreeNativeVector3(minPtr); - FreeNativeVector3(maxPtr); - ApiExceptionCheck(); - } - public int[] GetAabbPhantomOverlappingCollidables(IntPtr phantom, ref int outLen) { - if (_GetAabbPhantomOverlappingCollidables == null) - throw new ApiNotFoundException("GetAabbPhantomOverlappingCollidables"); - - var rsPtr = _GetAabbPhantomOverlappingCollidables(phantom, ref outLen); - var rs = new int[outLen]; - Marshal.Copy(rsPtr, rs, 0, outLen); - - CommonDelete(rsPtr); - ApiExceptionCheck(); - return rs; - } - public void DestroyPhantom(IntPtr ptr) - { - if (_DestroyPhantom == null) - throw new ApiNotFoundException("DestroyPhantom"); - _DestroyPhantom(ptr); - ApiExceptionCheck(); - } - public int GetPhantomId(IntPtr ptr) - { - if (_GetPhantomId == null) - throw new ApiNotFoundException("GetPhantomId"); - var rs = _GetPhantomId(ptr); - ApiExceptionCheck(); - return rs; - } - public IntPtr CreatePhysicsWorld(Vector3 gravity, int solverIterationCount, float broadPhaseWorldSize, float collisionTolerance, - bool bContinuous, bool bVisualDebugger, uint layerMask, int[] layerToMask, bool stableSolverOn, - fnOnConstraintBreakingCallback onConstraintBreakingCallback, fnOnBodyTriggerEventCallback onBodyTriggerEventCallback, - fnOnBodyContactEventCallback onBodyContactEventCallback, fnOnPhantomOverlapCallback onPhantomOverlapCallback, fnOnMaxPositionExceededCallback onMaxPositionExceededCallback) - { - if (_CreatePhysicsWorld == null) - throw new ApiNotFoundException("CreatePhysicsWorld"); - - IntPtr layerToMaskPtr = Marshal.AllocHGlobal(Marshal.SizeOf() * 32); - Marshal.Copy(layerToMask, 0, layerToMaskPtr, layerToMask.Length); - - var pGravity = Vector3ToNative3(gravity); - - var onConstraintBreakingCallbackPtr = Marshal.GetFunctionPointerForDelegate(onConstraintBreakingCallback); - var onBodyTriggerEnterCallbackPtr = Marshal.GetFunctionPointerForDelegate(onBodyTriggerEventCallback); - var onBodyTriggerLeaveCallbackPtr = Marshal.GetFunctionPointerForDelegate(onBodyContactEventCallback); - var onPhantomOverlapCallbackPtr = Marshal.GetFunctionPointerForDelegate(onPhantomOverlapCallback); - var onMaxPositionExceededCallbackPtr = Marshal.GetFunctionPointerForDelegate(onMaxPositionExceededCallback); - - var rs = _CreatePhysicsWorld(pGravity, solverIterationCount, broadPhaseWorldSize, collisionTolerance, bContinuous, bVisualDebugger, layerMask, layerToMaskPtr, BoolToInt(stableSolverOn), - onConstraintBreakingCallbackPtr, onBodyTriggerEnterCallbackPtr, onBodyTriggerLeaveCallbackPtr, onPhantomOverlapCallbackPtr, onMaxPositionExceededCallbackPtr); - - FreeNativeVector4(pGravity); - Marshal.FreeHGlobal(layerToMaskPtr); - - ApiExceptionCheck(); - - return rs; - } - public void DestroyPhysicsWorld(IntPtr world) - { - if (_DestroyPhysicsWorld == null) - throw new ApiNotFoundException("DestroyPhysicsWorld"); - - _DestroyPhysicsWorld(world); - - ApiExceptionCheck(); - } - public void StepPhysicsWorld(IntPtr world, float timestep) - { - if (_StepPhysicsWorld == null) - throw new ApiNotFoundException("StepPhysicsWorld"); - _StepPhysicsWorld(world, timestep); - - ApiExceptionCheck(); - } - public void SetPhysicsWorldGravity(IntPtr world, Vector3 gravity) - { - if (_SetPhysicsWorldGravity == null) - throw new ApiNotFoundException("SetPhysicsWorldGravity"); - - var pGravity = Vector3ToNative3(gravity); - - _SetPhysicsWorldGravity(world, pGravity); - - FreeNativeVector4(pGravity); - - ApiExceptionCheck(); - } - public void SetPhysicsWorldCollisionLayerMasks(IntPtr world, uint layerId, uint toMask, int enable, int forceUpdate) { - if (_SetPhysicsWorldCollisionLayerMasks == null) - throw new ApiNotFoundException("SetPhysicsWorldCollisionLayerMasks"); - - _SetPhysicsWorldCollisionLayerMasks(world, layerId, toMask, enable, forceUpdate); - - ApiExceptionCheck(); - } - public int UpdateAllPhysicsWorldBodys(IntPtr world) - { - if (_UpdateAllPhysicsWorldBodys == null) - throw new ApiNotFoundException("UpdateAllPhysicsWorldBodys"); - - var rs = _UpdateAllPhysicsWorldBodys(world); - - ApiExceptionCheck(); - - return rs; - } - public void TestAssert() - { - if (_TestAssert == null) - throw new ApiNotFoundException("TestAssert"); - - _TestAssert(); - - ApiExceptionCheck(); - } - }; -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs b/Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs deleted file mode 100644 index b0582a83..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Api/ApiStruct.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace PhysicsRT -{ - [StructLayout(LayoutKind.Sequential)] - internal struct sVec3 - { - public float x; - public float y; - public float z; - - public static Vector3 FromNativeToVector3(IntPtr ptr) { - var vOut = Marshal.PtrToStructure(ptr); - return new Vector3(vOut.x, vOut.y, vOut.z); - } - }; - [StructLayout(LayoutKind.Sequential)] - internal struct sVec4 - { - public float x; - public float y; - public float z; - public float w; - - public static Vector4 FromNativeToVector4(IntPtr ptr) { - var vOut = Marshal.PtrToStructure(ptr); - return new Vector4(vOut.x, vOut.y, vOut.z, vOut.w); - } - }; - - - [StructLayout(LayoutKind.Sequential)] - internal struct sInitStruct - { - public IntPtr errCallback; - public bool mulithread; - public int smallPoolSize; - }; - [StructLayout(LayoutKind.Sequential)] - public struct sConvexHullResult - { - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8, ArraySubType = UnmanagedType.R4)] - public float[] aabb; //min(4) max(4) - public int verticesCount; - public int trianglesCount; - }; - [StructLayout(LayoutKind.Sequential)] - public struct sRayCastResult - { - public float hitFraction; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3, ArraySubType = UnmanagedType.R4)] - public float[] normal; //float normal[3] - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3, ArraySubType = UnmanagedType.R4)] - public float[] pos; //float pos[3] - public int bodyId; - public IntPtr body; - }; - [StructLayout(LayoutKind.Sequential)] - public struct sConstraintBreakData { - public bool breakable; - /// float - public float threshold; - /// float - public float maximumAngularImpulse; - /// float - public float maximumLinearImpulse; - } - [StructLayout(LayoutKind.Sequential)] - public struct sConstraintMotorData { - /// int - public bool enable; - /// int - public int spring; - /// float - public float m_tau; - /// float - public float m_damping; - /// float - public float m_proportionalRecoveryVelocity; - /// float - public float m_constantRecoveryVelocity; - /// float - public float m_minForce; - /// float - public float m_maxForce; - /// float - public float m_springConstant; - /// float - public float m_springDamping; - } - [StructLayout(LayoutKind.Sequential)] - public struct sPhysicsBodyContactData { - public float distance; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3, ArraySubType = UnmanagedType.R4)] - public float[] pos; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3, ArraySubType = UnmanagedType.R4)] - public float[] normal; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3, ArraySubType = UnmanagedType.R4)] - public float[] separatingNormal; - public float separatingVelocity; - public int isRemoved; - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets.meta b/Assets/Scripts/PhysicsSystem/Script/Assets.meta deleted file mode 100644 index eed28f02..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e49b21e684de8d444b4e058977dd35d6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs b/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs deleted file mode 100644 index e70562a2..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; - -[SLua.CustomLuaClass] -[CreateAssetMenu(menuName = "PhysicsRT/Custom Physics Body Tag Names", fileName = "CustomPhysicsBodyTagNames")] -public sealed class CustomPhysicsBodyTagNames : ScriptableObject, ITagNames -{ - CustomPhysicsBodyTagNames() { } - - public IReadOnlyList TagNames => m_TagNames; - [SerializeField] - string[] m_TagNames = Enumerable.Range(0, 8).Select(i => string.Empty).ToArray(); - - void OnValidate() - { - if (m_TagNames.Length != 8) - Array.Resize(ref m_TagNames, 8); - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs.meta deleted file mode 100644 index a84c75a0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsBodyTagNames.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e40e84bb4fe445b47b15da5c56e62774 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 55405dd19d77f49ec8577b3a1141b42b, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs b/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs deleted file mode 100644 index 347a77dd..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using UnityEngine.Serialization; - -public interface ITagNames -{ - IReadOnlyList TagNames { get; } -} - -[SLua.CustomLuaClass] -[CreateAssetMenu(menuName = "PhysicsRT/Custom Physics Material Tag Names", fileName = "CustomMaterialTagNames")] -public sealed partial class CustomPhysicsMaterialTagNames : ScriptableObject, ITagNames -{ - CustomPhysicsMaterialTagNames() { } - - public IReadOnlyList TagNames => m_TagNames; - [SerializeField] - [FormerlySerializedAs("m_FlagNames")] - string[] m_TagNames = Enumerable.Range(0, 8).Select(i => string.Empty).ToArray(); - - void OnValidate() - { - if (m_TagNames.Length != 8) - Array.Resize(ref m_TagNames, 8); - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs.meta deleted file mode 100644 index aae01473..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/CustomPhysicsMaterialTagNames.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 367bf94d829303f4aadb59d27be6dced -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 7c7a0159cb0d5433b90c970978f6cf5c, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs b/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs deleted file mode 100644 index d2b7fa71..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Ballance2.Utils; -using UnityEngine; - -[SLua.CustomLuaClass] -[CreateAssetMenu(menuName = "PhysicsRT/Physics Layer Names", fileName = "PhysicsLayerNames")] -public sealed class PhysicsLayerNames : ScriptableObject, ITagNames -{ - PhysicsLayerNames() { } - - IReadOnlyList ITagNames.TagNames => LayerNames; - - public IReadOnlyList LayerNames => m_LayerNames; - public GroupFilter[] GroupFilter => m_GroupFilter; - - [SerializeField] - string[] m_LayerNames = Enumerable.Range(0, 32).Select(i => string.Empty).ToArray(); - - [SerializeField] - GroupFilter[] m_GroupFilter = Enumerable.Range(0, 32).Select(i => new GroupFilter()).ToArray(); - - void OnValidate() - { - if (m_LayerNames.Length != 32) - Array.Resize(ref m_LayerNames, 32); - } - - public int[] GetGroupFilterMasks() { - return Enumerable.Range(0, 32).Select(i => { - return m_GroupFilter[i].GetMask(); - }).ToArray(); - } -} - -[Serializable] -public class GroupFilter { - [SerializeField] - public bool[] m_GroupFilter = Enumerable.Range(0, 32).Select(i => true).ToArray(); - - public int GetMask() { - int rs = 0x1; - for(int i = 1; i < 32; i++) { - if(m_GroupFilter[i]) - rs |= (1 << i); - } - return rs; - } -} - diff --git a/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs.meta deleted file mode 100644 index ab0e275e..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Assets/PhysicsLayerNames.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4862ddf4c4252114e95cf146ee950317 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 269c31d3570d84742a0d8739b06d5a18, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Attribute.meta b/Assets/Scripts/PhysicsSystem/Script/Attribute.meta deleted file mode 100644 index 28b3954e..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Attribute.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2b39b7f5ce228524baff48f0b115fa4e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs b/Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs deleted file mode 100644 index 971628a2..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Attribute/EnumFlagsAttribute.cs +++ /dev/null @@ -1,3 +0,0 @@ -using UnityEngine; - -public sealed class EnumFlagsAttribute : PropertyAttribute {} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints.meta deleted file mode 100644 index ed320290..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8300f199be3958d4187212cb5fc4f9fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs deleted file mode 100644 index faeb061b..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [SLua.CustomLuaClass] - [AddComponentMenu("PhysicsRT/Constraints/BallAndSocketConstraint")] - public class BallAndSocketConstraint : PhysicsConstraint { - - public GameObject PovitRef; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - CreateLastStep(PhysicsApi.API.CreateBallAndSocketConstraint(ptr, otherPtr, PovitRef.transform.position, GetConstraintBreakData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs.meta deleted file mode 100644 index 84aaa5f2..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/BallAndSocketConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c223b31efe9416348ab7543f174f4d1a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs deleted file mode 100644 index 79119441..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/CogWheelConstraint")] - [SLua.CustomLuaClass] - public class CogWheelConstraint : PhysicsConstraint { - - public GameObject rotationPivotARef; - public GameObject rotationAxisARef; - public float radiusA; - public GameObject rotationPivotBRef; - public GameObject rotationAxisBRef; - public float radiusB; - - public override void Create() { - if(ConnectedBody == null) - throw new Exception("ConnectedBody is null"); - var ptr = CreatePre(); - var otherPtr = ConnectedBody.GetPtr(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - CreateLastStep(PhysicsApi.API.CreateCogWheelConstraint(ptr, otherPtr, - rotationPivotARef.transform.position, rotationAxisARef.transform.forward.normalized, radiusA, - rotationPivotBRef.transform.position, rotationAxisBRef.transform.forward.normalized, radiusB, - GetConstraintBreakData(), Priority)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs.meta deleted file mode 100644 index 1c58213c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/CogWheelConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf7ac64ab369fd844a1dd8b19c54b548 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs deleted file mode 100644 index 54dca17a..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/FixedConstraint")] - [SLua.CustomLuaClass] - public class FixedConstraint : PhysicsConstraint { - - public GameObject PovitRef; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - CreateLastStep(PhysicsApi.API.CreateFixedConstraint(ptr, otherPtr, PovitRef.transform.position, GetConstraintBreakData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs.meta deleted file mode 100644 index 55ca87b8..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/FixedConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fee107a256660d440a06e996298540d2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs deleted file mode 100644 index fa5bd7b6..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/HingeConstraint")] - [SLua.CustomLuaClass] - public class HingeConstraint : PhysicsConstraint { - - public GameObject PovitRef; - public GameObject AxisRef; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - CreateLastStep(PhysicsApi.API.CreateHingeConstraint(ptr, otherPtr, PovitRef.transform.position, - AxisRef.transform.forward.normalized, GetConstraintBreakData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs.meta deleted file mode 100644 index e9a03822..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/HingeConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2566324f701ea2e41bb694b3e64c92f4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs deleted file mode 100644 index a31e39bb..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/LimitedHingeConstraint")] - [SLua.CustomLuaClass] - public class LimitedHingeConstraint : MotorConstraint { - - public GameObject PovitRef; - public GameObject AxisRef; - public float AgularLimitMin = 0; - public float AgularLimitMax = 360; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - CreateLastStep(PhysicsApi.API.CreateLimitedHingeConstraint(ptr, otherPtr, - PovitRef.transform.position, AxisRef.transform.forward.normalized, - (AgularLimitMin) * Mathf.Deg2Rad, - (AgularLimitMax) * Mathf.Deg2Rad, - GetConstraintBreakData(), GetConstraintMotorData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs.meta deleted file mode 100644 index cfb37337..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/LimitedHingeConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f955b6c542d465847a3707e04df9d9cd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs deleted file mode 100644 index 45cf1908..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [SLua.CustomLuaClass] - public class MotorConstraint : PhysicsConstraint { - - [HideInInspector] - public bool motorEnable = false; - [HideInInspector] - public bool motorSpring = false; - [HideInInspector] - public float motorTau = 0.2f; - [HideInInspector] - public float motorDamping = 0.2f; - [HideInInspector] - public float motorProportionalRecoveryVelocity = 0; - [HideInInspector] - public float motorConstantRecoveryVelocity = 0; - [HideInInspector] - public float motorMinForce = -1e6f; - [HideInInspector] - public float motorMaxForce = 1e6f; - [HideInInspector] - public float motorSpringConstant = 0; - [HideInInspector] - public float motorSpringDamping = 0.3f; - - protected sConstraintMotorData GetConstraintMotorData() { - sConstraintMotorData data = new sConstraintMotorData(); - data.enable = motorEnable; - data.spring = motorSpring ? 1 : 0; - data.m_tau = motorTau; - data.m_damping = motorDamping; - data.m_proportionalRecoveryVelocity = motorProportionalRecoveryVelocity; - data.m_constantRecoveryVelocity = motorConstantRecoveryVelocity; - data.m_minForce = motorMinForce; - data.m_maxForce = motorMaxForce; - data.m_springConstant = motorSpringConstant; - data.m_springDamping = motorSpringDamping; - return data; - } - - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs.meta deleted file mode 100644 index 071fa5ee..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/MotorConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e69be10eb9879404e89429527ff50dce -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs deleted file mode 100644 index 56b330e4..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/PrismaticConstraint")] - [SLua.CustomLuaClass] - public class PrismaticConstraint : MotorConstraint { - - public GameObject PovitRef; - public GameObject AxisRef; - public bool AllowRotationAroundAxis = false; - public float MaxLinearLimit = 100; - public float MinLinearLimit = 0; - public float MaxFrictionForce = 1000; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - CreateLastStep(PhysicsApi.API.CreatePrismaticConstraint(ptr, otherPtr, PovitRef.transform.position, AxisRef.transform.forward.normalized, - AllowRotationAroundAxis, MaxLinearLimit, MinLinearLimit, MaxFrictionForce, - GetConstraintBreakData(), GetConstraintMotorData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs.meta deleted file mode 100644 index d2869d44..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/PrismaticConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8b4dbf91eabc0cd4d9821807996e50ad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs deleted file mode 100644 index f02b0690..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/PulleyConstraint")] - [SLua.CustomLuaClass] - public class PulleyConstraint : PhysicsConstraint { - - public GameObject pivotAWRef; - public GameObject pivotBWRef; - public GameObject pulleyPivotAWRef; - public GameObject pulleyPivotBWRef; - public float leverageRatio = 0; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - CreateLastStep(PhysicsApi.API.CreatePulleyConstraint(ptr, otherPtr, - pivotAWRef.transform.position, pivotBWRef.transform.position, - pulleyPivotAWRef.transform.position, pulleyPivotBWRef.transform.position, - leverageRatio, GetConstraintBreakData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs.meta deleted file mode 100644 index 8c8a58d1..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/PulleyConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 635d3580c1283474b8f38db16746a7b8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs deleted file mode 100644 index 3c58757c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/StiffSpringConstraint")] - [SLua.CustomLuaClass] - public class StiffSpringConstraint : PhysicsConstraint { - - public GameObject PovitAWRef; - public GameObject PovitBWRef; - public float SpringMin; - public float SpringMax; - public bool Stabilized; - - public override void Create() { - var ptr = CreatePre(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - CreateLastStep(PhysicsApi.API.CreateStiffSpringConstraint(ptr, otherPtr, PovitAWRef.transform.position, PovitBWRef.transform.position, - SpringMin, SpringMax, GetConstraintBreakData(), Priority, Stabilized)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs.meta deleted file mode 100644 index d630bce3..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/StiffSpringConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a60c40656ed887640b45878ce776b62b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs deleted file mode 100644 index 333af9ae..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using UnityEngine; - -namespace PhysicsRT { - - [AddComponentMenu("PhysicsRT/Constraints/WheelConstraint")] - [SLua.CustomLuaClass] - public class WheelConstraint : PhysicsConstraint { - - public Vector3 Povit; - public Vector3 Axle; - public Vector3 Suspension; - public Vector3 Steering; - public float SuspensionLimitMin; - public float SuspensionLimitMax; - public float SuspensionStrength; - public float SuspensionDamping; - - public override void Create() { - var ptr = CreatePre(); - if(ptr == IntPtr.Zero) - throw new Exception("This body hasn't been created yet"); - var otherPtr = IntPtr.Zero; - if(ConnectedBody != null) { - otherPtr = ConnectedBody.GetPtr(); - if(otherPtr == IntPtr.Zero) - throw new Exception("ConnectedBody hasn't been created yet"); - } - CreateLastStep(PhysicsApi.API.CreateWheelConstraint(ptr, otherPtr, (Povit), Axle, Suspension, - Steering, SuspensionLimitMin, SuspensionLimitMax, SuspensionStrength, SuspensionDamping, GetConstraintBreakData(), Priority)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs.meta deleted file mode 100644 index 62363b4b..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Constraints/WheelConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ebe318efeafe80040b1ff02f47fd6f75 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Data.meta b/Assets/Scripts/PhysicsSystem/Script/Data.meta deleted file mode 100644 index 9437ac75..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 647e18c845dd8f84bba0e3db63d65d92 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs b/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs deleted file mode 100644 index cbb9132a..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using UnityEngine; - -[Serializable] -[SLua.CustomLuaClass] -public struct CustomPhysicsBodyTags -{ - public static CustomPhysicsBodyTags Everything => new CustomPhysicsBodyTags { Value = unchecked((byte)~0) }; - public static CustomPhysicsBodyTags Nothing => new CustomPhysicsBodyTags { Value = 0 }; - - public bool Tag00; - public bool Tag01; - public bool Tag02; - public bool Tag03; - public bool Tag04; - public bool Tag05; - public bool Tag06; - public bool Tag07; - - internal bool this[int i] - { - get - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 7), nameof(i)); - switch (i) - { - case 0: return Tag00; - case 1: return Tag01; - case 2: return Tag02; - case 3: return Tag03; - case 4: return Tag04; - case 5: return Tag05; - case 6: return Tag06; - case 7: return Tag07; - default: return default; - } - } - set - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 7), nameof(i)); - switch (i) - { - case 0: Tag00 = value; break; - case 1: Tag01 = value; break; - case 2: Tag02 = value; break; - case 3: Tag03 = value; break; - case 4: Tag04 = value; break; - case 5: Tag05 = value; break; - case 6: Tag06 = value; break; - case 7: Tag07 = value; break; - } - } - } - - public byte Value - { - get - { - var result = 0; - result |= (Tag00 ? 1 : 0) << 0; - result |= (Tag01 ? 1 : 0) << 1; - result |= (Tag02 ? 1 : 0) << 2; - result |= (Tag03 ? 1 : 0) << 3; - result |= (Tag04 ? 1 : 0) << 4; - result |= (Tag05 ? 1 : 0) << 5; - result |= (Tag06 ? 1 : 0) << 6; - result |= (Tag07 ? 1 : 0) << 7; - return (byte)result; - } - set - { - Tag00 = (value & (1 << 0)) != 0; - Tag01 = (value & (1 << 1)) != 0; - Tag02 = (value & (1 << 2)) != 0; - Tag03 = (value & (1 << 3)) != 0; - Tag04 = (value & (1 << 4)) != 0; - Tag05 = (value & (1 << 5)) != 0; - Tag06 = (value & (1 << 6)) != 0; - Tag07 = (value & (1 << 7)) != 0; - } - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs.meta deleted file mode 100644 index a3efbd84..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsBodyTags.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4e247e32fb6d0b049b8fd75ee0f6562c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 55405dd19d77f49ec8577b3a1141b42b, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs b/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs deleted file mode 100644 index f86fcd17..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using UnityEngine; - -[Serializable] -[SLua.CustomLuaClass] -public struct CustomPhysicsMaterialTags : IEquatable -{ - public static CustomPhysicsMaterialTags Everything => new CustomPhysicsMaterialTags { Value = unchecked((byte)~0) }; - public static CustomPhysicsMaterialTags Nothing => new CustomPhysicsMaterialTags { Value = 0 }; - - public bool Tag00; - public bool Tag01; - public bool Tag02; - public bool Tag03; - public bool Tag04; - public bool Tag05; - public bool Tag06; - public bool Tag07; - - internal bool this[int i] - { - get - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 7), nameof(i)); - switch (i) - { - case 0: return Tag00; - case 1: return Tag01; - case 2: return Tag02; - case 3: return Tag03; - case 4: return Tag04; - case 5: return Tag05; - case 6: return Tag06; - case 7: return Tag07; - default: return default; - } - } - set - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 7), nameof(i)); - switch (i) - { - case 0: Tag00 = value; break; - case 1: Tag01 = value; break; - case 2: Tag02 = value; break; - case 3: Tag03 = value; break; - case 4: Tag04 = value; break; - case 5: Tag05 = value; break; - case 6: Tag06 = value; break; - case 7: Tag07 = value; break; - } - } - } - - public byte Value - { - get - { - var result = 0; - result |= (Tag00 ? 1 : 0) << 0; - result |= (Tag01 ? 1 : 0) << 1; - result |= (Tag02 ? 1 : 0) << 2; - result |= (Tag03 ? 1 : 0) << 3; - result |= (Tag04 ? 1 : 0) << 4; - result |= (Tag05 ? 1 : 0) << 5; - result |= (Tag06 ? 1 : 0) << 6; - result |= (Tag07 ? 1 : 0) << 7; - return (byte)result; - } - set - { - Tag00 = (value & (1 << 0)) != 0; - Tag01 = (value & (1 << 1)) != 0; - Tag02 = (value & (1 << 2)) != 0; - Tag03 = (value & (1 << 3)) != 0; - Tag04 = (value & (1 << 4)) != 0; - Tag05 = (value & (1 << 5)) != 0; - Tag06 = (value & (1 << 6)) != 0; - Tag07 = (value & (1 << 7)) != 0; - } - } - - public bool Equals(CustomPhysicsMaterialTags other) => Value == other.Value; - - public override bool Equals(object obj) => obj is CustomPhysicsMaterialTags other && Equals(other); - - public override int GetHashCode() => Value; - -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs.meta deleted file mode 100644 index 81b62dd6..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/CustomPhysicsMaterialTags.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 89c98e1188dc75f4e80c6dd0222bc229 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 7c7a0159cb0d5433b90c970978f6cf5c, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs b/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs deleted file mode 100644 index bce77ab4..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs +++ /dev/null @@ -1,208 +0,0 @@ -using System; -using UnityEngine; - -[Serializable] -[SLua.CustomLuaClass] -public struct PhysicsLayerTags : IEquatable -{ - public static PhysicsLayerTags Everything => new PhysicsLayerTags { Value = unchecked((uint)~0) }; - public static PhysicsLayerTags Nothing => new PhysicsLayerTags { Value = 0 }; - - public bool Layer00; - public bool Layer01; - public bool Layer02; - public bool Layer03; - public bool Layer04; - public bool Layer05; - public bool Layer06; - public bool Layer07; - public bool Layer08; - public bool Layer09; - public bool Layer10; - public bool Layer11; - public bool Layer12; - public bool Layer13; - public bool Layer14; - public bool Layer15; - public bool Layer16; - public bool Layer17; - public bool Layer18; - public bool Layer19; - public bool Layer20; - public bool Layer21; - public bool Layer22; - public bool Layer23; - public bool Layer24; - public bool Layer25; - public bool Layer26; - public bool Layer27; - public bool Layer28; - public bool Layer29; - public bool Layer30; - public bool Layer31; - - internal bool this[int i] - { - get - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 31), nameof(i)); - switch (i) - { - case 0: return Layer00; - case 1: return Layer01; - case 2: return Layer02; - case 3: return Layer03; - case 4: return Layer04; - case 5: return Layer05; - case 6: return Layer06; - case 7: return Layer07; - case 8: return Layer08; - case 9: return Layer09; - case 10: return Layer10; - case 11: return Layer11; - case 12: return Layer12; - case 13: return Layer13; - case 14: return Layer14; - case 15: return Layer15; - case 16: return Layer16; - case 17: return Layer17; - case 18: return Layer18; - case 19: return Layer19; - case 20: return Layer20; - case 21: return Layer21; - case 22: return Layer22; - case 23: return Layer23; - case 24: return Layer24; - case 25: return Layer25; - case 26: return Layer26; - case 27: return Layer27; - case 28: return Layer28; - case 29: return Layer29; - case 30: return Layer30; - case 31: return Layer31; - default: return default; - } - } - set - { - SafetyChecks.CheckInRangeAndThrow(i, new Vector2(0, 31), nameof(i)); - switch (i) - { - case 0: Layer00 = value; break; - case 1: Layer01 = value; break; - case 2: Layer02 = value; break; - case 3: Layer03 = value; break; - case 4: Layer04 = value; break; - case 5: Layer05 = value; break; - case 6: Layer06 = value; break; - case 7: Layer07 = value; break; - case 8: Layer08 = value; break; - case 9: Layer09 = value; break; - case 10: Layer10 = value; break; - case 11: Layer11 = value; break; - case 12: Layer12 = value; break; - case 13: Layer13 = value; break; - case 14: Layer14 = value; break; - case 15: Layer15 = value; break; - case 16: Layer16 = value; break; - case 17: Layer17 = value; break; - case 18: Layer18 = value; break; - case 19: Layer19 = value; break; - case 20: Layer20 = value; break; - case 21: Layer21 = value; break; - case 22: Layer22 = value; break; - case 23: Layer23 = value; break; - case 24: Layer24 = value; break; - case 25: Layer25 = value; break; - case 26: Layer26 = value; break; - case 27: Layer27 = value; break; - case 28: Layer28 = value; break; - case 29: Layer29 = value; break; - case 30: Layer30 = value; break; - case 31: Layer31 = value; break; - } - } - } - - public uint Value - { - get - { - var result = 0; - result |= (Layer00 ? 1 : 0) << 0; - result |= (Layer01 ? 1 : 0) << 1; - result |= (Layer02 ? 1 : 0) << 2; - result |= (Layer03 ? 1 : 0) << 3; - result |= (Layer04 ? 1 : 0) << 4; - result |= (Layer05 ? 1 : 0) << 5; - result |= (Layer06 ? 1 : 0) << 6; - result |= (Layer07 ? 1 : 0) << 7; - result |= (Layer08 ? 1 : 0) << 8; - result |= (Layer09 ? 1 : 0) << 9; - result |= (Layer10 ? 1 : 0) << 10; - result |= (Layer11 ? 1 : 0) << 11; - result |= (Layer12 ? 1 : 0) << 12; - result |= (Layer13 ? 1 : 0) << 13; - result |= (Layer14 ? 1 : 0) << 14; - result |= (Layer15 ? 1 : 0) << 15; - result |= (Layer16 ? 1 : 0) << 16; - result |= (Layer17 ? 1 : 0) << 17; - result |= (Layer18 ? 1 : 0) << 18; - result |= (Layer19 ? 1 : 0) << 19; - result |= (Layer20 ? 1 : 0) << 20; - result |= (Layer21 ? 1 : 0) << 21; - result |= (Layer22 ? 1 : 0) << 22; - result |= (Layer23 ? 1 : 0) << 23; - result |= (Layer24 ? 1 : 0) << 24; - result |= (Layer25 ? 1 : 0) << 25; - result |= (Layer26 ? 1 : 0) << 26; - result |= (Layer27 ? 1 : 0) << 27; - result |= (Layer28 ? 1 : 0) << 28; - result |= (Layer29 ? 1 : 0) << 29; - result |= (Layer30 ? 1 : 0) << 30; - result |= (Layer31 ? 1 : 0) << 31; - return unchecked((uint)result); - } - set - { - Layer00 = (value & (1 << 0)) != 0; - Layer01 = (value & (1 << 1)) != 0; - Layer02 = (value & (1 << 2)) != 0; - Layer03 = (value & (1 << 3)) != 0; - Layer04 = (value & (1 << 4)) != 0; - Layer05 = (value & (1 << 5)) != 0; - Layer06 = (value & (1 << 6)) != 0; - Layer07 = (value & (1 << 7)) != 0; - Layer08 = (value & (1 << 8)) != 0; - Layer09 = (value & (1 << 9)) != 0; - Layer10 = (value & (1 << 10)) != 0; - Layer11 = (value & (1 << 11)) != 0; - Layer12 = (value & (1 << 12)) != 0; - Layer13 = (value & (1 << 13)) != 0; - Layer14 = (value & (1 << 14)) != 0; - Layer15 = (value & (1 << 15)) != 0; - Layer16 = (value & (1 << 16)) != 0; - Layer17 = (value & (1 << 17)) != 0; - Layer18 = (value & (1 << 18)) != 0; - Layer19 = (value & (1 << 19)) != 0; - Layer20 = (value & (1 << 20)) != 0; - Layer21 = (value & (1 << 21)) != 0; - Layer22 = (value & (1 << 22)) != 0; - Layer23 = (value & (1 << 23)) != 0; - Layer24 = (value & (1 << 24)) != 0; - Layer25 = (value & (1 << 25)) != 0; - Layer26 = (value & (1 << 26)) != 0; - Layer27 = (value & (1 << 27)) != 0; - Layer28 = (value & (1 << 28)) != 0; - Layer29 = (value & (1 << 29)) != 0; - Layer30 = (value & (1 << 30)) != 0; - Layer31 = (value & (1 << 31)) != 0; - } - } - - public bool Equals(PhysicsLayerTags other) => Value == other.Value; - - public override bool Equals(object obj) => obj is PhysicsLayerTags other && Equals(other); - - public override int GetHashCode() => unchecked((int)Value); -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs.meta deleted file mode 100644 index e4b80f75..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Data/PhysicsLayerTags.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 80d387df2f91a294192c97639ee79f4b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 269c31d3570d84742a0d8739b06d5a18, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor.meta b/Assets/Scripts/PhysicsSystem/Script/Editor.meta deleted file mode 100644 index 21770883..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1fc266dc8465818448b932a09f500287 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs deleted file mode 100644 index d78fa0ea..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using UnityEditor; -using UnityEditorInternal; -using UnityEngine; - -[AttributeUsage(AttributeTargets.Field)] -sealed class AutoPopulateAttribute : Attribute -{ - public string PropertyPath { get; set; } - public string ElementFormatString { get; set; } - public bool Reorderable { get; set; } = true; - public bool Resizable { get; set; } = true; -} - -abstract class BaseEditor : UnityEditor.Editor -{ - static class Content - { - public static readonly string UnableToLocateFormatString = L10n.Tr("Cannot find SerializedProperty {0}"); - } - - List m_AutoFieldGUIControls = new List(); - - protected virtual void OnEnable() - { - const BindingFlags bindingFlags = - BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy; - var autoFields = GetType().GetFields(bindingFlags) - .Where(f => Attribute.IsDefined(f, typeof(AutoPopulateAttribute))) - .ToArray(); - - foreach (var field in autoFields) - { - var attr = - field.GetCustomAttributes(typeof(AutoPopulateAttribute)).Single() as AutoPopulateAttribute; - - var sp = serializedObject.FindProperty(attr.PropertyPath ?? field.Name); - - if (sp == null) - { - var message = string.Format(Content.UnableToLocateFormatString, field.Name); - m_AutoFieldGUIControls.Add(() => EditorGUILayout.HelpBox(message, MessageType.Error)); - Debug.LogError(message); - continue; - } - - if (field.FieldType == typeof(SerializedProperty)) - { - field.SetValue(this, sp); - m_AutoFieldGUIControls.Add(() => EditorGUILayout.PropertyField(sp, true)); - } - else if (field.FieldType == typeof(ReorderableList)) - { - var list = new ReorderableList(serializedObject, sp); - - var label = EditorGUIUtility.TrTextContent(sp.displayName); - list.drawHeaderCallback = rect => EditorGUI.LabelField(rect, label); - - list.elementHeightCallback = index => - { - var element = list.serializedProperty.GetArrayElementAtIndex(index); - return EditorGUI.GetPropertyHeight(element) + EditorGUIUtility.standardVerticalSpacing; - }; - - var formatString = attr.ElementFormatString; - if (formatString == null) - { - list.drawElementCallback = (rect, index, active, focused) => - { - var element = list.serializedProperty.GetArrayElementAtIndex(index); - EditorGUI.PropertyField( - new Rect(rect) { height = EditorGUI.GetPropertyHeight(element) }, element, true - ); - }; - } - else - { - var noLabel = formatString == string.Empty; - if (!noLabel) - formatString = L10n.Tr(formatString); - var elementLabel = new GUIContent(); - list.drawElementCallback = (rect, index, active, focused) => - { - var element = list.serializedProperty.GetArrayElementAtIndex(index); - if (!noLabel) - elementLabel.text = string.Format(formatString, index); - EditorGUI.PropertyField( - new Rect(rect) { height = EditorGUI.GetPropertyHeight(element) }, - element, - noLabel ? GUIContent.none : elementLabel, - true - ); - }; - } - - list.draggable = attr.Reorderable; - list.displayAdd = list.displayRemove = attr.Resizable; - - field.SetValue(this, list); - m_AutoFieldGUIControls.Add(() => list.DoLayoutList()); - } - } - } - protected virtual void DrawCustomGUI() { - - } - public override void OnInspectorGUI() - { - serializedObject.Update(); - - EditorGUI.BeginChangeCheck(); - - foreach (var guiControl in m_AutoFieldGUIControls) - guiControl(); - - DrawCustomGUI(); - - if (EditorGUI.EndChangeCheck()) - serializedObject.ApplyModifiedProperties(); - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs.meta deleted file mode 100644 index edb69db5..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/BaseEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d4a53d4cac88ca643861d10fe3eece05 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/ConstraintsEditorTools.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/ConstraintsEditorTools.meta deleted file mode 100644 index 5b0b42c0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/ConstraintsEditorTools.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 887fbb5b3d548fa4b88879d112ed8303 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs deleted file mode 100644 index 8ec732b8..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEditor; -using UnityEditorInternal; -using UnityEngine; - -[CustomEditor(typeof(CustomPhysicsBodyTagNames))] -[CanEditMultipleObjects] -class CustomPhysicsBodyTagNamesEditor : BaseEditor -{ - #pragma warning disable 649 - [AutoPopulate(ElementFormatString = "Custom Physics Body Tag {0}", Resizable = false, Reorderable = false)] - ReorderableList m_TagNames; -#pragma warning restore 649 - -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs.meta deleted file mode 100644 index 1967a70b..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsBodyTagNamesEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9c65e8663995a424f8cbb2e8625a5f1b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs deleted file mode 100644 index 1373018a..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEditor; -using UnityEditorInternal; -using UnityEngine; - -[CustomEditor(typeof(CustomPhysicsMaterialTagNames))] -[CanEditMultipleObjects] -class CustomPhysicsMaterialTagNamesEditor : BaseEditor -{ -#pragma warning disable 649 - [AutoPopulate(ElementFormatString = "Custom Physics Material Tag {0}", Resizable = false, Reorderable = false)] - ReorderableList m_TagNames; -#pragma warning restore 649 - -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs.meta deleted file mode 100644 index a06aa3ed..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/CustomPhysicsMaterialTagNamesEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7c926526a8a9b0f4fa2f1d7d92c9c959 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources.meta deleted file mode 100644 index fa68a4f1..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f27a31a61a6f5ae4cbfb974c2b745eba -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd deleted file mode 100644 index 40b0a89e..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd.meta deleted file mode 100644 index 56ea12ad..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsBodyTagNames Icon.psd.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: 55405dd19d77f49ec8577b3a1141b42b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd deleted file mode 100644 index 333d73b2..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd.meta deleted file mode 100644 index 8d62d769..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/CustomPhysicsMaterialTagNames Icon.psd.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: 7c7a0159cb0d5433b90c970978f6cf5c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd deleted file mode 100644 index b33bb0b5..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd.meta deleted file mode 100644 index 514ec8f3..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsCategoryNames Icon.psd.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: 269c31d3570d84742a0d8739b06d5a18 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd deleted file mode 100644 index 5ab6c1fe..00000000 Binary files a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd and /dev/null differ diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd.meta deleted file mode 100644 index dffe754c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Editor Default Resources/PhysicsMaterialTemplate Icon.psd.meta +++ /dev/null @@ -1,101 +0,0 @@ -fileFormatVersion: 2 -guid: dea88969a14a54552b290b80692e0785 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools.meta deleted file mode 100644 index 0a9006d6..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a97e24c58555594f8ec71340da40bf8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs deleted file mode 100644 index 9fb3f692..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using Unity.Mathematics; -using UnityEditor; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -namespace Unity.Physics.Editor -{ - class BeveledBoxBoundsHandle : BoxBoundsHandle - { - public float bevelRadius - { - get => math.min(m_BevelRadius, math.cmin(GetSize()) * 0.5f); - set - { - if (!m_IsDragging) - m_BevelRadius = math.max(0f, value); - } - } - float m_BevelRadius = 0; - bool m_IsDragging = false; - - static PhysicsBoundsHandleUtility.Corner[] s_Corners = new PhysicsBoundsHandleUtility.Corner[8]; - - public new void DrawHandle() - { - int prevHotControl = GUIUtility.hotControl; - if (prevHotControl == 0) - m_IsDragging = false; - base.DrawHandle(); - int currHotcontrol = GUIUtility.hotControl; - if (currHotcontrol != prevHotControl) - m_IsDragging = currHotcontrol != 0; - } - - protected override void DrawWireframe() - { - if (this.bevelRadius <= 0f) - { - base.DrawWireframe(); - return; - } - - var cameraPosition = float3.zero; - var cameraForward = new float3 { z = 1f }; - if (Camera.current != null) - { - cameraPosition = Camera.current.transform.position; - cameraForward = Camera.current.transform.forward; - } - - var bounds = new Bounds(this.center, this.size); - bool isCameraInsideBox = Camera.current != null && bounds.Contains(Handles.inverseMatrix.MultiplyPoint(cameraPosition)); - var bevelRadius = this.bevelRadius; - var origin = (float3)this.center; - var size = (float3)this.size; - - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), bevelRadius, 0, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3(-1f, 1f, 1f), bevelRadius, 0, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), bevelRadius, 1, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, -1f, 1f), bevelRadius, 1, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), bevelRadius, 2, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, -1f), bevelRadius, 2, axes, isCameraInsideBox); - - var corner = 0.5f * size - new float3(1f) * bevelRadius; - var axisx = new float3(1f, 0f, 0f); - var axisy = new float3(0f, 1f, 0f); - var axisz = new float3(0f, 0f, 1f); - - // Since the geometry is transformed by Handles.matrix during rendering, we transform the camera position - // by the inverse matrix so that the two-shaded wireframe will have the proper orientation. - var invMatrix = Handles.inverseMatrix; - cameraPosition = invMatrix.MultiplyPoint(cameraPosition); - cameraForward = invMatrix.MultiplyVector(cameraForward); - var cameraOrtho = Camera.current == null || Camera.current.orthographic; - - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, 1f, -1f), quaternion.LookRotation(-axisz, axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[0]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, 1f, 1f), quaternion.LookRotation(-axisx, axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[1]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, 1f, 1f), quaternion.LookRotation( axisz, axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[2]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, 1f, -1f), quaternion.LookRotation( axisx, axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[3]); - - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, -1f, -1f), quaternion.LookRotation(-axisx, -axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[4]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, -1f, 1f), quaternion.LookRotation( axisz, -axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[5]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, -1f, 1f), quaternion.LookRotation( axisx, -axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[6]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, -1f, -1f), quaternion.LookRotation(-axisz, -axisy), cameraPosition, cameraForward, cameraOrtho, bevelRadius, out s_Corners[7]); - - for (int i = 0; i < s_Corners.Length; i++) - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[i], true); - - // Draw the horizon edges between the corners - for (int upA = 3, upB = 0; upB < 4; upA = upB, upB++) - { - int dnA = upA + 4; - int dnB = upB + 4; - - if (s_Corners[upA].splitAxis[0].z && s_Corners[upB].splitAxis[1].x) Handles.DrawLine(s_Corners[upA].points[0], s_Corners[upB].points[1]); - if (s_Corners[upA].splitAxis[1].z && s_Corners[upB].splitAxis[0].x) Handles.DrawLine(s_Corners[upA].points[1], s_Corners[upB].points[0]); - - if (s_Corners[dnA].splitAxis[0].x && s_Corners[dnB].splitAxis[1].z) Handles.DrawLine(s_Corners[dnA].points[0], s_Corners[dnB].points[1]); - if (s_Corners[dnA].splitAxis[1].x && s_Corners[dnB].splitAxis[0].z) Handles.DrawLine(s_Corners[dnA].points[1], s_Corners[dnB].points[0]); - - if (s_Corners[dnA].splitAxis[0].y && s_Corners[upA].splitAxis[1].y) Handles.DrawLine(s_Corners[dnA].points[0], s_Corners[upA].points[1]); - if (s_Corners[dnA].splitAxis[1].y && s_Corners[upA].splitAxis[0].y) Handles.DrawLine(s_Corners[dnA].points[1], s_Corners[upA].points[0]); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta deleted file mode 100644 index fdee911d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledBoxBoundsHandle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3d159761cbfd64ab4b45c185b806856c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs deleted file mode 100644 index e833ed81..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs +++ /dev/null @@ -1,348 +0,0 @@ -using System; -using Unity.Mathematics; -using UnityEditor; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -namespace Unity.Physics.Editor -{ - class BeveledCylinderBoundsHandle : PrimitiveBoundsHandle - { - public float bevelRadius - { - get => math.min(m_BevelRadius, math.cmin(GetSize()) * 0.5f); - set - { - if (!m_IsDragging) - m_BevelRadius = math.max(0f, value); - } - } - - float m_BevelRadius = 0; - - bool m_IsDragging = false; - - public float height - { - get => GetSize().z; - set - { - var size = GetSize(); - size.z = math.max(0f, value); - SetSize(size); - } - } - - public float radius - { - get - { - var size = (float3)GetSize(); - var diameter = 0f; - // only consider size values on enabled axes - if (IsAxisEnabled(0)) diameter = math.max(diameter, math.abs(size.x)); - else if (IsAxisEnabled(1)) diameter = math.max(diameter, math.abs(size.y)); - return diameter * 0.5f; - } - set - { - var size = (float3)GetSize(); - size.x = size.y = math.max(0f, value * 2.0f); - SetSize(size); - } - } - - public int sideCount - { - get => m_SideCount; - set - { - if (value == m_SideCount) - return; - - m_SideCount = value; - - Array.Resize(ref m_TopPoints, m_SideCount * 2); - Array.Resize(ref m_BottomPoints, m_SideCount * 2); - Array.Resize(ref m_Corners, m_SideCount * 2); - } - } - int m_SideCount; - - PhysicsBoundsHandleUtility.Corner[] m_Corners = Array.Empty(); - Vector3[] m_TopPoints = Array.Empty(); - Vector3[] m_BottomPoints = Array.Empty(); - - public new void DrawHandle() - { - int prevHotControl = GUIUtility.hotControl; - if (prevHotControl == 0) - m_IsDragging = false; - base.DrawHandle(); - int currHotcontrol = GUIUtility.hotControl; - if (currHotcontrol != prevHotControl) - m_IsDragging = currHotcontrol != 0; - } - - protected override void DrawWireframe() - { - using (new Handles.DrawingScope(Handles.matrix)) - { - var backfacedColor = PhysicsBoundsHandleUtility.GetStateColor(true); - var frontfacedColor = Handles.color; - bool isCameraInsideBox = false; - - var radius = this.radius; - var bevelRadius = this.bevelRadius; - - var halfHeight = new float3(0f, 0f, height * 0.5f); - var ctr = (float3)center; - var halfAngleStep = math.PI / m_SideCount; - var angleStep = 2f * halfAngleStep; - const float kHalfPI = (math.PI * 0.5f); - - var bottom = ctr + halfHeight + new float3 { z = bevelRadius }; - var top = ctr - halfHeight - new float3 { z = bevelRadius }; - var tangent = new float3(1, 0, 0); - var binormal = new float3(0, 1, 0); - var topBackFaced = PhysicsBoundsHandleUtility.IsBackfaced(top, -tangent, binormal, axes, isCameraInsideBox); - var bottomBackFaced = PhysicsBoundsHandleUtility.IsBackfaced(bottom, tangent, binormal, axes, isCameraInsideBox); - - var cameraCenter = float3.zero; - var cameraForward = new float3 { z = 1f }; - if (Camera.current != null) - { - cameraCenter = Camera.current.transform.position; - cameraForward = Camera.current.transform.forward; - } - - // Since the geometry is transformed by Handles.matrix during rendering, we transform the camera position - // by the inverse matrix so that the two-shaded wireframe will have the proper orientation. - var invMatrix = Handles.inverseMatrix; - cameraCenter = invMatrix.MultiplyPoint(cameraCenter); - cameraForward = invMatrix.MultiplyVector(cameraForward); - var cameraOrtho = Camera.current != null && Camera.current.orthographic; - - var noSides = (radius - bevelRadius) < PhysicsBoundsHandleUtility.kDistanceEpsilon; - var up = new float3(0, 0, -1f); - - var t = ((m_SideCount - 2) * angleStep); - var xyAngle0 = new float3(math.cos(t), math.sin(t), 0f); - - t = (m_SideCount - 1) * angleStep; - var xyAngle1 = new float3(math.cos(t), math.sin(t), 0f); - var sideways1 = new float3(math.cos(t + kHalfPI - halfAngleStep), math.sin(t + kHalfPI - halfAngleStep), 0f); - var direction1 = new float3(math.cos(t + halfAngleStep), math.sin(t + halfAngleStep), 0f); - var bevelGreaterThanZero = bevelRadius > 0f; - var bevelLessThanCylinderRadius = bevelRadius < radius; - for (var i = 0; i < m_SideCount; ++i) - { - t = i * angleStep; - var xyAngle2 = new float3(math.cos(t), math.sin(t), 0f); - var sideways2 = new float3(math.cos(t + kHalfPI - halfAngleStep), math.sin(t + kHalfPI - halfAngleStep), 0f); - var direction2 = new float3(math.cos(t + halfAngleStep), math.sin(t + halfAngleStep), 0f); - - var offset0 = xyAngle0 * (radius - bevelRadius); - var offset1 = xyAngle1 * (radius - bevelRadius); - var offset2 = xyAngle2 * (radius - bevelRadius); - - var top1 = ctr + offset1 - (halfHeight - new float3 { z = bevelRadius }); - var bottom1 = ctr + offset1 + (halfHeight - new float3 { z = bevelRadius }); - - var top2 = ctr + offset2 - (halfHeight - new float3 { z = bevelRadius }); - var bottom2 = ctr + offset2 + (halfHeight - new float3 { z = bevelRadius }); - - var startOffset = direction1 * bevelRadius; - - if (bevelGreaterThanZero) - { - var upOffset = up * bevelRadius; - - // top/bottom caps - if (bevelLessThanCylinderRadius) - { - Handles.color = topBackFaced ? backfacedColor : frontfacedColor; - Handles.DrawLine(top1 + upOffset, top2 + upOffset); - - Handles.color = bottomBackFaced ? backfacedColor : frontfacedColor; - Handles.DrawLine(bottom1 - upOffset, bottom2 - upOffset); - } - - var currSideMidPoint = ctr + ((top1 + bottom1 + top2 + bottom2) * 0.25f) + startOffset; - var currSideBackFaced = PhysicsBoundsHandleUtility.IsBackfaced(currSideMidPoint, up, sideways2, axes, isCameraInsideBox); - - Handles.color = currSideBackFaced ? backfacedColor : frontfacedColor; - if (!noSides) - { - // Square side of bevelled cylinder - Handles.DrawLine(top2 + startOffset, bottom2 + startOffset); - Handles.DrawLine(bottom2 + startOffset, bottom1 + startOffset); - Handles.DrawLine(bottom1 + startOffset, top1 + startOffset); - Handles.DrawLine(top1 + startOffset, top2 + startOffset); - } else - { - // Square side of bevelled cylinder, when squashed to a single line - Handles.DrawLine(top2 + startOffset, bottom2 + startOffset); - } - } else - { - var top0 = ctr + offset0 - (halfHeight - new float3 { z = bevelRadius }); - var bottom0 = ctr + offset0 + (halfHeight - new float3 { z = bevelRadius }); - - var prevMidPoint = ctr + ((top0 + top1 + bottom0 + bottom1) * 0.25f) + startOffset; - var prevSideBackFaced = PhysicsBoundsHandleUtility.IsBackfaced(prevMidPoint, up, sideways1, axes, isCameraInsideBox); - - var currMidPoint = ctr + ((top1 + top2 + bottom1 + bottom2) * 0.25f) + startOffset; - var currSideBackFaced = PhysicsBoundsHandleUtility.IsBackfaced(currMidPoint, up, sideways2, axes, isCameraInsideBox); - - // Square side of bevelled cylinder - Handles.color = (currSideBackFaced && prevSideBackFaced) ? backfacedColor : frontfacedColor; - Handles.DrawLine(bottom1 + startOffset, top1 + startOffset); - - Handles.color = (currSideBackFaced && topBackFaced) ? backfacedColor : frontfacedColor; - Handles.DrawLine(top1 + startOffset, top2 + startOffset); - - Handles.color = (currSideBackFaced && bottomBackFaced) ? backfacedColor : frontfacedColor; - Handles.DrawLine(bottom2 + startOffset, bottom1 + startOffset); - } - - if (bevelGreaterThanZero) - { - Handles.color = frontfacedColor; - - var cornerIndex0 = i; - var cornerIndex1 = i + m_SideCount; - { - var orientation = quaternion.LookRotation(xyAngle2, up); - var cornerNormal = math.normalize(math.mul(orientation, new float3(0f, 1f, 1f))); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(top2, - new float3x3(direction1, up, direction2), - cornerNormal, cameraCenter, cameraForward, cameraOrtho, - bevelRadius, out m_Corners[cornerIndex0]); - } - { - var orientation = quaternion.LookRotation(xyAngle2, -up); - var cornerNormal = math.normalize(math.mul(orientation, new float3(0f, 1f, 1f))); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(bottom2, - new float3x3(direction2, -up, direction1), - cornerNormal, cameraCenter, cameraForward, cameraOrtho, - bevelRadius, out m_Corners[cornerIndex1]); - } - } - - direction1 = direction2; - sideways1 = sideways2; - xyAngle0 = xyAngle1; - xyAngle1 = xyAngle2; - } - - if (bevelGreaterThanZero) - { - Handles.color = frontfacedColor; - for (int a = m_SideCount - 1, b = 0; b < m_SideCount; a = b, ++b) - { - var up0 = a; - var dn0 = a + m_SideCount; - - var up1 = b; - var dn1 = b + m_SideCount; - - // Side horizon on vertical curved edge - if (m_Corners[up1].splitCount > 1 && - m_Corners[dn1].splitCount > 1) - { - if ((m_Corners[up1].splitAxis[0].y || m_Corners[up1].splitAxis[1].y) && - (m_Corners[dn1].splitAxis[0].y || m_Corners[dn1].splitAxis[1].y)) - { - var point0 = m_Corners[up1].splitAxis[0].y ? m_Corners[up1].points[0] : m_Corners[up1].points[1]; - var point1 = m_Corners[dn1].splitAxis[0].y ? m_Corners[dn1].points[0] : m_Corners[dn1].points[1]; - Handles.DrawLine(point0, point1); - } - } - // Top horizon on horizontal curved edge - if (m_Corners[up0].splitCount > 1 && - m_Corners[up1].splitCount > 1) - { - if ((m_Corners[up0].splitAxis[0].x || m_Corners[up0].splitAxis[1].x) && - (m_Corners[up1].splitAxis[0].z || m_Corners[up1].splitAxis[1].z)) - { - var point0 = m_Corners[up0].splitAxis[0].x ? m_Corners[up0].points[0] : m_Corners[up0].points[1]; - var point1 = m_Corners[up1].splitAxis[0].z ? m_Corners[up1].points[0] : m_Corners[up1].points[1]; - Handles.DrawLine(point0, point1); - } - } - // Bottom horizon on horizontal curved edge - if (m_Corners[dn0].splitCount > 1 && - m_Corners[dn1].splitCount > 1) - { - if ((m_Corners[dn0].splitAxis[0].z || m_Corners[dn0].splitAxis[1].z) && - (m_Corners[dn1].splitAxis[0].x || m_Corners[dn1].splitAxis[1].x)) - { - var point0 = m_Corners[dn0].splitAxis[0].z ? m_Corners[dn0].points[0] : m_Corners[dn0].points[1]; - var point1 = m_Corners[dn1].splitAxis[0].x ? m_Corners[dn1].points[0] : m_Corners[dn1].points[1]; - Handles.DrawLine(point0, point1); - } - } - } - - for (var i = 0; i < m_Corners.Length; ++i) - PhysicsBoundsHandleUtility.DrawCorner(m_Corners[i], new bool3(true, true, !noSides)); - } - } - } - - protected override Bounds OnHandleChanged(HandleDirection handle, Bounds boundsOnClick, Bounds newBounds) - { - const int k_DirectionX = 0; - const int k_DirectionY = 1; - const int k_DirectionZ = 2; - - var changedAxis = k_DirectionX; - var otherRadiusAxis = k_DirectionY; - switch (handle) - { - case HandleDirection.NegativeY: - case HandleDirection.PositiveY: - changedAxis = k_DirectionY; - otherRadiusAxis = k_DirectionX; - break; - case HandleDirection.NegativeZ: - case HandleDirection.PositiveZ: - changedAxis = k_DirectionZ; - break; - } - - var upperBound = newBounds.max; - var lowerBound = newBounds.min; - - var convexDiameter = 2f * bevelRadius; - - // ensure changed dimension cannot be made less than convex diameter - if (upperBound[changedAxis] - lowerBound[changedAxis] < convexDiameter) - { - switch (handle) - { - case HandleDirection.PositiveX: - case HandleDirection.PositiveY: - case HandleDirection.PositiveZ: - upperBound[changedAxis] = lowerBound[changedAxis] + convexDiameter; - break; - default: - lowerBound[changedAxis] = upperBound[changedAxis] - convexDiameter; - break; - } - } - - // ensure radius changes uniformly - if (changedAxis != k_DirectionZ) - { - var rad = 0.5f * (upperBound[changedAxis] - lowerBound[changedAxis]); - - lowerBound[otherRadiusAxis] = center[otherRadiusAxis] - rad; - upperBound[otherRadiusAxis] = center[otherRadiusAxis] + rad; - } - - return new Bounds((upperBound + lowerBound) * 0.5f, upperBound - lowerBound); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta deleted file mode 100644 index 8211713d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/BeveledCylinderBoundsHandle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7a64b7883aec4411eb5718b49553d58a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs deleted file mode 100644 index 8007cade..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using Unity.Mathematics; -using UnityEditor; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -namespace Unity.Physics.Editor -{ - class PhysicsCapsuleBoundsHandle : CapsuleBoundsHandle - { - static PhysicsBoundsHandleUtility.Corner[] s_Corners = new PhysicsBoundsHandleUtility.Corner[8]; - - protected override void DrawWireframe() - { - if (this.radius <= 0f) - { - base.DrawWireframe(); - return; - } - - var cameraPos = default(float3); - var cameraFwd = new float3 { z = 1f }; - var cameraOrtho = true; - if (Camera.current != null) - { - cameraPos = Camera.current.transform.position; - cameraFwd = Camera.current.transform.forward; - cameraOrtho = Camera.current.orthographic; - } - - var size = new float3(this.radius * 2f, this.radius * 2f, height); - var radius = this.radius; - var origin = (float3)this.center; - var bounds = new Bounds(this.center, size); - - // Since the geometry is transformed by Handles.matrix during rendering, we transform the camera position - // by the inverse matrix so that the two-shaded wireframe will have the proper orientation. - var invMatrix = Handles.inverseMatrix; - var cameraCenter = (float3)invMatrix.MultiplyPoint(cameraPos); - var cameraForward = (float3)invMatrix.MultiplyVector(cameraFwd); - - bool isCameraInsideBox = Camera.current != null - && bounds.Contains(invMatrix.MultiplyPoint(cameraPos)); - - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), radius, 0, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3(-1f, 1f, 1f), radius, 0, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), radius, 1, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, -1f, 1f), radius, 1, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, 1f), radius, 2, axes, isCameraInsideBox); - PhysicsBoundsHandleUtility.DrawFace(origin, size * new float3( 1f, 1f, -1f), radius, 2, axes, isCameraInsideBox); - - var corner = 0.5f * size - new float3(1f) * radius; - var axisx = new float3(1f, 0f, 0f); - var axisy = new float3(0f, 1f, 0f); - var axisz = new float3(0f, 0f, 1f); - - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, 1f, -1f), quaternion.LookRotation(-axisz, axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[0]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, 1f, 1f), quaternion.LookRotation(-axisx, axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[1]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, 1f, 1f), quaternion.LookRotation( axisz, axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[2]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, 1f, -1f), quaternion.LookRotation( axisx, axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[3]); - - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, -1f, -1f), quaternion.LookRotation(-axisx, -axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[4]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3(-1f, -1f, 1f), quaternion.LookRotation( axisz, -axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[5]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, -1f, 1f), quaternion.LookRotation( axisx, -axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[6]); - PhysicsBoundsHandleUtility.CalculateCornerHorizon(origin + corner * new float3( 1f, -1f, -1f), quaternion.LookRotation(-axisz, -axisy), cameraCenter, cameraForward, cameraOrtho, radius, out s_Corners[7]); - - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[0], new bool3(false, true, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[3], new bool3(true, false, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[4], new bool3(true, false, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[7], new bool3(false, true, true)); - - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[1], new bool3(true, false, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[2], new bool3(false, true, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[5], new bool3(false, true, true)); - PhysicsBoundsHandleUtility.DrawCorner(s_Corners[6], new bool3(true, false, true)); - - // Draw the horizon edges between the corners - for (int upA = 3, upB = 0; upB < 4; upA = upB, upB++) - { - int dnA = upA + 4; - int dnB = upB + 4; - - if (s_Corners[upA].splitAxis[0].z && s_Corners[upB].splitAxis[1].x) Handles.DrawLine(s_Corners[upA].points[0], s_Corners[upB].points[1]); - if (s_Corners[upA].splitAxis[1].z && s_Corners[upB].splitAxis[0].x) Handles.DrawLine(s_Corners[upA].points[1], s_Corners[upB].points[0]); - - if (s_Corners[dnA].splitAxis[0].x && s_Corners[dnB].splitAxis[1].z) Handles.DrawLine(s_Corners[dnA].points[0], s_Corners[dnB].points[1]); - if (s_Corners[dnA].splitAxis[1].x && s_Corners[dnB].splitAxis[0].z) Handles.DrawLine(s_Corners[dnA].points[1], s_Corners[dnB].points[0]); - - if (s_Corners[dnA].splitAxis[0].y && s_Corners[upA].splitAxis[1].y) Handles.DrawLine(s_Corners[dnA].points[0], s_Corners[upA].points[1]); - if (s_Corners[dnA].splitAxis[1].y && s_Corners[upA].splitAxis[0].y) Handles.DrawLine(s_Corners[dnA].points[1], s_Corners[upA].points[0]); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta deleted file mode 100644 index dca61323..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/EditorTools/PhysicsCapsuleBoundsHandle.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 836ec77289f058045a2b6fc622290465 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs deleted file mode 100644 index 486e1461..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs +++ /dev/null @@ -1,170 +0,0 @@ -using System; -using System.Collections.Generic; -using PhysicsRT; -using Unity.Mathematics; -using Unity.Physics.Editor; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof( PhysicsBody))] -[CanEditMultipleObjects] -class PhysicsBodyEditor : Editor -{ - private PhysicsBody instance; - - [NonSerialized] - private string[] m_LayerNames = new string[33]; - [NonSerialized] - private int[] m_LayerValues = new int[33]; - - public PhysicsBodyEditor() { - for(int i = 0; i < 32; i++) - m_LayerValues[i] = i; - } - - private void OnEnable() { - pMotionType = serializedObject.FindProperty("m_MotionType"); - pCollidableQualityType = serializedObject.FindProperty("m_CollidableQualityType"); - pMass = serializedObject.FindProperty("m_Mass"); - pLinearDamping = serializedObject.FindProperty("m_LinearDamping"); - pAngularDamping = serializedObject.FindProperty("m_AngularDamping"); - pInitialLinearVelocity = serializedObject.FindProperty("m_InitialLinearVelocity"); - pInitialAngularVelocity = serializedObject.FindProperty("m_InitialAngularVelocity"); - pGravityFactor = serializedObject.FindProperty("m_GravityFactor"); - pCenterOfMass = serializedObject.FindProperty("m_CenterOfMass"); - pCustomTags = serializedObject.FindProperty("m_CustomTags"); - pFriction = serializedObject.FindProperty("m_Friction"); - pRestitution = serializedObject.FindProperty("m_Restitution"); - pLayer = serializedObject.FindProperty("m_Layer"); - pTigger = serializedObject.FindProperty("m_IsTigger"); - pDoNotAutoCreateAtAwake = serializedObject.FindProperty("m_DoNotAutoCreateAtAwake"); - pAddContactListener = serializedObject.FindProperty("m_AddContactListener"); - pAutoComputeCenterOfMass = serializedObject.FindProperty("m_AutoComputeCenterOfMass"); - pAutoControlActive = serializedObject.FindProperty("m_AutoControlActive"); - pInertiaTensor1 = serializedObject.FindProperty("m_InertiaTensor1"); - pInertiaTensor2 = serializedObject.FindProperty("m_InertiaTensor2"); - pInertiaTensor3 = serializedObject.FindProperty("m_InertiaTensor3"); - pSystemGroupName = serializedObject.FindProperty("m_SystemGroupName"); - pSubSystemId = serializedObject.FindProperty("m_SubSystemId"); - pSubSystemDontCollideWith = serializedObject.FindProperty("m_SubSystemDontCollideWith"); - pCustomLayer = serializedObject.FindProperty("CustomLayer"); - - bOpenCollisionFilterInfo = EditorPrefs.GetBool("PhysicsBodyEditor_bOpenCollisionFilterInfo", false); - bInertiaTensor = EditorPrefs.GetBool("PhysicsBodyEditor_bInertiaTensor", false); - - var names = AssetDatabase.LoadAssetAtPath("Assets/Resources/PhysicsLayerNames.asset"); - var tags = PhysicsLayerTags.Everything; - for(int i = 0; i < 32; i++) - m_LayerNames[i] = i + ": " + (string.IsNullOrEmpty(names.LayerNames[i]) ? "(Undefined layer name)" : names.LayerNames[i]); - m_LayerNames[32] = "Not set"; - m_LayerValues[32] = -1; - } - private void OnDisable() { - EditorPrefs.SetBool("PhysicsBodyEditor_bOpenCollisionFilterInfo", bOpenCollisionFilterInfo); - EditorPrefs.SetBool("PhysicsBodyEditor_bInertiaTensor", bInertiaTensor); - - - } - - private SerializedProperty pMotionType; - private SerializedProperty pCollidableQualityType; - private SerializedProperty pMass; - private SerializedProperty pLinearDamping; - private SerializedProperty pAngularDamping; - private SerializedProperty pInitialLinearVelocity; - private SerializedProperty pInitialAngularVelocity; - private SerializedProperty pInertiaTensor1; - private SerializedProperty pInertiaTensor2; - private SerializedProperty pInertiaTensor3; - private SerializedProperty pGravityFactor; - private SerializedProperty pCenterOfMass; - private SerializedProperty pCustomTags; - private SerializedProperty pFriction; - private SerializedProperty pRestitution; - private SerializedProperty pTigger; - private SerializedProperty pAddContactListener; - private SerializedProperty pDoNotAutoCreateAtAwake; - private SerializedProperty pAutoComputeCenterOfMass; - private SerializedProperty pAutoControlActive; - private SerializedProperty pCustomLayer; - - private SerializedProperty pLayer; - private SerializedProperty pSystemGroupName; - private SerializedProperty pSubSystemId; - private SerializedProperty pSubSystemDontCollideWith; - - private bool bOpenCollisionFilterInfo = false; - private bool bInertiaTensor = false; - - public override void OnInspectorGUI() - { - serializedObject.Update(); - instance = (PhysicsBody)target; - //Update value at runtime - if(EditorApplication.isPlaying) - instance.BackUpRuntimeCanModifieProperties(); - EditorGUI.BeginChangeCheck(); - - EditorGUILayout.PropertyField(pMotionType); - EditorGUILayout.PropertyField(pAutoControlActive); - - if(EditorApplication.isPlaying) - EditorGUILayout.HelpBox("Some values can't change at runtime.", MessageType.Warning); - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(pDoNotAutoCreateAtAwake); - EditorGUILayout.PropertyField(pCollidableQualityType); - EditorGUILayout.PropertyField(pInitialLinearVelocity); - EditorGUILayout.PropertyField(pInitialAngularVelocity); - EditorGUILayout.PropertyField(pCustomTags); - EditorGUILayout.PropertyField(pTigger); - EditorGUILayout.PropertyField(pAddContactListener); - - EditorGUI.EndDisabledGroup(); - - EditorGUILayout.PropertyField(pMass); - EditorGUILayout.PropertyField(pAutoComputeCenterOfMass); - EditorGUILayout.PropertyField(pCenterOfMass); - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - bInertiaTensor = EditorGUILayout.Foldout(bInertiaTensor, "InertiaTensor"); - if(bInertiaTensor) { - pInertiaTensor1.vector3Value = EditorGUILayout.Vector3Field("1", pInertiaTensor1.vector3Value); - pInertiaTensor2.vector3Value = EditorGUILayout.Vector3Field("2", pInertiaTensor2.vector3Value); - pInertiaTensor3.vector3Value = EditorGUILayout.Vector3Field("3", pInertiaTensor3.vector3Value); - } - - EditorGUI.EndDisabledGroup(); - EditorGUILayout.PropertyField(pLinearDamping); - EditorGUILayout.PropertyField(pAngularDamping); - EditorGUILayout.PropertyField(pGravityFactor); - EditorGUILayout.PropertyField(pFriction); - EditorGUILayout.PropertyField(pRestitution); - - bOpenCollisionFilterInfo = EditorGUILayout.Foldout(bOpenCollisionFilterInfo, "CollisionFilterInfo"); - if(bOpenCollisionFilterInfo) { - pLayer.intValue = EditorGUILayout.IntPopup("Layer", pLayer.intValue, m_LayerNames, m_LayerValues); - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(pSystemGroupName); - EditorGUILayout.PropertyField(pSubSystemId); - EditorGUILayout.PropertyField(pSubSystemDontCollideWith); - - EditorGUI.EndDisabledGroup(); - } - - EditorGUILayout.PropertyField(pCustomLayer); - if(EditorApplication.isPlaying) EditorGUILayout.LabelField("Ptr: 0x" + instance.GetPtr().ToString("X")); - - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - - //Update value at runtime - if(EditorApplication.isPlaying) - instance.ApplyModifiedProperties(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs.meta deleted file mode 100644 index d9be2987..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsBodyEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 78d965186f1efd64ab7ced6990babc8e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs deleted file mode 100644 index 55b5f4b1..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs +++ /dev/null @@ -1,67 +0,0 @@ -using PhysicsRT; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(PhysicsConstraint), true)] -[CanEditMultipleObjects] -class PhysicsConstraintEditor : Editor -{ - private PhysicsConstraint instance; - - - public PhysicsConstraintEditor() { - } - - private void OnEnable() { - pBreakable = serializedObject.FindProperty("m_Breakable"); - pThreshold = serializedObject.FindProperty("m_Threshold"); - pMaximumAngularImpulse = serializedObject.FindProperty("m_MaximumAngularImpulse"); - pMaximumLinearImpulse = serializedObject.FindProperty("m_MaximumLinearImpulse"); - pPovitRef = serializedObject.FindProperty("PovitRef"); - } - private void OnDisable() { - - } - - private SerializedProperty pPovitRef; - private SerializedProperty pBreakable; - private SerializedProperty pThreshold; - private SerializedProperty pMaximumAngularImpulse; - private SerializedProperty pMaximumLinearImpulse; - - private bool bBreakableFoldout = false; - - public override void OnInspectorGUI() - { - serializedObject.Update(); - instance = (PhysicsConstraint)target; - - EditorGUI.BeginChangeCheck(); - - if(EditorApplication.isPlaying) - EditorGUILayout.HelpBox("Constraint values can't change at runtime.", MessageType.Warning); - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - DrawDefaultInspector(); - EditorGUI.EndDisabledGroup(); - - bBreakableFoldout = EditorGUILayout.Foldout(bBreakableFoldout, "Breakable"); - if(bBreakableFoldout) { - - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(pBreakable); - EditorGUILayout.PropertyField(pThreshold); - EditorGUILayout.PropertyField(pMaximumAngularImpulse); - EditorGUILayout.PropertyField(pMaximumLinearImpulse); - - EditorGUI.EndDisabledGroup(); - } - - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs.meta deleted file mode 100644 index 86c51f58..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsConstraintEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c185170f2a8578b428553639a805791b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs deleted file mode 100644 index 6855d30c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs +++ /dev/null @@ -1,97 +0,0 @@ -using UnityEditor; -using UnityEditorInternal; -using UnityEngine; - -[CustomEditor(typeof(PhysicsLayerNames))] -[CanEditMultipleObjects] -class PhysicsLayerNamesEditor : BaseEditor -{ -#pragma warning disable 649 - [AutoPopulate(ElementFormatString = "Layer {0}", Resizable = false, Reorderable = false)] - ReorderableList m_LayerNames; -#pragma warning restore 649 - - private bool bGroupFilter = false; - private Vector2 scrollPos = Vector2.zero; - private int textGroupFilterWidth = 150; - private int textGroupFilterHeight = 20; - - private SerializedProperty pGroupFilter; - - protected override void OnEnable() { - base.OnEnable(); - pGroupFilter = serializedObject.FindProperty("m_GroupFilter"); - } - - protected override void DrawCustomGUI() { - - bGroupFilter = EditorGUILayout.Foldout(bGroupFilter, "GroupFilter"); - if(bGroupFilter) { - scrollPos = EditorGUILayout.BeginScrollView(scrollPos, true, true); - - var tagNames = ((PhysicsLayerNames)target).LayerNames; - var rectLeft = new Rect(0, textGroupFilterWidth + 10, textGroupFilterWidth, textGroupFilterHeight); - int showCount = 0; - - var rectTopText = new Rect(0, textGroupFilterWidth + 10, textGroupFilterWidth, textGroupFilterHeight); - var oldMatrix = GUI.matrix; - GUIUtility.RotateAroundPivot(-90, new Vector2(textGroupFilterWidth / 2, textGroupFilterWidth / 2)); - for(int j = 32 - 1; j >= 0; j--) { - - if(string.IsNullOrEmpty(tagNames[j])) - continue; - - GUI.Label(rectTopText, tagNames[j]); - rectTopText.y += textGroupFilterHeight; - showCount++; - } - GUI.matrix = oldMatrix; - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - for(int i = 0, ir = 0; i < 32; i++) { - var arrObj = pGroupFilter.GetArrayElementAtIndex(i); - var arr = arrObj.FindPropertyRelative("m_GroupFilter"); - if(string.IsNullOrEmpty(tagNames[i])) - continue; - - GUI.Label(rectLeft, tagNames[i]); - - var rectTop = new Rect(textGroupFilterWidth + 10, rectLeft.y, textGroupFilterHeight, textGroupFilterHeight); - - for(int j = 0, jr = 0; j < 32 && jr < showCount - ir; j++) { - - if(string.IsNullOrEmpty(tagNames[31 - j])) - continue; - - if(i == 0 || j == 0) { - GUI.Toggle(rectTop, true, ""); - EditorGUI.BeginDisabledGroup(true); - EditorGUI.EndDisabledGroup(); - } else { - var item = arr.GetArrayElementAtIndex(31 - j); - item.boolValue = GUI.Toggle(rectTop, item.boolValue, ""); - } - rectTop.x += textGroupFilterHeight; - jr++; - } - - rectLeft.y += textGroupFilterHeight; - ir++; - } - EditorGUI.EndDisabledGroup(); - - if(EditorApplication.isPlaying) - EditorGUILayout.HelpBox("Can't change GroupFilter at runtime.", MessageType.Warning); - - if(showCount == 0) - EditorGUILayout.HelpBox("You have not set the name of any layer. Please set the layer name first.", MessageType.Info); - else - EditorGUILayout.Space(512); - - EditorGUILayout.EndScrollView(); - } - - - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs.meta deleted file mode 100644 index b62ffcfb..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsLayerNamesEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f59df03d21f15654bab7800854c5f060 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs deleted file mode 100644 index 70c3ce79..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs +++ /dev/null @@ -1,107 +0,0 @@ -using PhysicsRT; -using UnityEditor; - -[CustomEditor(typeof(MotorConstraint), true)] -[CanEditMultipleObjects] -class PhysicsMotorConstraintEditor : Editor -{ - private MotorConstraint instance; - - public PhysicsMotorConstraintEditor() { - } - - private void OnEnable() { - motorEnable = serializedObject.FindProperty("motorEnable"); - motorSpring = serializedObject.FindProperty("motorSpring"); - motorTau = serializedObject.FindProperty("motorTau"); - motorDamping = serializedObject.FindProperty("motorDamping"); - motorProportionalRecoveryVelocity = serializedObject.FindProperty("motorProportionalRecoveryVelocity"); - motorConstantRecoveryVelocity = serializedObject.FindProperty("motorConstantRecoveryVelocity"); - motorMinForce = serializedObject.FindProperty("motorMinForce"); - motorMaxForce = serializedObject.FindProperty("motorMaxForce"); - motorSpringConstant = serializedObject.FindProperty("motorSpringConstant"); - motorSpringDamping = serializedObject.FindProperty("motorSpringDamping"); - - pBreakable = serializedObject.FindProperty("m_Breakable"); - pThreshold = serializedObject.FindProperty("m_Threshold"); - pMaximumAngularImpulse = serializedObject.FindProperty("m_MaximumAngularImpulse"); - pMaximumLinearImpulse = serializedObject.FindProperty("m_MaximumLinearImpulse"); - } - private void OnDisable() { - - } - - private SerializedProperty motorEnable; - private SerializedProperty motorSpring; - private SerializedProperty motorTau; - private SerializedProperty motorDamping; - private SerializedProperty motorProportionalRecoveryVelocity; - private SerializedProperty motorConstantRecoveryVelocity; - private SerializedProperty motorMinForce; - private SerializedProperty motorMaxForce; - private SerializedProperty motorSpringDamping; - private SerializedProperty motorSpringConstant; - - private SerializedProperty pBreakable; - private SerializedProperty pThreshold; - private SerializedProperty pMaximumAngularImpulse; - private SerializedProperty pMaximumLinearImpulse; - - private bool bMotorFoldout = false; - private bool bBreakableFoldout = false; - - public override void OnInspectorGUI() - { - serializedObject.Update(); - instance = (MotorConstraint)target; - - EditorGUI.BeginChangeCheck(); - - if(EditorApplication.isPlaying) - EditorGUILayout.HelpBox("Constraint values can't change at runtime.", MessageType.Warning); - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - DrawDefaultInspector(); - - EditorGUILayout.EditorToolbarForTarget(EditorGUIUtility.TrTempContent("Edit"), base.target); - - EditorGUI.EndDisabledGroup(); - - bBreakableFoldout = EditorGUILayout.Foldout(bBreakableFoldout, "Breakable"); - if(bBreakableFoldout) { - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(pBreakable); - EditorGUILayout.PropertyField(pThreshold); - EditorGUILayout.PropertyField(pMaximumAngularImpulse); - EditorGUILayout.PropertyField(pMaximumLinearImpulse); - - EditorGUI.EndDisabledGroup(); - } - - bMotorFoldout = EditorGUILayout.Foldout(bMotorFoldout, "Motor"); - if(bMotorFoldout) { - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(motorEnable); - EditorGUILayout.PropertyField(motorSpring); - EditorGUILayout.PropertyField(motorTau); - EditorGUILayout.PropertyField(motorDamping); - EditorGUILayout.PropertyField(motorProportionalRecoveryVelocity); - EditorGUILayout.PropertyField(motorConstantRecoveryVelocity); - EditorGUILayout.PropertyField(motorMinForce); - EditorGUILayout.PropertyField(motorMaxForce); - EditorGUILayout.PropertyField(motorSpringDamping); - EditorGUILayout.PropertyField(motorSpringConstant); - - EditorGUI.EndDisabledGroup(); - } - - - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs.meta deleted file mode 100644 index 673ccf03..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsMotorConstraintEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 16b18ce2143621345b8cfab6b5467ce0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs deleted file mode 100644 index 979a1013..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.Collections.Generic; -using PhysicsRT; -using Unity.Mathematics; -using Unity.Physics.Editor; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(PhysicsPhantom))] -[CanEditMultipleObjects] -class PhysicsPhantomEditor : Editor -{ - private PhysicsPhantom instance; - - [NonSerialized] - private string[] m_LayerNames = new string[33]; - [NonSerialized] - private int[] m_LayerValues = new int[33]; - - public PhysicsPhantomEditor() { - for(int i = 0; i < 32; i++) - m_LayerValues[i] = i; - } - - private void OnEnable() { - pType = serializedObject.FindProperty("m_Type"); - pMax = serializedObject.FindProperty("m_Max"); - pMin = serializedObject.FindProperty("m_Min"); - pLayer = serializedObject.FindProperty("m_Layer"); - pDoNotAutoCreateAtAwake = serializedObject.FindProperty("m_DoNotAutoCreateAtAwake"); - pEnableListener = serializedObject.FindProperty("m_EnableListener"); - - var names = AssetDatabase.LoadAssetAtPath("Assets/Resources/PhysicsLayerNames.asset"); - var tags = PhysicsLayerTags.Everything; - for(int i = 0; i < 32; i++) - m_LayerNames[i] = i + ": " + (string.IsNullOrEmpty(names.LayerNames[i]) ? "(Undefined layer name)" : names.LayerNames[i]); - m_LayerNames[32] = "Not set"; - m_LayerValues[32] = -1; - } - private void OnDisable() { - - } - - private SerializedProperty pType; - private SerializedProperty pMax; - private SerializedProperty pMin; - private SerializedProperty pEnableListener; - private SerializedProperty pLayer; - private SerializedProperty pDoNotAutoCreateAtAwake; - - public override void OnInspectorGUI() - { - serializedObject.Update(); - instance = (PhysicsPhantom)target; - //Update value at runtime - if(EditorApplication.isPlaying) - instance.BackUpRuntimeCanModifieProperties(); - EditorGUI.BeginChangeCheck(); - - EditorGUILayout.EditorToolbarForTarget(EditorGUIUtility.TrTempContent("Edit Collider"), base.target); - - EditorGUILayout.PropertyField(pMin); - EditorGUILayout.PropertyField(pMax); - - if(GUILayout.Button("Set by self")) - instance.SetAabbBySelf(); - - if(EditorApplication.isPlaying) - EditorGUILayout.HelpBox("Some values can't change at runtime.", MessageType.Warning); - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying); - - EditorGUILayout.PropertyField(pType); - EditorGUILayout.PropertyField(pDoNotAutoCreateAtAwake); - EditorGUILayout.PropertyField(pEnableListener); - pLayer.intValue = EditorGUILayout.IntPopup("Layer", pLayer.intValue, m_LayerNames, m_LayerValues); - - EditorGUI.EndDisabledGroup(); - - if (EditorGUI.EndChangeCheck()) { - serializedObject.ApplyModifiedProperties(); - //Update value at runtime - if(EditorApplication.isPlaying) - instance.ApplyModifiedProperties(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs.meta deleted file mode 100644 index c3c5e06d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f73f0d713bd813940803a5eafb7a4fe6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs deleted file mode 100644 index a381656c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs +++ /dev/null @@ -1,29 +0,0 @@ -using PhysicsRT; -using Unity.Mathematics; -using UnityEditor; -using UnityEditor.EditorTools; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -[EditorTool("PhysicsPhantomEditorTool", typeof(PhysicsPhantom))] -public class PhysicsPhantomEditorTool : EditorTool -{ - public override GUIContent toolbarIcon => EditorGUIUtility.IconContent("EditCollider"); - - public override void OnToolGUI(EditorWindow window) - { - foreach (Object target in base.targets) - { - PhysicsPhantom val = target as PhysicsPhantom; - if (!((Object)val == (Object)null)) - { - var size2 = val.Max - val.Min; - var oldCenter = val.Min + size2 / 2; - using (new Handles.DrawingScope(Matrix4x4.TRS(val.transform.position, Quaternion.identity, Vector3.one))) - { - Handles.DrawWireCube(oldCenter, size2); - } - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs.meta deleted file mode 100644 index 47073e21..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsPhantomEditorTool.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5ecb84799feef964eabe85be25c45fb4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs deleted file mode 100644 index b4813d59..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs +++ /dev/null @@ -1,348 +0,0 @@ -using System; -using System.Collections.Generic; -using PhysicsRT; -using Unity.Mathematics; -using Unity.Physics.Editor; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(PhysicsShape))] -[CanEditMultipleObjects] -class PhysicsShapeEditor : Editor -{ - private PhysicsShape instance; - private bool instanceMeshChecked = true; - - [NonSerialized] - FitToRenderMeshesDropDown m_DropDown; - - private void OnEnable() { - - bDrawMaterialInspector = EditorPrefs.GetBool("PhysicsShapeEditor_bDrawMaterialInspector", false); - - pShapeType = serializedObject.FindProperty("m_ShapeType"); - pWrap = serializedObject.FindProperty("m_Wrap"); - pTranslation = serializedObject.FindProperty("m_Translation"); - pRotation = serializedObject.FindProperty("m_Rotation"); - pScale = serializedObject.FindProperty("m_Scale"); - pShapeMesh = serializedObject.FindProperty("m_ShapeMesh"); - pShapeSize = serializedObject.FindProperty("m_ShapeSize"); - pShapeRadius = serializedObject.FindProperty("m_ShapeRadius"); - pShapeHeight = serializedObject.FindProperty("m_ShapeHeight"); - pShapeConvexRadius = serializedObject.FindProperty("m_ShapeConvexRadius"); - pShapeSideCount = serializedObject.FindProperty("m_ShapeSideCount"); - pMinimumSkinnedVertexWeight = serializedObject.FindProperty("m_MinimumSkinnedVertexWeight"); - pCustomMaterialTags = serializedObject.FindProperty("m_CustomMaterialTags"); - instanceMeshChecked = false; - } - private void OnDisable() { - EditorPrefs.SetBool("PhysicsShapeEditor_bDrawMaterialInspector", bDrawMaterialInspector); - - if (m_DropDown != null) - m_DropDown.CloseWithoutUndo(); - } - - private bool bDrawMaterialInspector = false; - - private SerializedProperty pShapeType; - private SerializedProperty pWrap; - private SerializedProperty pTranslation; - private SerializedProperty pRotation; - private SerializedProperty pScale; - private SerializedProperty pShapeMesh; - private SerializedProperty pShapeSize; - private SerializedProperty pShapeRadius; - private SerializedProperty pShapeHeight; - private SerializedProperty pShapeConvexRadius; - private SerializedProperty pShapeSideCount; - private SerializedProperty pMinimumSkinnedVertexWeight; - private SerializedProperty pCustomMaterialTags; - private SerializedProperty pLayer; - - private static class Styles - { - const string k_Plural = "One or more selected objects"; - const string k_Singular = "This object"; - - public static readonly GUIStyle Button = new GUIStyle(EditorStyles.miniButton) { padding = new RectOffset() }; - public static readonly GUIStyle ButtonDropDown = new GUIStyle(EditorStyles.popup) { alignment = TextAnchor.MiddleCenter }; - static readonly GUIContent k_FitToRenderMeshesLabel = - EditorGUIUtility.TrTextContent("Fit to Enabled Render Meshes"); - static readonly GUIContent k_FitToRenderMeshesWarningLabelSg = new GUIContent( - k_FitToRenderMeshesLabel.text, - EditorGUIUtility.Load("console.warnicon") as Texture, - L10n.Tr($"{k_Singular} has non-uniform scale. Trying to fit the shape to render meshes might produce unexpected results.") - ); - static readonly GUIContent k_FitToRenderMeshesWarningLabelPl = new GUIContent( - k_FitToRenderMeshesLabel.text, - EditorGUIUtility.Load("console.warnicon") as Texture, - L10n.Tr($"{k_Plural} has non-uniform scale. Trying to fit the shape to render meshes might produce unexpected results.") - ); - - public static GUIContent GetFitToRenderMeshesLabel(int numTargets, MessageType status) => - status >= MessageType.Warning - ? numTargets == 1 ? k_FitToRenderMeshesWarningLabelSg : k_FitToRenderMeshesWarningLabelPl - : k_FitToRenderMeshesLabel; - } - private class FitToRenderMeshesDropDown : EditorWindow - { - static class Styles - { - public const float WindowWidth = 400f; - public const float LabelWidth = 200f; - public static GUIStyle Button => PhysicsShapeEditor.Styles.Button; - } - - static class Content - { - public static readonly string ApplyLabel = L10n.Tr("Apply"); - public static readonly string CancelLabel = L10n.Tr("Cancel"); - } - - bool m_ApplyChanges; - bool m_ClosedWithoutUndo; - int m_UndoGroup; - SerializedProperty m_MinimumSkinnedVertexWeight; - - public static FitToRenderMeshesDropDown Show(Rect buttonRect, string title, SerializedProperty minimumSkinnedVertexWeight) - { - var window = CreateInstance(); - window.titleContent = EditorGUIUtility.TrTextContent(title); - window.m_UndoGroup = Undo.GetCurrentGroup(); - window.m_MinimumSkinnedVertexWeight = minimumSkinnedVertexWeight; - var size = new Vector2( - math.max(buttonRect.width, Styles.WindowWidth), - (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing) * 3f - ); - window.maxSize = window.minSize = size; - window.ShowAsDropDown(GUIUtility.GUIToScreenRect(buttonRect), size); - return window; - } - - void OnGUI() - { - var labelWidth = EditorGUIUtility.labelWidth; - EditorGUIUtility.labelWidth = Styles.LabelWidth; - - EditorGUI.BeginChangeCheck(); - EditorGUILayout.PropertyField(m_MinimumSkinnedVertexWeight); - if (EditorGUI.EndChangeCheck()) - ApplyChanges(); - - EditorGUIUtility.labelWidth = labelWidth; - - GUILayout.FlexibleSpace(); - - var buttonRect = GUILayoutUtility.GetRect(0f, EditorGUIUtility.singleLineHeight); - - var buttonLeft = new Rect(buttonRect) - { - width = 0.5f * (buttonRect.width - EditorGUIUtility.standardVerticalSpacing) - }; - var buttonRight = new Rect(buttonLeft) - { - x = buttonLeft.xMax + EditorGUIUtility.standardVerticalSpacing - }; - - var close = false; - - buttonRect = Application.platform == RuntimePlatform.OSXEditor ? buttonLeft : buttonRight; - if ( - GUI.Button(buttonRect, Content.CancelLabel, Styles.Button) - || Event.current.type == EventType.KeyDown && Event.current.keyCode == KeyCode.Escape - ) - { - close = true; - } - - buttonRect = Application.platform == RuntimePlatform.OSXEditor ? buttonRight : buttonLeft; - if (GUI.Button(buttonRect, Content.ApplyLabel, Styles.Button)) - { - close = true; - m_ApplyChanges = true; - } - - if (close) - { - Close(); - EditorGUIUtility.ExitGUI(); - } - } - - void ApplyChanges() - { - m_MinimumSkinnedVertexWeight.serializedObject.ApplyModifiedProperties(); - Undo.RecordObjects(m_MinimumSkinnedVertexWeight.serializedObject.targetObjects, titleContent.text); - foreach (PhysicsShape shape in m_MinimumSkinnedVertexWeight.serializedObject.targetObjects) - { - using (var so = new SerializedObject(shape)) - { - shape.FitToEnabledRenderMeshes( - so.FindProperty(m_MinimumSkinnedVertexWeight.propertyPath).floatValue - ); - EditorUtility.SetDirty(shape); - } - } - m_MinimumSkinnedVertexWeight.serializedObject.Update(); - } - - public void CloseWithoutUndo() - { - m_ApplyChanges = true; - Close(); - } - - void OnDestroy() - { - if (m_ApplyChanges) - ApplyChanges(); - else - Undo.RevertAllDownToGroup(m_UndoGroup); - } - } - - public override void OnInspectorGUI() - { - UpdateGeometryState(); - - serializedObject.Update(); - - UpdateStatusMessages(); - - instance = (PhysicsShape)target; - - EditorGUI.BeginChangeCheck(); - - serializedObject.Update(); - - if (!instanceMeshChecked) { - foreach(var v in targets) { - var vp = (PhysicsShape)v; - if (vp.ShapeMesh == null) - { - var m = vp.GetComponent(); - if (m != null) vp.ShapeMesh = m.sharedMesh; - } - } - instanceMeshChecked = true; - } - - EditorGUILayout.PropertyField(pShapeType); - DrawShapeInspector(); - EditorGUILayout.PropertyField(pWrap); - DrawWraplInspector(); - - bDrawMaterialInspector = EditorGUILayout.Foldout(bDrawMaterialInspector, "Material", true); - if (bDrawMaterialInspector) - DrawMaterialInspector(); - - if(EditorApplication.isPlaying) EditorGUILayout.LabelField("Ptr: 0x" + instance.GetPtr().ToString("X")); - - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - } - } - - private MessageType m_MatrixStatus; - private List m_MatrixStates = new List(); - - private void UpdateStatusMessages() { - m_MatrixStates.Clear(); - foreach (var t in targets) - { - var localToWorld = (float4x4)(t as Component).transform.localToWorldMatrix; - m_MatrixStates.Add(ManipulatorUtility.GetMatrixState(ref localToWorld)); - } - m_MatrixStatus = StatusMessageUtility.GetMatrixStatusMessage(m_MatrixStates, out var matrixStatusMessage); - } - private void UpdateGeometryState() - { - } - private void AutomaticPrimitiveControls() - { - EditorGUI.BeginDisabledGroup( - ((ShapeType)pShapeType.enumValueIndex >= ShapeType.ConvexHull && pShapeMesh.objectReferenceValue == null) || EditorUtility.IsPersistent(target) - ); - - var buttonLabel = Styles.GetFitToRenderMeshesLabel(targets.Length, m_MatrixStatus); - - var rect = EditorGUI.IndentedRect( - EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight, EditorStyles.miniButton) - ); - - if (GUI.Button(rect, buttonLabel, Styles.ButtonDropDown)) - m_DropDown = FitToRenderMeshesDropDown.Show(rect, buttonLabel.text, pMinimumSkinnedVertexWeight); - - EditorGUI.EndDisabledGroup(); - } - - private void DrawWraplInspector() { - switch((ShapeWrap)pWrap.enumValueIndex) { - case ShapeWrap.None: - break; - case ShapeWrap.TransformShape: - EditorGUILayout.PropertyField(pTranslation); - EditorGUILayout.PropertyField(pRotation); - - var shapeType = (ShapeType)pShapeType.enumValueIndex; - if(shapeType == ShapeType.Box || shapeType == ShapeType.ConvexHull) - EditorGUILayout.PropertyField(pScale); - - break; - case ShapeWrap.TranslateShape: - EditorGUILayout.PropertyField(pTranslation); - break; - } - } - private void DrawShapeInspector() { - - EditorGUILayout.EditorToolbarForTarget(EditorGUIUtility.TrTempContent("Edit Collider"), base.target); - GUILayout.Space(5f); - - switch ((ShapeType)pShapeType.enumValueIndex) - { - case ShapeType.Box: - case ShapeType.Sphere: - case ShapeType.Capsule: - case ShapeType.Cylinder: - case ShapeType.Plane: - AutomaticPrimitiveControls(); - break; - } - - switch((ShapeType)pShapeType.enumValueIndex) { - case ShapeType.Box: - pShapeSize.vector3Value = EditorGUILayout.Vector3Field("Half extent", pShapeSize.vector3Value); - pShapeConvexRadius.floatValue = EditorGUILayout.FloatField("Convex radius", pShapeConvexRadius.floatValue); - break; - case ShapeType.Sphere: - pShapeRadius.floatValue = EditorGUILayout.FloatField("Radius", pShapeRadius.floatValue); - break; - case ShapeType.Capsule: - pShapeHeight.floatValue = EditorGUILayout.FloatField("Height", pShapeHeight.floatValue); - pShapeRadius.floatValue = EditorGUILayout.FloatField("Radius", pShapeRadius.floatValue); - break; - case ShapeType.Cylinder: - pShapeHeight.floatValue = EditorGUILayout.FloatField("Height", pShapeHeight.floatValue); - pShapeRadius.floatValue = EditorGUILayout.FloatField("Radius", pShapeRadius.floatValue); - pShapeConvexRadius.floatValue = EditorGUILayout.FloatField("Convex radius", pShapeConvexRadius.floatValue); - break; - case ShapeType.Plane: - pShapeSize.vector3Value = new Vector3(EditorGUILayout.FloatField("Width", pShapeSize.vector3Value.x), pShapeSize.vector3Value.y, EditorGUILayout.FloatField("Height", pShapeSize.vector3Value.z)); - break; - case ShapeType.List: - pShapeConvexRadius.floatValue = EditorGUILayout.FloatField("Convex radius", pShapeConvexRadius.floatValue); - break; - case ShapeType.ConvexHull: - case ShapeType.Mesh: - case ShapeType.BvCompressedMesh: - pShapeMesh.objectReferenceValue = EditorGUILayout.ObjectField("Mesh", pShapeMesh.objectReferenceValue, typeof(Mesh), false); - pShapeConvexRadius.floatValue = EditorGUILayout.FloatField("Convex radius", pShapeConvexRadius.floatValue); - break; - } - } - private void DrawMaterialInspector() { - EditorGUILayout.PropertyField(pCustomMaterialTags); - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs.meta deleted file mode 100644 index 55215a11..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8cba4f0bfc15055488135ea6b54ccff0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs deleted file mode 100644 index c3390598..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs +++ /dev/null @@ -1,297 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using PhysicsRT; -using Unity.Mathematics; -using Unity.Physics.Editor; -using UnityEditor; -using UnityEditor.EditorTools; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -[EditorTool("PhysicsShapeEditorTool", typeof(PhysicsShape))] -public class PhysicsShapeEditorTool : EditorTool -{ - private static readonly BeveledBoxBoundsHandle s_Box = new BeveledBoxBoundsHandle(); - private static readonly PhysicsCapsuleBoundsHandle s_Capsule = - new PhysicsCapsuleBoundsHandle { heightAxis = CapsuleBoundsHandle.HeightAxis.Z }; - private static readonly BeveledCylinderBoundsHandle s_Cylinder = new BeveledCylinderBoundsHandle(); - private static readonly PhysicsSphereBoundsHandle s_Sphere = new PhysicsSphereBoundsHandle(); - private static readonly BoxBoundsHandle s_Plane = - new BoxBoundsHandle { axes = PrimitiveBoundsHandle.Axes.X | PrimitiveBoundsHandle.Axes.Z }; - - private static readonly Color k_ShapeHandleColor = new Color32(145, 244, 139, 210); - private static readonly Color k_ShapeHandleColorDisabled = new Color32(84, 200, 77, 140); - private int m_DraggingControlID = 0; - - private static readonly string GenericUndoMessage = L10n.Tr("Change Shape"); - - public override GUIContent toolbarIcon - { - get { return EditorGUIUtility.IconContent("EditCollider"); } - } - - public override void OnActivated() - { - base.OnActivated(); - } - public override void OnWillBeDeactivated() - { - base.OnWillBeDeactivated(); - } - public override void OnToolGUI(EditorWindow window) - { - var hotControl = GUIUtility.hotControl; - switch (Event.current.GetTypeForControl(hotControl)) - { - case EventType.MouseDrag: - m_DraggingControlID = hotControl; - break; - case EventType.MouseUp: - m_DraggingControlID = 0; - break; - } - - var shape = target as PhysicsShape; - if(shape == null) - return; - - var sScale = Vector3.Scale(shape.Wrap == ShapeWrap.TransformShape ? shape.ShapeScale : Vector3.one, shape.transform.localScale); - var sOrientation = shape.Wrap == ShapeWrap.TransformShape ? Quaternion.Euler(shape.ShapeRotation) : Quaternion.Euler(shape.ShapeType == ShapeType.Box ? 0 : 90, 0, 0); - var sTranslation = shape.Wrap == ShapeWrap.None ? Vector3.zero : shape.ShapeTranslation; - - var handleColor = shape.enabled ? k_ShapeHandleColor : k_ShapeHandleColorDisabled; - var handleMatrix = new float4x4(MathUtils.DecomposeRigidBodyTransform(shape.transform.localToWorldMatrix)); - using (new Handles.DrawingScope(handleColor, handleMatrix)) - { - switch (shape.ShapeType) - { - case ShapeType.Box: - s_Box.bevelRadius = shape.ShapeConvexRadius; - s_Box.center = sTranslation; - s_Box.size = shape.ShapeSize; - EditorGUI.BeginChangeCheck(); - { - using (new Handles.DrawingScope(math.mul(Handles.matrix, float4x4.TRS(sTranslation, sOrientation, sScale)))) - s_Box.DrawHandle(); - } - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(shape, GenericUndoMessage); - shape.ShapeSize = s_Box.size; - shape.ShapeConvexRadius = s_Box.bevelRadius; - } - break; - case ShapeType.Capsule: - s_Capsule.center = sTranslation; - s_Capsule.height = shape.ShapeHeight; - s_Capsule.radius = shape.ShapeRadius; - EditorGUI.BeginChangeCheck(); - { - using (new Handles.DrawingScope(math.mul(Handles.matrix, float4x4.TRS(sTranslation, sOrientation, sScale)))) - s_Capsule.DrawHandle(); - } - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(shape, GenericUndoMessage); - shape.ShapeHeight = s_Capsule.height; - shape.ShapeRadius = s_Capsule.radius; - } - break; - case ShapeType.Sphere: - s_Sphere.center = sTranslation; - s_Sphere.radius = shape.ShapeRadius; - EditorGUI.BeginChangeCheck(); - { - using (new Handles.DrawingScope(math.mul(Handles.matrix, float4x4.TRS(sTranslation, sOrientation, sScale)))) - s_Sphere.DrawHandle(); - } - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(shape, GenericUndoMessage); - shape.ShapeRadius = s_Sphere.radius; - } - break; - case ShapeType.Cylinder: - s_Cylinder.center = float3.zero; - s_Cylinder.height = shape.ShapeHeight; - s_Cylinder.radius = shape.ShapeRadius; - s_Cylinder.sideCount = shape.ShapeSideCount; - s_Cylinder.bevelRadius = shape.ShapeConvexRadius; - EditorGUI.BeginChangeCheck(); - { - using (new Handles.DrawingScope(math.mul(Handles.matrix, float4x4.TRS(sTranslation, sOrientation, sScale)))) - s_Cylinder.DrawHandle(); - } - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(shape, GenericUndoMessage); - shape.ShapeHeight = s_Cylinder.height; - shape.ShapeRadius = s_Cylinder.radius; - shape.ShapeConvexRadius = s_Cylinder.bevelRadius; - } - break; - case ShapeType.Plane: - { - var size2 = shape.ShapeSize; - s_Plane.center = float3.zero; - s_Plane.size = new float3(size2.x, size2.y, size2.z); - EditorGUI.BeginChangeCheck(); - { - var m = math.mul(shape.transform.localToWorldMatrix, float4x4.TRS(sTranslation, sOrientation, sScale)); - using (new Handles.DrawingScope(m)) - s_Plane.DrawHandle(); - var right = math.mul(m, new float4 { x = 1f }).xyz; - var forward = math.mul(m, new float4 { z = 1f }).xyz; - var normal = math.cross(math.normalizesafe(forward), math.normalizesafe(right)) - * 0.5f * math.lerp(math.length(right) * size2.x, math.length(forward) * size2.y, 0.5f); - - using (new Handles.DrawingScope(float4x4.identity)) - Handles.DrawLine(m.c3.xyz, m.c3.xyz + normal); - } - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(shape, GenericUndoMessage); - shape.ShapeSize = s_Plane.size; - } - break; - } - case ShapeType.ConvexHull: - case ShapeType.BvCompressedMesh: - case ShapeType.Mesh: - { - if (Event.current.type != EventType.Repaint) - break; - var points = GetPreviewData(shape).Edges; - if (points != null && points.Length > 0) - Handles.DrawLines(points); - break; - } - } - } - base.OnToolGUI(window); - } - - public class PreviewMeshData : IDisposable - { - private bool disposedValue; - - protected virtual void Dispose(bool disposing) - { - if (!disposedValue) - { - lastGenerateMesh = null; - m_Edges = null; - disposedValue = true; - } - } - - ~PreviewMeshData() - { - Dispose(disposing: false); - } - - public void Dispose() - { - Dispose(disposing: true); - GC.SuppressFinalize(this); - } - - private Mesh lastGenerateMesh = null; - private float lastGenerateMeshConvexRadius = 0; - private ShapeType lastGenerateMeshShapeType = ShapeType.Box; - private Vector3[] m_Edges = null; - - private void GenerateEdges(Vector3[] vertices, int[] triangles) { - m_Edges = new Vector3[triangles.Length * 2]; - int ie = 0; - for(int i = 0; i < triangles.Length; i += 3) { - m_Edges[ie++] = vertices[triangles[i]]; - m_Edges[ie++] = vertices[triangles[i + 1]]; - m_Edges[ie++] = vertices[triangles[i + 1]]; - m_Edges[ie++] = vertices[triangles[i + 2]]; - m_Edges[ie++] = vertices[triangles[i + 2]]; - m_Edges[ie++] = vertices[triangles[i]]; - } - } - - public void SchedulePreviewIfChanged(PhysicsShape shape) { - if(shape.ShapeMesh != null && (lastGenerateMesh != shape.ShapeMesh || lastGenerateMeshConvexRadius != shape.ShapeConvexRadius || lastGenerateMeshShapeType != shape.ShapeType)) { - lastGenerateMesh = shape.ShapeMesh; - lastGenerateMeshConvexRadius = shape.ShapeConvexRadius; - lastGenerateMeshShapeType = shape.ShapeType; - - if(lastGenerateMeshShapeType == ShapeType.ConvexHull) { - - if(lastGenerateMesh.vertices.Length > 8192) - { - Debug.LogWarning("Mesh vertices too large " + lastGenerateMesh.vertices.Length + " > 8192"); - return; - } - - if(!PhysicsApi.API.InitSuccess) - PhysicsApi.PhysicsApiInit(); - - IntPtr convexHullResultPtr = PhysicsApi.API.Build3DPointsConvexHull(lastGenerateMesh.vertices); - var convexHullResult = Marshal.PtrToStructure(convexHullResultPtr); - - //Read convex hull result vertices - float[] verticesArrResult = new float[convexHullResult.verticesCount * 3]; - Vector3[] verticesVArrResult = new Vector3[convexHullResult.verticesCount]; - int[] trianglesArrResult = new int[convexHullResult.trianglesCount * 3]; - - int bufferSize = Marshal.SizeOf() * verticesArrResult.Length; - IntPtr verticesArrResultBuffer = Marshal.AllocHGlobal(bufferSize); - - PhysicsApi.API.GetConvexHullResultVertices(convexHullResultPtr, verticesArrResultBuffer, convexHullResult.verticesCount); - Marshal.Copy(verticesArrResult, 0, verticesArrResultBuffer, verticesArrResult.Length); - Marshal.FreeHGlobal(verticesArrResultBuffer); - - bufferSize = Marshal.SizeOf() * trianglesArrResult.Length; - IntPtr trianglesArrResultBuffer = Marshal.AllocHGlobal(bufferSize); - - PhysicsApi.API.GetConvexHullResultTriangles(convexHullResultPtr, trianglesArrResultBuffer, convexHullResult.trianglesCount); - Marshal.Copy(trianglesArrResult, 0, trianglesArrResultBuffer, verticesArrResult.Length); - Marshal.FreeHGlobal(trianglesArrResultBuffer); - - //float to Vector3 - for(int i = 0; i < convexHullResult.verticesCount; i++) - verticesVArrResult[i] = new Vector3( - verticesArrResult[i * 3], - verticesArrResult[i * 3 + 1], - verticesArrResult[i * 3 + 2] - ); - - PhysicsApi.API.CommonDelete(convexHullResultPtr); - - //Convert to lines - GenerateEdges(verticesVArrResult, trianglesArrResult); - } else if(lastGenerateMeshShapeType == ShapeType.Mesh || lastGenerateMeshShapeType == ShapeType.BvCompressedMesh) { - GenerateEdges(lastGenerateMesh.vertices, lastGenerateMesh.triangles); - } - } - } - - public Vector3[] Edges => m_Edges; - } - - private Dictionary m_PreviewData = new Dictionary(); - - public PreviewMeshData GetPreviewData(PhysicsShape shape) - { - if (shape.ShapeType != ShapeType.ConvexHull && shape.ShapeType != ShapeType.Mesh && shape.ShapeType != ShapeType.BvCompressedMesh) - return null; - - if (!m_PreviewData.TryGetValue(shape, out var preview)) - { - preview = m_PreviewData[shape] = new PreviewMeshData(); - preview.SchedulePreviewIfChanged(shape); - } - - // do not generate a new preview until the user has finished dragging a control handle (e.g., scale) - if (m_DraggingControlID == 0 && !EditorGUIUtility.editingTextField) - preview.SchedulePreviewIfChanged(shape); - - return preview; - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs.meta deleted file mode 100644 index 2a04d80c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsShapeEditorTool.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cb429e486af81384e9f5c9ce095257a8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs deleted file mode 100644 index 74620fae..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs +++ /dev/null @@ -1,18 +0,0 @@ -using PhysicsRT; -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(PhysicsSpring), true)] -[CanEditMultipleObjects] -class PhysicsSpringEditor : Editor -{ - public PhysicsSpringEditor() { - } - - public override void OnInspectorGUI() - { - DrawDefaultInspector(); - - EditorGUILayout.EditorToolbarForTarget(EditorGUIUtility.TrTempContent("Edit"), base.target); - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs.meta deleted file mode 100644 index 5bcff686..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7ee2a0478436b724b8c7e6d3bd197b07 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs deleted file mode 100644 index 7224a584..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs +++ /dev/null @@ -1,35 +0,0 @@ -using PhysicsRT; -using UnityEditor; -using UnityEditor.EditorTools; -using UnityEditor.IMGUI.Controls; -using UnityEngine; - -[EditorTool("PhysicsSpringEditorTool", typeof(PhysicsSpring))] -public class PhysicsSpringEditorTool : EditorTool -{ - protected static class Styles - { - public static readonly string editAngularLimitsUndoMessage = L10n.Tr("Show povit"); - } - - public override GUIContent toolbarIcon => EditorGUIUtility.IconContent("JointAngularLimits"); - - public override void OnToolGUI(EditorWindow window) - { - foreach (Object target in base.targets) - { - PhysicsSpring val = target as PhysicsSpring; - if (!((Object)val == (Object)null)) - { - EditorGUI.BeginChangeCheck(); - - Handles.color = Color.yellow; - Handles.SphereHandleCap(122, val.PovitA.position, Quaternion.Euler(0,0,0), 0.6f, EventType.Repaint); - Handles.color = Color.red; - Handles.SphereHandleCap(122, val.PovitB.position, Quaternion.Euler(0,0,0), 0.6f, EventType.Repaint); - - if (EditorGUI.EndChangeCheck()) {} - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs.meta deleted file mode 100644 index fffb6cbb..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSpringEditorTool.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 95865eff6b321fb4ab2262ab71b682c1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs deleted file mode 100644 index 28e602f5..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEditor; -using UnityEngine; - -namespace PhysicsRT -{ - [InitializeOnLoad] - public class PhysicsSystemInitEditor - { - static bool firstPlay = false; - - static PhysicsSystemInitEditor() - { - EditorApplication.pauseStateChanged += PauseStateChanged; - EditorApplication.quitting += Quitting; - EditorApplication.wantsToQuit += () => { - PhysicsSystemInit.DoPreDestroy(); - return true; - }; - if(EditorApplication.isPlayingOrWillChangePlaymode) - PauseStateChanged(PauseState.Unpaused); - } - - static void PauseStateChanged(PauseState state) - { - if (firstPlay) - return; - firstPlay = true; - PhysicsSystemInit.DoInit(); - } - static void Quitting() { - PhysicsSystemInit.DoDestroy(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs.meta deleted file mode 100644 index 967d550e..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PhysicsSystemInitEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c5352fdfc07e8af4782a12d05ffa0db4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers.meta deleted file mode 100644 index 80119b30..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c5c5a4925127b146af68705e19b36f5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs deleted file mode 100644 index 7e2994c0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs +++ /dev/null @@ -1,22 +0,0 @@ -using UnityEditor; -using UnityEngine; - -abstract class BaseDrawer : PropertyDrawer -{ - protected abstract bool IsCompatible(SerializedProperty property); - - public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - { - return IsCompatible(property) - ? EditorGUI.GetPropertyHeight(property) - : EditorGUIUtility.singleLineHeight; - } - - public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) - { - if (IsCompatible(property)) - DoGUI(position, property, label); - } - - protected abstract void DoGUI(Rect position, SerializedProperty property, GUIContent label); -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs.meta deleted file mode 100644 index 9a406eb4..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/BaseDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 259c5757af5a441ddb6fce219e7ee22d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs deleted file mode 100644 index e127be97..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using UnityEditor; -using UnityEngine; - -[CustomPropertyDrawer(typeof(EnumFlagsAttribute))] -class EnumFlagsDrawer : BaseDrawer -{ - protected override bool IsCompatible(SerializedProperty property) - { - return property.propertyType == SerializedPropertyType.Enum; - } - - protected override void DoGUI(Rect position, SerializedProperty property, GUIContent label) - { - EditorGUI.BeginProperty(position, label, property); - - var value = property.longValue; - EditorGUI.BeginChangeCheck(); - value = Convert.ToInt64( - EditorGUI.EnumFlagsField(position, label, (Enum)Enum.ToObject(fieldInfo.FieldType, value)) - ); - if (EditorGUI.EndChangeCheck()) - property.longValue = value; - - EditorGUI.EndProperty(); - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs.meta deleted file mode 100644 index 02135f94..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/EnumFlagsDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: feb062e63d134472d97507fdf53a0a03 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs deleted file mode 100644 index 242c1abe..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs +++ /dev/null @@ -1,245 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEngine; - -abstract class TagsDrawer : PropertyDrawer where T : ScriptableObject, ITagNames -{ - static class Styles - { - public static readonly string EverythingName = L10n.Tr("Everything"); - public static readonly string MixedName = L10n.Tr("Mixed..."); - public static readonly string NothingName = L10n.Tr("Nothing"); - - public static readonly string MultipleAssetsTooltip = - L10n.Tr("Multiple {0} assets found. UI will display labels defined in {1}."); - - public static readonly GUIContent MultipleAssetsWarning = - new GUIContent { image = EditorGUIUtility.Load("console.warnicon") as Texture }; - } - - protected abstract int MaxNumCategories { get; } - protected abstract string DefaultCategoryName { get; } - internal string FirstChildPropertyPath { get; set; } - - string DefaultFormatString => L10n.Tr($"(Undefined {DefaultCategoryName})"); - - string[] DefaultOptions => - m_DefaultOptions ?? ( - m_DefaultOptions = - Enumerable.Range(0, MaxNumCategories) - .Select(i => string.Format(DefaultFormatString, i)) - .ToArray() - ); - string[] m_DefaultOptions; - - string[] GetOptions() - { - if (m_Options != null) - return m_Options; - - var guids = AssetDatabase.FindAssets($"t:{typeof(T).Name}"); - m_NamesAssets = guids - .Select(AssetDatabase.GUIDToAssetPath) - .Select(AssetDatabase.LoadAssetAtPath) - .Where(c => c != null) - .ToArray(); - - m_Options = m_NamesAssets.FirstOrDefault()?.TagNames.ToArray() ?? DefaultOptions; - for (var i = 0; i < m_Options.Length; ++i) - { - if (string.IsNullOrEmpty(m_Options[i])) - m_Options[i] = DefaultOptions[i]; - - m_Options[i] = $"{i}: {m_Options[i]}"; - } - - return m_Options; - } - string[] m_Options; - - static string GetButtonLabel(int value, IReadOnlyList optionNames) - { - switch (value) - { - case 0: - return Styles.NothingName; - case ~0: - return Styles.EverythingName; - default: - { - for (var i = 0; i < 32; i++) - { - if (value == 1 << i) - return optionNames[i]; - } - break; - } - } - return Styles.MixedName; - } - - T[] m_NamesAssets; - - SerializedProperty GetFirstChildProperty(SerializedProperty property) - { - if (!string.IsNullOrEmpty(FirstChildPropertyPath)) - return property.FindPropertyRelative(FirstChildPropertyPath); - var sp = property.Copy(); - sp.NextVisible(true); - return sp; - } - - public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) - { - if (m_NamesAssets?.Length > 1) - position.xMax -= EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - - EditorGUI.BeginProperty(position, label, property); - - var controlPosition = EditorGUI.PrefixLabel(position, label); - - var indent = EditorGUI.indentLevel; - EditorGUI.indentLevel = 0; - var showMixed = EditorGUI.showMixedValue; - - var value = 0; - var everything = 0; - var sp = GetFirstChildProperty(property); - for (int i = 0, count = MaxNumCategories; i < count; ++i) - { - EditorGUI.showMixedValue |= sp.hasMultipleDifferentValues; - value |= sp.boolValue ? 1 << i : 0; - everything |= 1 << i; - sp.NextVisible(false); - } - // in case size is smaller than 32 - if (value == everything) - value = ~0; - - var options = GetOptions(); - if ( - EditorGUI.DropdownButton( - controlPosition, - EditorGUIUtility.TrTempContent(GetButtonLabel(value, options)), - FocusType.Passive, - EditorStyles.popup - ) - ) - { - var menu = new GenericMenu(); - - menu.AddItem( - new GUIContent(Styles.NothingName), - value == 0, - () => - { - sp = GetFirstChildProperty(property); - for (int i = 0, count = MaxNumCategories; i < count; ++i) - { - sp.boolValue = false; - sp.NextVisible(false); - } - sp.serializedObject.ApplyModifiedProperties(); - } - ); - - menu.AddItem( - new GUIContent(Styles.EverythingName), - value == ~0, - () => - { - sp = GetFirstChildProperty(property); - for (int i = 0, count = MaxNumCategories; i < count; ++i) - { - sp.boolValue = true; - sp.NextVisible(false); - } - sp.serializedObject.ApplyModifiedProperties(); - } - ); - - for (var option = 0; option < options.Length; ++option) - { - var callbackValue = option; - menu.AddItem( - EditorGUIUtility.TrTextContent(options[option]), - ((1 << option) & value) != 0, - args => - { - var changedBitAndValue = (KeyValuePair)args; - sp = GetFirstChildProperty(property); - for (int i = 0, count = changedBitAndValue.Key; i < count; ++i) - sp.NextVisible(false); - sp.boolValue = changedBitAndValue.Value; - sp.serializedObject.ApplyModifiedProperties(); - }, - new KeyValuePair(callbackValue, ((1 << option) & value) == 0) - ); - } - - menu.AddSeparator(string.Empty); - - menu.AddItem( - EditorGUIUtility.TrTempContent($"Edit {ObjectNames.NicifyVariableName(typeof(T).Name)}"), - false, - () => - { - if (m_NamesAssets.Length > 0) - Selection.activeObject = m_NamesAssets[0]; - else - { - var assetPath = AssetDatabase.GenerateUniqueAssetPath($"Assets/{typeof(T).Name}.asset"); - AssetDatabase.CreateAsset(ScriptableObject.CreateInstance(), assetPath); - Selection.activeObject = AssetDatabase.LoadAssetAtPath(assetPath); - m_Options = null; - } - - } - ); - menu.DropDown(controlPosition); - } - - EditorGUI.showMixedValue = showMixed; - EditorGUI.indentLevel = indent; - - EditorGUI.EndProperty(); - - if (m_NamesAssets?.Length > 1) - { - var id = GUIUtility.GetControlID(FocusType.Passive); - if (Event.current.type == EventType.Repaint) - { - position.width = EditorGUIUtility.singleLineHeight; - position.x = controlPosition.xMax + EditorGUIUtility.standardVerticalSpacing; - Styles.MultipleAssetsWarning.tooltip = string.Format( - Styles.MultipleAssetsTooltip, - ObjectNames.NicifyVariableName(typeof(T).Name), - m_NamesAssets.FirstOrDefault(n => n != null)?.name - ); - GUIStyle.none.Draw(position, Styles.MultipleAssetsWarning, id); - } - } - } -} - -[CustomPropertyDrawer(typeof(CustomPhysicsBodyTags))] -class CustomBodyTagsDrawer : TagsDrawer -{ - protected override string DefaultCategoryName => "Custom Physics Body Tag"; - protected override int MaxNumCategories => 8; -} - -[CustomPropertyDrawer(typeof(CustomPhysicsMaterialTags))] -class CustomMaterialTagsDrawer : TagsDrawer -{ - protected override string DefaultCategoryName => "Custom Physics Material Tag"; - protected override int MaxNumCategories => 8; -} - -[CustomPropertyDrawer(typeof(PhysicsLayerTags))] -class PhysicsLayerTagsDrawer : TagsDrawer -{ - protected override string DefaultCategoryName => "Physics Category"; - protected override int MaxNumCategories => 32; -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs.meta deleted file mode 100644 index f7baf151..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/PropertyDrawers/TagsDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7da5b5fe0a1044383855fa6636355801 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs deleted file mode 100644 index 5c6bcbab..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs +++ /dev/null @@ -1,23 +0,0 @@ -using UnityEditor; -using UnityEngine; - -class StaticEditors : ScriptableObject -{ - - [MenuItem("PhysicsRT/Edit PhysicsBody tag names")] - public static void EditCustomPhysicsBodyTagNames() - { - Selection.activeObject = AssetDatabase.LoadAssetAtPath("Assets/Resources/CustomPhysicsBodyTagNames.asset"); - } - [MenuItem("PhysicsRT/Edit Physics material tag names")] - public static void EditCustomMaterialTagNames() - { - Selection.activeObject = AssetDatabase.LoadAssetAtPath("Assets/Resources/CustomMaterialTagNames.asset"); - } - [MenuItem("PhysicsRT/Edit Physics layer names")] - public static void EditPhysicsLayerNames() - { - Selection.activeObject = AssetDatabase.LoadAssetAtPath("Assets/Resources/PhysicsLayerNames.asset"); - } - -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs.meta deleted file mode 100644 index 8edc70e3..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/StaticEditors.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bfde3bababf3d6d46a01f21e2a6ba200 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Utils.meta deleted file mode 100644 index 93b9998f..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b801c8914d7f0e14090904f74f17426e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs deleted file mode 100644 index 5bfaee99..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using Unity.Mathematics; -using UnityEngine; - -namespace Unity.Physics.Editor -{ - public enum MatrixState - { - UniformScale, - NonUniformScale, - ZeroScale, - NotValidTRS - } - - public static class ManipulatorUtility - { - public static MatrixState GetMatrixState(ref float4x4 localToWorld) - { - if ( - localToWorld.c0.w != 0f - || localToWorld.c1.w != 0f - || localToWorld.c2.w != 0f - || localToWorld.c3.w != 1f - ) - return MatrixState.NotValidTRS; - - var m = new float3x3(localToWorld.c0.xyz, localToWorld.c1.xyz, localToWorld.c2.xyz); - var lossyScale = new float3(math.length(m.c0.xyz), math.length(m.c1.xyz), math.length(m.c2.xyz)); - if (math.determinant(m) < 0f) - lossyScale.x *= -1f; - if (math.lengthsq(lossyScale) == 0f) - return MatrixState.ZeroScale; - return math.abs(math.cmax(lossyScale)) - math.abs(math.cmin(lossyScale)) > 0.000001f - ? MatrixState.NonUniformScale - : MatrixState.UniformScale; - } - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs.meta deleted file mode 100644 index c613aa6c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/ManipulatorUtility.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dec756ba87dbfed4f8e6f28994e6757e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs b/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs deleted file mode 100644 index b8017974..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEngine; -using UnityObject = UnityEngine.Object; -#if LEGACY_PHYSICS -using LegacyRigidBody = UnityEngine.Rigidbody; -#endif - -namespace Unity.Physics.Editor -{ - public static class StatusMessageUtility - { - public static MessageType GetMatrixStatusMessage( - IReadOnlyList matrixStates, out string statusMessage - ) - { - statusMessage = string.Empty; - if (matrixStates.Contains(MatrixState.NotValidTRS)) - { - statusMessage = L10n.Tr( - matrixStates.Count == 1 - ? "Target's local-to-world matrix is not a valid transformation." - : "One or more targets' local-to-world matrices are not valid transformations." - ); - return MessageType.Error; - } - - if (matrixStates.Contains(MatrixState.ZeroScale)) - { - statusMessage = - L10n.Tr(matrixStates.Count == 1 ? "Target has zero scale." : "One or more targets has zero scale."); - return MessageType.Warning; - } - - if (matrixStates.Contains(MatrixState.NonUniformScale)) - { - statusMessage = L10n.Tr( - matrixStates.Count == 1 - ? "Target has non-uniform scale. Shape data will be transformed during conversion in order to bake scale into the run-time format." - : "One or more targets has non-uniform scale. Shape data will be transformed during conversion in order to bake scale into the run-time format." - ); - return MessageType.Warning; - } - - return MessageType.None; - } - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs.meta deleted file mode 100644 index d9e1c784..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Editor/Utils/StatusMessageUtility.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 66a3cc461d4e57b47af007043a8f1ee2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs deleted file mode 100644 index 9e8ec0af..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using Ballance2.Utils; -using UnityEngine; - -namespace PhysicsRT -{ - public static class PhysicsApi - { - #region 基础定义 - -#if UNITY_EDITOR - private const string DLL_NNAME = "Physics_RTd"; -#elif UNITY_IPHONE - private const string DLL_NNAME = "_Internal"; -#else - private const string DLL_NNAME = "Physics_RT"; -#endif - - private const CallingConvention _CallingConvention = CallingConvention.Cdecl; - - public delegate void ErrorReportCallback([MarshalAs(UnmanagedType.LPStr)] string msg); - public delegate void InitFinishCallback(); - - [DllImport(DLL_NNAME, CallingConvention = _CallingConvention)] - private static extern IntPtr init(IntPtr pInitStruct); - [DllImport(DLL_NNAME, CallingConvention = _CallingConvention)] - private static extern bool quit(); - [DllImport(DLL_NNAME, CallingConvention = _CallingConvention)] - public static extern int isInitSuccess(); - ///errBuffer: char* - ///size: size_t->unsigned int - [DllImport(DLL_NNAME, CallingConvention = _CallingConvention)] - public static extern int checkException(IntPtr errBuffer, [MarshalAs(UnmanagedType.SysUInt)] uint size); - - public static string checkException() { - if(checkException(assertMsgBuffer, 1024) > 0) - return Marshal.PtrToStringAnsi(assertMsgBuffer); - return null; - } - - private static void ErrorReport(string msg) { - if(msg.Contains("Report")) - Log.D("Physics", msg); - else if(msg.Contains("Warn") || msg.Contains("WARN")) - Log.W("Physics", msg); - else - Log.E("Physics", msg); - } - - private static IntPtr assertMsgBuffer = IntPtr.Zero; - - #endregion - - #region API定义 - - public static InitFinishCallback InitFinish; - - /// - /// 释放 - /// - public static void PhysicsApiDestroy() { - if(assertMsgBuffer != IntPtr.Zero) { - Marshal.FreeHGlobal(assertMsgBuffer); - assertMsgBuffer = IntPtr.Zero; - } - if(isInitSuccess() > 0) - quit(); - } - /// - /// 初始化 - /// - public static void PhysicsApiInit() { - //初始化 - sInitStruct intStruct = new sInitStruct(); - intStruct.mulithread = PhysicsOptions.Instance.EnableMultithreaded; - intStruct.smallPoolSize = PhysicsOptions.Instance.SmallPoolSize; - ErrorReportCallback callback = ErrorReport; - intStruct.errCallback = Marshal.GetFunctionPointerForDelegate(callback); - - //拷贝结构体至托管内存 - int nSizeOfPerson = Marshal.SizeOf(intStruct); - IntPtr intStructPtr = Marshal.AllocHGlobal(nSizeOfPerson); - Marshal.StructureToPtr(intStruct, intStructPtr, false); - - //调用初始化 - IntPtr apiStructPtr = init(intStructPtr); - - Marshal.FreeHGlobal(intStructPtr); - - //获取所有函数指针 - API.initAll(apiStructPtr, 256); - - if(assertMsgBuffer == IntPtr.Zero) - assertMsgBuffer = Marshal.AllocHGlobal(1024); - - if(InitFinish != null) - InitFinish.Invoke(); - } - /// - /// 所有的API - /// - /// - public static ApiStruct API { get; } = new ApiStruct(); - - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs.meta deleted file mode 100644 index 85ab3f4d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsApi.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 432fbee05702ec84cabeb5e352454ea5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs deleted file mode 100644 index 9d3d443c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Ballance2.Sys.Utils; -using UnityEngine; - -namespace PhysicsRT -{ - public class PhysicsApiSideInit : MonoBehaviour { - - [RuntimeInitializeOnLoadMethod] - static void OnRuntimeMethodLoad() - { - var go = new GameObject("PhysicsSystem"); - go.AddComponent(); - } - - private void Start() { - PhysicsApi.InitFinish += () => { -#if UNITY_STANDALONE_WIN - PhysicsApi.API.SetName("666dccad4ae697b45aac145f18f49c5b"); -#elif UNITY_STANDALONE_OSX - PhysicsApi.API.SetName("39b98d635a1f2982ddab472cc6292bf8"); -#elif UNITY_STANDALONE_LINUX - Debug.LogError("The physical engine does not support this platform"); -#elif UNITY_ANDROID - PhysicsApi.API.SetName("f34560c0d2fa8d7a3d0a796fe78ac546"); -#elif UNITY_IPHONE - PhysicsApi.API.SetName("db70f6336ab7924836d9cca01d7ed919"); -#else - Debug.LogError("The physical engine does not support this platform"); -#endif - }; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs.meta deleted file mode 100644 index d25eb7a0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsApiSideInit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4ca8783a0f618fa4caefc14840e8ca48 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs deleted file mode 100644 index 50d3e543..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs +++ /dev/null @@ -1,947 +0,0 @@ - -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace PhysicsRT -{ - [SLua.CustomLuaClass] - public enum MotionType { - /// - /// A fully-simulated, movable rigid body. At construction time the engine checks - /// the input inertia and selects MOTION_SPHERE_INERTIA or MOTION_BOX_INERTIA as - /// appropriate. - /// - Dynamic, - /// - /// Simulation is performed using a sphere inertia tensor. (A multiple of the - /// Identity matrix). The highest value of the diagonal of the rigid body's - /// inertia tensor is used as the spherical inertia. - /// - SphereInertia, - /// - /// Simulation is performed using a box inertia tensor. The non-diagonal elements - /// of the inertia tensor are set to zero. This is slower than the - /// MOTION_SPHERE_INERTIA motions, however it can produce more accurate results, - /// especially for long thin objects. - /// - BoxInertia, - /// - /// Simulation is not performed as a normal rigid body. During a simulation step, - /// the velocity of the rigid body is used to calculate the new position of the - /// rigid body, however the velocity is NOT updated. The user can keyframe a rigid - /// body by setting the velocity of the rigid body to produce the desired keyframe - /// positions. The hkpKeyFrameUtility class can be used to simply apply keyframes - /// in this way. The velocity of a keyframed rigid body is NOT changed by the - /// application of impulses or forces. The keyframed rigid body has an infinite - /// mass when viewed by the rest of the system. - /// - Keyframed, - /// - /// This motion type is used for the static elements of a game scene, e.g., the - /// landscape. Fixed rigid bodies are treated in a special way by the system. They - /// have the same effect as a rigid body with a motion of type MOTION_KEYFRAMED - /// and velocity 0, however they are much faster to use, incurring no simulation - /// overhead, except in collision with moving bodies. - /// - Fixed, - - /// - /// A box inertia motion which is optimized for thin boxes and has less stability problems - /// - ThinBoxInertia, - /// - /// A specialized motion used for character controllers - /// - Character, - } - [SLua.CustomLuaClass] - public enum CollidableQualityType - { - Default = -1, - /// Use this for fixed bodies. - Fixed = 0, - /// Use this for moving objects with infinite mass. - Keyframed, - /// Use this for all your debris objects. - Debris, - /// Use this for debris objects that should have simplified TOI collisions with fixed/landscape objects. - DebrisSimpleTOI, - /// Use this for moving bodies, which should not leave the world, - /// but you rather prefer those objects to tunnel through the world than - /// dropping frames because the engine . - Moving, - /// Use this for all objects, which you cannot afford to tunnel through - /// the world at all. - Critical, - /// Use this for very fast objects. - Bullet, - /// For user. If you want to use this, you have to modify hkpCollisionDispatcher::initCollisionQualityInfo() - User, - /// Use this for rigid body character controllers. - Character, - /// Use this for moving objects with infinite mass which should report contact points and TOI-collisions against all other bodies, including other fixed and keyframed bodies. - /// - /// Note that only non-TOI contact points are reported in collisions against debris-quality objects. - KeyframedReporting, - }; - - [AddComponentMenu("PhysicsRT/Physics Body")] - [DefaultExecutionOrder(250)] - [DisallowMultipleComponent] - [RequireComponent(typeof(PhysicsShape))] - [SLua.CustomLuaClass] - public class PhysicsBody : MonoBehaviour - { - const float MinimumMass = 0.001f; - - private int Convert(MotionType m) { - switch(m) { - case MotionType.Dynamic: return 1; - case MotionType.SphereInertia: return 2; - case MotionType.BoxInertia: return 3; - case MotionType.Keyframed: return 4; - case MotionType.Fixed: return 5; - case MotionType.ThinBoxInertia: return 6; - case MotionType.Character: return 7; - } - return 0; - } - - [SerializeField] - private MotionType m_MotionType = MotionType.Fixed; - [SerializeField] - [Tooltip("The quality type, used to specify when to use continuous physics.")] - private CollidableQualityType m_CollidableQualityType = CollidableQualityType.Default; - [SerializeField] - private float m_Mass = 1.0f; - [SerializeField] - [Tooltip("这适用于物体的线速度，随时间减小。")] - private float m_LinearDamping = 0.0f; - [SerializeField] - [Tooltip("这适用于物体的角速度，随时间减小角速度。")] - private float m_AngularDamping = 0.05f; - [SerializeField] - [Tooltip("物体在世界空间中的初始线速度")] - private Vector3 m_InitialLinearVelocity = Vector3.zero; - [SerializeField] - [Tooltip("这表示在身体的局部运动空间（即围绕质心）中围绕每个轴的初始旋转速度")] - private Vector3 m_InitialAngularVelocity = Vector3.zero; - [SerializeField] - [Tooltip("此实体的重力量缩放系数。")] - private float m_GravityFactor = 1f; - [SerializeField] - private Vector3 m_CenterOfMass; - [SerializeField] - private CustomPhysicsBodyTags m_CustomTags = CustomPhysicsBodyTags.Nothing; - [SerializeField] - [Tooltip("使用此值可以指定刚体的初始摩擦力值。实体的“摩擦力”值指示其表面有多光滑，从而指示它沿其他实体滑动的容易程度。一般摩擦力值的范围在0和1之间，但可以更高（最大值为255）。默认值为0.5。")] - private float m_Friction = 0.5f; - [Range(0, 1.99f)] - [Tooltip("这表明物体有多“弹性”——换句话说，物体与物体碰撞后有多少能量。值为1表示对象在碰撞后恢复其所有能量，值为0表示对象将完全停止移动。默认值为0.4。恢复的实现只是一个粗略的近似值，因此您可能希望在游戏中使用不同的值进行实验，以获得所需的效果。")] - [SerializeField] - private float m_Restitution = 0.4f; - [SerializeField] - private int m_Layer = -1; - [SerializeField] - private Vector3 m_InertiaTensor1 = new Vector3(1,0,0); - [SerializeField] - private Vector3 m_InertiaTensor2 = new Vector3(0,1,0); - [SerializeField] - private Vector3 m_InertiaTensor3 = new Vector3(0,0,1); - [SerializeField] - [Tooltip("The maximum angular velocity of the body (in rad/s).")] - private float m_MaxAngularVelocity = 200; - [SerializeField] - [Tooltip("The maximum linear velocity of the body (in m/s).")] - private float m_MaxLinearVelocity = 200; - [SerializeField] - [Tooltip("Is this body is Tigger ?")] - private bool m_IsTigger = false; - [Tooltip("是否添加ContactListener，只有添加了ContactListener才可使用OnCollision事件")] - [SerializeField] - private bool m_AddContactListener = false; - [Tooltip("在 Awake 时不自动创建刚体，设置为 false 后您需要手动调用 ForceReCreateShape 来创建刚体")] - [SerializeField] - private bool m_DoNotAutoCreateAtAwake = false; - [Tooltip("自动计算 CenterOfMass ")] - [SerializeField] - private bool m_AutoComputeCenterOfMass = true; - [Tooltip("是否在gameObject激活时自动切换刚体的激活状态")] - [SerializeField] - private bool m_AutoControlActive = true; - [Tooltip("指定当前碰撞组的名称，为空则不设置。创建之后再修改则必须调用 ForceUpdateCollisionFilterInfo 才能生效")] - [SerializeField] - private string m_SystemGroupName = ""; - [Tooltip("指定当前碰撞子组的ID，同一个碰撞组中子组的ID不能重复，默认为0。创建之后再修改则必须调用 ForceUpdateCollisionFilterInfo 才能生效")] - [SerializeField] - private int m_SubSystemId = 0; - [Tooltip("指定当前碰撞组不与那个子组碰撞，默认为0。创建之后再修改则必须调用 ForceUpdateCollisionFilterInfo 才能生效")] - [SerializeField] - private int m_SubSystemDontCollideWith = 0; - [Tooltip("指定是否在离开世界边界时隐藏GameObject")] - public bool DeactiveWhenLeaveBroadphase = true; - - public object CustomData = null; - public int CustomLayer = 0; - - private IntPtr ptr = IntPtr.Zero; - - public string SystemGroupName { get => m_SystemGroupName; set { m_SystemGroupName = value; } } - public int SubSystemId { get => m_SubSystemId; set { m_SubSystemId = value; } } - public int SubSystemDontCollideWith { get => m_SubSystemDontCollideWith; set { m_SubSystemDontCollideWith = value; } } - - /// - /// 是否在gameObject激活时自动切换刚体的激活状态 - /// - public bool AutoControlActive { get => m_AutoControlActive; set { m_AutoControlActive = value; } } - /// - /// 在 Awake 时不自动创建刚体，设置为 false 后您需要手动调用 ForceReCreateShape 来创建刚体 - /// - public bool DoNotAutoCreateAtAwake { get => m_DoNotAutoCreateAtAwake; set { m_DoNotAutoCreateAtAwake = value; } } - /// - /// 自动计算CenterOfMass（创建刚体后设置无效） - /// - public bool AutoComputeCenterOfMass { get => m_AutoComputeCenterOfMass; set { m_AutoComputeCenterOfMass = value; } } - /// - /// 获取或设置刚体碰撞层 - /// - public int Layer { - get => m_Layer; - set { - if(m_Layer != value) { - m_Layer = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyLayer(ptr, m_Layer); - } - } - } - /// - /// 获取或设置刚体的类型 - /// - public MotionType MotionType { - get => m_MotionType; - set { - if(m_MotionType != value) { - m_MotionType = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyMotionType(ptr, (int)Convert(m_MotionType)); - } - } - } - /// - /// 获取或设置刚体的碰撞质量（该值在创建刚体之后不能更改） - /// - public CollidableQualityType CollidableQualityType { - get => m_CollidableQualityType; - set => m_CollidableQualityType = value; - } - /// - /// 获取或设置刚体的初始初始旋转速度（该值在创建刚体之后不能更改） - /// - public Vector3 InitialAngularVelocity - { - get => m_InitialAngularVelocity; - set => m_InitialAngularVelocity = value; - } - /// - /// 获取或设置刚体的初始线速度（该值在创建刚体之后不能更改） - /// - public Vector3 InitialLinearVelocity - { - get => m_InitialLinearVelocity; - set => m_InitialLinearVelocity = value; - } - /// - /// 获取或设置刚体的质量 - /// - public float Mass { - get => m_Mass; - set { - if(m_Mass != value) { - m_Mass = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyMass(ptr, value); - } - } - } - /// - /// 获取或设置刚体的自定义标签 - /// - public CustomPhysicsBodyTags CustomTags { get => m_CustomTags; set { m_CustomTags = value; } } - /// - /// 获取或设置刚体是否是触发器，触发器才可以接受碰撞事件（创建刚体后设置无效） - /// - public bool IsTigger { get => m_IsTigger; set { m_IsTigger = value; } } - /// - /// 是否添加ContactListener，只有添加了ContactListener才可使用OnCollision事件（创建刚体后设置无效） - /// - public bool AddContactListener { - get => m_AddContactListener; - set { - if(ptr != IntPtr.Zero) - throw new Exception("Body is created, do not modify this after creation"); - m_AddContactListener = value; - } - } - /// - /// 获取或设置刚体的质心 - /// - public Vector3 CenterOfMass { - get => m_CenterOfMass; - set { - if(m_CenterOfMass != value) { - m_CenterOfMass = value; - if(ptr != IntPtr.Zero) { - PhysicsApi.API.SetRigidBodyCenterOfMass(ptr, value); - } - } - } - } - - private Matrix4x4 retInertiaTensor = Matrix4x4.identity; - - /// - /// 获取或设置刚体的惯性张量 - /// - public Matrix4x4 InertiaTensor { - get { - retInertiaTensor.SetRow(0, m_InertiaTensor1); - retInertiaTensor.SetRow(1, m_InertiaTensor2); - retInertiaTensor.SetRow(2, m_InertiaTensor3); - return retInertiaTensor; - } - set { - m_InertiaTensor1 = value.GetRow(0); - m_InertiaTensor2 = value.GetRow(1); - m_InertiaTensor3 = value.GetRow(2); - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyInertiaTensor(ptr, value); - } - } - /// - /// 获取或设置刚体的重力系数 - /// - public float GravityFactor { - get => m_GravityFactor; - set { - if(m_GravityFactor != value) { - m_GravityFactor = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyGravityFactor(ptr, m_GravityFactor); - } - } - } - /// - /// 获取或设置刚体的线速度 - /// - public float LinearDamping { - get => m_LinearDamping; - set { - if(m_LinearDamping != value) { - m_LinearDamping = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyLinearDampin(ptr, m_LinearDamping); - } - } - } - /// - /// 获取或设置刚体的角速度 - /// - public float AngularDamping { - get => m_AngularDamping; - set { - if(m_AngularDamping != value) { - m_AngularDamping = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyAngularDamping(ptr, m_AngularDamping); - } - } - } - /// - /// 获取或设置刚体的摩擦力 - /// - public float Friction { - get => m_Friction; - set { - if(m_Friction != value) { - m_Friction = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyFriction(ptr, m_Friction); - } - } - } - /// - /// 获取或设置刚体的弹力 - /// - public float Restitution { - get => m_Restitution; - set { - if(m_Restitution != value) { - m_Restitution = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyRestitution(ptr, m_Restitution); - } - } - } - /// - /// ID - /// - /// - public int Id { get; private set; } - - [SLua.DoNotToLua] - public PhysicsBody prev { get; set; } - [SLua.DoNotToLua] - public PhysicsBody next { get; set; } - - /// - /// 重新创建物理刚体，这将导致当前物理状态丢失 - /// - public void ForceReCreateShape() - { - nextCreateForce = true; - DestroyBody(); - CreateBody(); - } - - private void Awake() { - CurrentPhysicsWorld = PhysicsWorld.GetCurrentScensePhysicsWorld(); - StartCoroutine(LateCreate()); - } - private void OnDestroy() { - if(ptr != IntPtr.Zero) - DestroyBody(); - } - private IEnumerator LateCreate() { - yield return new WaitForSeconds(0.05f); - if(!m_DoNotAutoCreateAtAwake) - CreateBody(); - } - - /// - /// 强制激活刚体 - /// - public void ForceActive() { - if(ptr != IntPtr.Zero) - PhysicsApi.API.ActiveRigidBody(ptr); - } - /// - /// 强制设置刚体非激活态（不设置GameObject） - /// - public void ForceDeactive() { - if(ptr != IntPtr.Zero) - PhysicsApi.API.DeactiveRigidBody(ptr); - } - /// - /// 强制从物理世界中创建刚体 - /// - public void ForcePhysics() { - if(ptr == IntPtr.Zero) - CreateBody(); - } - /// - /// 强制从物理世界中移除刚体 - /// - public void ForceDePhysics() { - if(ptr != IntPtr.Zero) - DestroyBody(false); - } - /// - /// 检查当前刚体是否创建 - /// - /// - public bool IsPhysicsed() { - return (ptr != IntPtr.Zero); - } - /// - /// 强制更新刚体的碰撞信息 - /// - public void ForceUpdateCollisionFilterInfo() { - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyCollisionFilterInfo( - ptr, - m_Layer, - CurrentPhysicsWorld.GetSystemGroup(m_SystemGroupName), - m_SubSystemId, - m_SubSystemDontCollideWith); - } - - private void OnEnable() - { - if(m_AutoControlActive) ForceActive(); - } - private void OnDisable() - { - if(m_AutoControlActive) ForceDeactive(); - } - private void OnValidate() - { - Mass = Mathf.Max(MinimumMass, Mass); - m_LinearDamping = Mathf.Max(m_LinearDamping, 0f); - m_AngularDamping = Mathf.Max(m_AngularDamping, 0f); - } - - private PhysicsWorld CurrentPhysicsWorld = null; - private IntPtr currentShapeMassProperties = IntPtr.Zero; - private IntPtr shapeBodyPtr = IntPtr.Zero; - private bool nextCreateForce = false; - - public IntPtr GetPtr() { return ptr; } - private IntPtr GetShapeBody() { - if(shapeBodyPtr == IntPtr.Zero) { - var shape = GetComponent(); - if(shape == null) - { - Debug.LogWarning("Not found PhysicsShape on this gameObject, physical function has been disabled."); - return IntPtr.Zero; - } - - shapeBodyPtr = shape.GetShapeBody(nextCreateForce, m_Layer); - currentShapeMassProperties = shape.ComputeMassProperties(m_Mass); - } - return shapeBodyPtr; - } - private void ReleaseShapeBody() { - var shape = GetComponent(); - if(shape != null) - shape.ReleaseShapeBody(); - shapeBodyPtr = IntPtr.Zero; - } - private void CreateBody() { - if(ptr != IntPtr.Zero) { - return; - } - if(CurrentPhysicsWorld == null) { - Debug.LogWarning("Not found PhysicsWorld in this scense, please add it before use PhysicsBody."); - return; - } - - ptr = PhysicsApi.API.CreateRigidBody( - CurrentPhysicsWorld.GetPtr(), - GetShapeBody(), - transform.position, - transform.rotation, - gameObject.name, - Convert(m_MotionType), - (int)m_CollidableQualityType, - m_Friction, - m_Restitution, - m_Mass, - PhysicsApi.API.BoolToInt(gameObject.activeSelf), - m_Layer, - CurrentPhysicsWorld.GetSystemGroup(m_SystemGroupName), - m_SubSystemId, - m_SubSystemDontCollideWith, - m_IsTigger, - m_AddContactListener, - m_GravityFactor, - m_LinearDamping, - m_AngularDamping, - m_CenterOfMass, - InertiaTensor, - m_InitialLinearVelocity, - m_InitialAngularVelocity, - m_MaxLinearVelocity, - m_MaxAngularVelocity, - currentShapeMassProperties, - m_AutoComputeCenterOfMass); - - - Id = PhysicsApi.API.GetRigidBodyId(ptr); - CurrentPhysicsWorld.AddBody(Id, this); - - TryCreateConstant(); - TryCreateSpring(); - - nextCreateForce = false; - } - private void DestroyBody(bool destroyShape = true) { - if(CurrentPhysicsWorld == null || ptr == IntPtr.Zero) - return; - - if(currentShapeMassProperties != IntPtr.Zero) - { - PhysicsApi.API.CommonDelete(currentShapeMassProperties); - currentShapeMassProperties = IntPtr.Zero; - } - - TryDestroyConstant(); - TryDestroySpring(); - - if(destroyShape) - ReleaseShapeBody(); - - CurrentPhysicsWorld.RemoveBody(this); - PhysicsApi.API.DestroyRigidBody(ptr); - ptr = IntPtr.Zero; - } - - //创建当前刚体的约束 - private void TryCreateConstant() { - var constants = GetComponents(); - for(int i = 0; i < constants.Length; i++) - constants[i].TryCreate(); - foreach(PhysicsConstraint c in pendingCreateConstant) - c.TryCreate(); - pendingCreateConstant.Clear(); - } - private void TryDestroyConstant() { - var constants = GetComponents(); - for(int i = 0; i < constants.Length; i++) - constants[i].Destroy(); - } - - private void TryCreateSpring() { - var springs = GetComponents(); - for(int i = 0; i < springs.Length; i++) - if(!springs[i].DoNotAutoCreateAtAwake) - springs[i].TryCreate(); - foreach(var c in pendingCreateSpring) - c.TryCreate(); - pendingCreateSpring.Clear(); - } - private void TryDestroySpring() { - var constants = GetComponents(); - for(int i = 0; i < constants.Length; i++) - constants[i].Destroy(); - } - - private List pendingCreateConstant = new List(); - private List pendingCreateSpring = new List(); - internal void AddPendingCreateSpring(PhysicsSpring c) { pendingCreateSpring.Add(c); } - internal void AddPendingCreateConstant(PhysicsConstraint c) { pendingCreateConstant.Add(c); } - - private MotionType oldMotionType = MotionType.Fixed; - private float oldMass = 0; - private float oldLinearDamping = 0; - private float oldAngularDamping = 0; - private float oldGravityFactor = 0; - private Vector3 oldCenterOfMass = Vector3.zero; - private float oldFriction = 0; - private float oldRestitution = 0; - private int oldLayer = 0; - private Vector3 oldPosition = Vector3.zero; - private Quaternion oldRotation = Quaternion.identity; - - [SLua.DoNotToLua] - public void BackUpRuntimeCanModifieProperties() { - oldMotionType = m_MotionType; - oldMass = m_Mass; - oldLinearDamping = m_LinearDamping; - oldAngularDamping = m_AngularDamping; - oldGravityFactor = m_GravityFactor; - oldCenterOfMass = m_CenterOfMass; - oldFriction = m_Friction; - oldRestitution = m_Restitution; - oldLayer = m_Layer; - oldPosition = transform.position; - oldRotation = transform.rotation; - } - [SLua.DoNotToLua] - public void ApplyModifiedProperties() { - if(oldMotionType != m_MotionType) { - var newVal = m_MotionType; m_MotionType = oldMotionType; - MotionType = newVal; - } - if(oldMass != m_Mass) { - var newVal = m_Mass; m_Mass = oldMass; - Mass = newVal; - } - if(oldLinearDamping != m_LinearDamping) { - var newVal = m_LinearDamping; m_LinearDamping = oldLinearDamping; - LinearDamping = newVal; - } - if(oldAngularDamping != m_AngularDamping) { - var newVal = m_AngularDamping; m_AngularDamping = oldAngularDamping; - AngularDamping = newVal; - } - if(oldGravityFactor != m_GravityFactor) { - var newVal = m_GravityFactor; m_GravityFactor = oldGravityFactor; - GravityFactor = newVal; - } - if(oldCenterOfMass != m_CenterOfMass) { - var newVal = m_CenterOfMass; m_CenterOfMass = oldCenterOfMass; - CenterOfMass = newVal; - } - if(oldFriction != m_Friction) { - var newVal = m_Friction; m_Friction = oldFriction; - Friction = newVal; - } - if(oldRestitution != m_Restitution) { - var newVal = m_Restitution; m_Restitution = oldRestitution; - Restitution = newVal; - } - if(oldLayer != m_Layer) { - var newVal = m_Layer; m_Layer = oldLayer; - Layer = newVal; - } - if(oldRotation != transform.rotation) - UpdateTransformToPhysicsEngine(); - else if(oldPosition != transform.position) - UpdatePositionToPhysicsEngine(); - } - - /// - /// 同步位置和旋转至物理引擎 - /// - public void UpdateTransformToPhysicsEngine() { - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyPositionAndRotation(ptr, transform.position, transform.rotation); - } - /// - /// 同步位置 - /// - public void UpdatePositionToPhysicsEngine() { - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyPosition(ptr, transform.position); - } - - /// - /// The velocity of the rigidbody at the point worldPoint in global space. - /// - /// - /// - public Vector3 GetPointVelocity(Vector3 worldPoint) { - if(ptr == IntPtr.Zero) throw new PhysicsBodyNotCreateException(); - - PhysicsApi.API.GetRigidBodyPointVelocity(ptr, worldPoint, out var v); - return v; - } - /// - /// The velocity relative to the rigidbody at the point relativePoint. - /// - /// - /// - public Vector3 GetRelativePointVelocity(Vector3 relativePoint) { - return GetPointVelocity(transform.position + relativePoint); - } - /// - /// 获取或设置刚体角速度 - /// - /// - public Vector3 AngularVelocity { - get { - if(ptr == IntPtr.Zero) - return InitialAngularVelocity; - else { - PhysicsApi.API.GetRigidBodyAngularVelocity(ptr, out var v); - return v; - } - } - set { - if(ptr == IntPtr.Zero) throw new PhysicsBodyNotCreateException(); - PhysicsApi.API.SetRigidBodyAngularVelocity(ptr, value); - } - } - /// - /// 获取或设置刚体线速度 - /// - /// - public Vector3 LinearVelocity { - get { - if(ptr == IntPtr.Zero) - return InitialLinearVelocity; - else { - PhysicsApi.API.GetRigidBodyLinearVelocity(ptr, out var v); - return v; - } - } - set { - if(ptr == IntPtr.Zero) throw new PhysicsBodyNotCreateException(); - PhysicsApi.API.SetRigidBodyLinearVelocity(ptr, value); - } - } - /// - /// The maximum angular velocity of the body (in rad/s). - /// - /// - public float MaxAngularVelocity { - get => m_MaxAngularVelocity; - set { - if(ptr == IntPtr.Zero) throw new PhysicsBodyNotCreateException(); - m_MaxAngularVelocity = value; - PhysicsApi.API.SetRigidBodyMaxAngularVelocity(ptr, value); - } - } - /// - /// The maximum linear velocity of the body (in rad/s). - /// - /// - public float MaxLinearVelocity { - get => m_MaxLinearVelocity; - set { - if(ptr == IntPtr.Zero) throw new PhysicsBodyNotCreateException(); - m_MaxLinearVelocity = value; - PhysicsApi.API.SetRigidBodyMaxLinearVelocity(ptr, value); - } - } - - /// - /// Applies a force to the rigid body. The force is applied to the center of mass. - /// - /// - public void ApplyForce(Vector3 force) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyForce(ptr, Time.deltaTime, force); - } - /// - /// Applies a force (in world space) to the rigid body at the point p in world space. - /// - /// - /// - public void ApplyForceAtPoint(Vector3 force, Vector3 point) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyForceAtPoint(ptr, Time.deltaTime, force, point); - } - /// - /// Applies the specified torque (in world space) to the rigid body. - /// Specify the torque as an Vector3. The direction of the vector indicates the axis (in world space) that you want the body to rotate around, and the magnitude of the vector indicates the strength of the force applied. The change in the body's angular velocity after torques are applied is proportional to the simulation delta time value and inversely proportional to the body's inertia. - /// - /// - public void ApplyTorque(Vector3 torque) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyTorque(ptr, Time.deltaTime, torque); - } - /// - /// Applies an impulse (in world space) to the center of mass. - /// - /// - public void ApplyLinearImpulse(Vector3 imp) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyLinearImpulse(ptr, imp); - } - /// - /// Apply an impulse at the point p in world space. - /// - /// - /// - public void ApplyPointImpulse(Vector3 imp, Vector3 point) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyPointImpulse(ptr, imp, point); - } - /// - /// Apply an instantaneous change in angular velocity around center of mass. - /// - /// - public void ApplyAngularImpulse(Vector3 imp) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.RigidBodyApplyAngularImpulse(ptr, imp); - } - - [SLua.CustomLuaClass] - public delegate void OnBodyTiggerCollCallback(PhysicsBody body, PhysicsBody other); - [SLua.CustomLuaClass] - public delegate void OnBodyCollisionCallback(PhysicsBody body, PhysicsBody other, PhysicsBodyCollisionInfo info); - [SLua.CustomLuaClass] - public delegate void OnBodyCollisionLeaveCallback(PhysicsBody body, PhysicsBody other); - [SLua.CustomLuaClass] - public delegate void OnBodyCallback(PhysicsBody body); - - /// - /// 刚体离开世界边界时的回调。刚体离开世界边界时会自动反物理化 - /// - public OnBodyCallback onLeaveBroadphase; - /// - /// Tigger中刚体进入时的事件（为Tigger时有效） - /// - public OnBodyTiggerCollCallback onTiggerEnter; - /// - /// Tigger中刚体离开时的事件（为Tigger时有效） - /// - public OnBodyTiggerCollCallback onTiggerLeave; - - /// - /// 刚体碰撞进入时的事件（AddContactListener为true时有效） - /// - public OnBodyCollisionCallback onCollisionEnter; - /// - /// 刚体碰撞离开时的事件（AddContactListener为true时有效） - /// - public OnBodyCollisionLeaveCallback onCollisionLeave; - /// - /// 刚体碰撞离开时的事件（AddContactListener为true时有效） - /// - public OnBodyCollisionCallback onCollisionStay; - - private enum PhysicsBodyContactDataState { - NEW_ADD, - TWICE_ADD, - END, - } - private class PhysicsBodyContactData { - public PhysicsBody body; - public sPhysicsBodyContactData data; - public PhysicsBodyContactDataState state; - public bool entered = false; - public bool needLeave = false; - public PhysicsBodyContactData(PhysicsBody body, sPhysicsBodyContactData data) { - this.body = body; - this.data = data; - state = PhysicsBodyContactDataState.NEW_ADD; - } - - public PhysicsBodyContactData prev { get; set; } - public PhysicsBodyContactData next { get; set; } - } - private Dictionary currentFramEnterBodies = new Dictionary(); - private List currentFramEnterBodiesList = new List(); - - internal void FlushPhysicsBodyContactDataTick() { - for(int i = currentFramEnterBodiesList.Count- 1; i >= 0; i--) { - var d = currentFramEnterBodiesList[i]; - switch(d.state) { - case PhysicsBodyContactDataState.NEW_ADD: - onCollisionEnter?.Invoke(this, d.body, new PhysicsBodyCollisionInfo(d.data)); - d.state = d.needLeave ? PhysicsBodyContactDataState.END : PhysicsBodyContactDataState.TWICE_ADD; - d.entered = true; - break; - case PhysicsBodyContactDataState.TWICE_ADD: - onCollisionStay?.Invoke(this, d.body, new PhysicsBodyCollisionInfo(d.data)); - break; - case PhysicsBodyContactDataState.END: - onCollisionLeave?.Invoke(this, d.body); - currentFramEnterBodies.Remove(d.body.Id); - currentFramEnterBodiesList.RemoveAt(i); - break; - } - } - } - internal void OnBodyPointContactCallback(PhysicsBody other, sPhysicsBodyContactData data) { - if(currentFramEnterBodies.TryGetValue(other.Id, out var d)) { - if(data.isRemoved == 1) { - if(d.entered) d.state = PhysicsBodyContactDataState.END; - else d.needLeave = true; - } else { - d.data = data; - d.state = PhysicsBodyContactDataState.TWICE_ADD; - } - } else { - d = new PhysicsBodyContactData(other, data); - currentFramEnterBodies.Add(other.Id, d); - currentFramEnterBodiesList.Add(d); - } - } - } - - [SLua.CustomLuaClass] - public class PhysicsBodyCollisionInfo { - public float distance { get; private set; } - public Vector3 position { get; private set; } - public Vector3 normal { get; private set; } - public Vector3 separatingNormal { get; private set; } - public float separatingVelocity { get; private set; } - - internal PhysicsBodyCollisionInfo(sPhysicsBodyContactData data) { - distance = data.distance; - separatingVelocity = data.separatingVelocity; - position = new Vector3(data.pos[0], data.pos[1], data.pos[2]); - separatingNormal = new Vector3(data.separatingNormal[0], data.separatingNormal[1], data.separatingNormal[2]); - normal = new Vector3(data.normal[0], data.normal[1], data.normal[2]); - } - } - public class PhysicsBodyNotCreateException : Exception { - public PhysicsBodyNotCreateException() : base("Body is not created yet.") {} - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs.meta deleted file mode 100644 index 43b03e61..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsBody.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a79fa0ed245b7514ba47c4268200698e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs deleted file mode 100644 index 48c9829c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs +++ /dev/null @@ -1,173 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; - -namespace PhysicsRT -{ - [DefaultExecutionOrder(300)] - [RequireComponent(typeof(PhysicsBody))] - [SLua.CustomLuaClass] - public class PhysicsConstraint : MonoBehaviour - { - public int Id { get; protected set; } - - [SerializeField] - public PhysicsBody ConnectedBody; - - [SerializeField] - [HideInInspector] - private bool m_Breakable = false; - [SerializeField] - [HideInInspector] - private float m_Threshold = 10f; - [SerializeField] - [HideInInspector] - private float m_MaximumAngularImpulse = 1000; - [SerializeField] - [HideInInspector] - private float m_MaximumLinearImpulse = 1000; - [SerializeField] - private ConstraintPriority m_Priority = ConstraintPriority.Psi; - - protected virtual void Awake() - { - - } - protected virtual void OnDestroy() - { - Destroy(); - } - protected virtual void OnEnable() - { - if (ptr != IntPtr.Zero) - PhysicsApi.API.SetConstraintEnable(ptr, true); - } - protected virtual void OnDisable() - { - if (ptr != IntPtr.Zero) - PhysicsApi.API.SetConstraintEnable(ptr, false); - } - - /// - /// 设置是否启用约束 - /// - /// - public void SetEnabled(bool b) - { - if (ptr != IntPtr.Zero) - PhysicsApi.API.SetConstraintEnable(ptr, b); - } - - private IntPtr ptr = IntPtr.Zero; - private PhysicsWorld CurrentPhysicsWorld = null; - - /// - /// 获取或设置约束是否被破坏 - /// - public bool Breakable { get => m_Breakable; set => m_Breakable = value; } - /// - /// 获取或设置约束破坏阈值 - /// - public float Threshold { get => m_Threshold; set => m_Threshold = value; } - /// - /// 获取或设置约束破最大线性脉冲 - /// - public float MaximumAngularImpulse { get => m_MaximumAngularImpulse; set => m_MaximumAngularImpulse = value; } - /// - /// 获取或设置约束破最大线性脉冲 - /// - public float MaximumLinearImpulse { get => m_MaximumLinearImpulse; set => m_MaximumLinearImpulse = value; } - /// - /// 获取或设置约束的优先级 - /// - public ConstraintPriority Priority { get => m_Priority; set => m_Priority = value; } - - public delegate void OnConstraintBreakingEvent(PhysicsConstraint constraint, float forceMagnitude, int removed); - - /// - /// 约束被破坏时的事件 - /// - public OnConstraintBreakingEvent onBreaking; - /// - /// 手动创建 - /// - public virtual void Create() { } - /// - /// 手动销毁 - /// - public virtual void Destroy() - { - if (CurrentPhysicsWorld == null || ptr == IntPtr.Zero) - return; - if (CurrentPhysicsWorld.RemoveConstraint(this)) - PhysicsApi.API.DestoryConstraints(ptr); - ptr = IntPtr.Zero; - } - - internal bool TryCreate() - { - if (!enabled) - return false; - if (ptr == IntPtr.Zero) - { - var thisBody = GetComponent(); - if (thisBody.GetPtr() != IntPtr.Zero && (ConnectedBody == null || ConnectedBody.GetPtr() != IntPtr.Zero)) - { - Create(); - return true; - } - else if (ConnectedBody != null && ConnectedBody.GetPtr() == IntPtr.Zero) - ConnectedBody.AddPendingCreateConstant(this); - else if (thisBody.GetPtr() == IntPtr.Zero) - thisBody.AddPendingCreateConstant(this); - } - return false; - } - - protected IntPtr CreatePre() - { - CurrentPhysicsWorld = PhysicsWorld.GetCurrentScensePhysicsWorld(); - if (CurrentPhysicsWorld == null) - { - Debug.LogWarning("Not found PhysicsWorld in this scense, please add it before use PhysicsBody."); - return IntPtr.Zero; - } - return GetComponent().GetPtr(); - } - protected void CreateLastStep(IntPtr ptr) - { - this.ptr = ptr; - Id = PhysicsApi.API.GetConstraintId(ptr); - CurrentPhysicsWorld.AddConstraint(Id, this); - } - protected sConstraintBreakData GetConstraintBreakData() - { - sConstraintBreakData data = new sConstraintBreakData(); - data.breakable = m_Breakable; - data.threshold = m_Threshold; - data.maximumAngularImpulse = m_MaximumAngularImpulse; - data.maximumLinearImpulse = m_MaximumLinearImpulse; - return data; - } - - public bool GetConstraintBroken() - { - if (ptr != IntPtr.Zero) - return PhysicsApi.API.IsConstraintBroken(ptr); - Debug.LogWarning("Constraint not created"); - return false; - } - public void SetConstraintBroken(bool broken, float force = 0) - { - if (ptr != IntPtr.Zero) - PhysicsApi.API.SetConstraintBroken(ptr, m_Breakable, force); - } - private IntPtr GetPtr() { return ptr; } - } - [SLua.CustomLuaClass] - public enum ConstraintPriority - { - Toi = 3, - Psi = 1 - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs.meta deleted file mode 100644 index 6cd22f27..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsConstraint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8d05685e4a97c9745acfbb2696068b2b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs deleted file mode 100644 index 934649fd..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace PhysicsRT -{ - [AddComponentMenu("PhysicsRT/Physics Force")] - [DefaultExecutionOrder(210)] - [DisallowMultipleComponent] - [SLua.CustomLuaClass] - public class PhysicsForce : MonoBehaviour - { - [SerializeField] - [Tooltip("指定恒力的大小")] - public float Force; - [SerializeField] - [Tooltip("指定是否启用恒力")] - public bool Enable; - [SerializeField] - [Tooltip("指定恒力的方向")] - public Transform ForceRef; - - private PhysicsBody body; - - private void Start() { - body = GetComponent(); - } - private void FixedUpdate() { - if(Enable) - body.ApplyForce(ForceRef != null ? (ForceRef.forward.normalized * Force) : (Vector3.forward * Force)); - } - } - -} diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs.meta deleted file mode 100644 index 98baf06e..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsForce.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4d37bc038a9cc7a47ad3deae0dcf48d4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs deleted file mode 100644 index 63a6c538..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs +++ /dev/null @@ -1,50 +0,0 @@ - -using UnityEditor; -using UnityEngine; - -[SLua.CustomLuaClass] -public class PhysicsOptions : ScriptableObject -{ - [Tooltip("是否启用多线程模拟")] - public bool EnableMultithreaded = false; - [Tooltip("小内存池的大小")] - [Range(8, 2048)] - public int SmallPoolSize = 32; - - #region Base - - private static PhysicsOptions _instance = null; - - public static PhysicsOptions Instance{ - get { - if(_instance == null) { - _instance = Resources.Load("PhysicsOptions"); - - #if UNITY_EDITOR - if(_instance == null){ - _instance = PhysicsOptions.CreateInstance(); - try - { - AssetDatabase.CreateAsset(_instance, "Assets/Resources/PhysicsOptions.asset"); - } - catch { - - } - } - #endif - - } - return _instance; - } - } - - #if UNITY_EDITOR - [SLua.DoNotToLua] - [MenuItem("PhysicsRT/Settings")] - public static void Open() { - Selection.activeObject = Instance; - } - #endif - - #endregion -} diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs.meta deleted file mode 100644 index 433b41f9..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsOptions.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bd7f1eda059a9504d957dc84a15a9636 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs deleted file mode 100644 index 43ec6cd2..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs +++ /dev/null @@ -1,261 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; - -namespace PhysicsRT -{ - [SLua.CustomLuaClass] - public enum PhysicsPhantomType { - Aabb - } - [AddComponentMenu("PhysicsRT/Physics Phantom")] - [DefaultExecutionOrder(250)] - [DisallowMultipleComponent] - [SLua.CustomLuaClass] - public class PhysicsPhantom : MonoBehaviour - { - [SerializeField] - private PhysicsPhantomType m_Type = PhysicsPhantomType.Aabb; - [SerializeField] - [Tooltip("The minimum boundary of the AABB (local)")] - private Vector3 m_Min = new Vector3(-0.5f,-0.5f,-0.5f); - [SerializeField] - [Tooltip("The maximum boundary of the AABB (local)")] - private Vector3 m_Max = new Vector3(0.5f,0.5f,0.5f); - [SerializeField] - private int m_Layer = 0; - [Tooltip("是否添加 Listener，只有开启了才可使用OnCollision事件")] - [SerializeField] - private bool m_EnableListener = false; - [Tooltip("在 Awake 时不自动创建幻影，设置为 false 后您需要手动调用 ForceReCreate 来创建")] - [SerializeField] - private bool m_DoNotAutoCreateAtAwake = false; - private IntPtr ptr = IntPtr.Zero; - - /// - /// 在 Awake 时不自动创建幻影，设置为 false 后您需要手动调用 ForceReCreate 来创建 - /// - public bool DoNotAutoCreateAtAwake { get => m_DoNotAutoCreateAtAwake; set { m_DoNotAutoCreateAtAwake = value; } } - /// - /// 获取或设置幻影碰撞层 - /// - public int Layer { - get => m_Layer; - set { - if(m_Layer != value) { - m_Layer = value; - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetRigidBodyLayer(ptr, m_Layer); - } - } - } - /// - /// 获取或设置刚体的类型 - /// - public PhysicsPhantomType Type { - get => m_Type; - set => m_Type = value; - } - /// - /// 是否添加ContactListener，只有添加了ContactListener才可使用OnCollision事件（创建刚体后设置无效） - /// - public bool EnableListener { - get => m_EnableListener; - set { - if(ptr != IntPtr.Zero) - throw new Exception("Body is created, do not modify this after creation"); - m_EnableListener = value; - } - } - /// - /// 获取幻影包围盒最小坐标。创建以后设置请使用 SetAabb 方法 - /// - /// - public Vector3 Min { get => m_Min; set => m_Max = value; } - /// - /// 获取幻影包围盒最大坐标。创建以后设置请使用 SetAabb 方法 - /// - /// - public Vector3 Max { get => m_Max; set => m_Max = value; } - - /// - /// ID - /// - /// - public int Id { get; private set; } - - /// - /// 重新创建幻影 - /// - public void ForceReCreate() - { - Destroy(); - Create(); - } - - private void Awake() { - CurrentPhysicsWorld = PhysicsWorld.GetCurrentScensePhysicsWorld(); - StartCoroutine(LateCreate()); - } - private void OnDestroy() { - Destroy(); - } - private IEnumerator LateCreate() { - yield return new WaitForSeconds(0.05f); - if(!m_DoNotAutoCreateAtAwake) - Create(); - } - - private PhysicsWorld CurrentPhysicsWorld = null; - - public IntPtr GetPtr() { return ptr; } - - /// - /// 设置当前幻影的Aabb包围盒为当前物体数据 - /// - public void SetAabbBySelf() { - Renderer renderer = GetComponent(); - if(renderer != null) - SetAabbWorld(renderer.bounds.min, renderer.bounds.max); - } - /// - /// 更新当前幻影的Aabb包围盒（相对） - /// - /// - /// - public void SetAabbWorld(Vector3 min, Vector3 max) { - if(ptr != IntPtr.Zero) - PhysicsApi.API.SetAabbPhantomMinMax(ptr, min, max); - m_Min = min - transform.position; - m_Max = max - transform.position; - } - /// - /// 更新当前幻影的Aabb包围盒（相对） - /// - /// - /// - public void SetAabb(Vector3 min, Vector3 max) { - m_Max = max; - m_Min = min; - if(ptr != IntPtr.Zero) { - var _min = transform.TransformPoint(m_Min); - var _max = transform.TransformPoint(m_Max); - if(_min.x > _max.x){ - var o = _max.x; - _max.x = _min.x; - _min.x = o; - } - if(_min.y > _max.y){ - var o = _max.y; - _max.y = _min.y; - _min.y = o; - } - if(_min.z > _max.z){ - var o = _max.z; - _max.z = _min.z; - _min.z = o; - } - PhysicsApi.API.SetAabbPhantomMinMax(ptr, _min, _max); - } - } - /// - /// 获取当前幻影相交的刚体 - /// - /// - public PhysicsBody[] GetOverlappingBodies() { - if(ptr != IntPtr.Zero) { - var outLen = 0; - var rs = PhysicsApi.API.GetAabbPhantomOverlappingCollidables(ptr, ref outLen); - - PhysicsBody[] result = new PhysicsBody[outLen]; - for (int i = 0; i < rs.Length; i++) - result[i] = CurrentPhysicsWorld.GetBodyById(rs[i]); - return result; - } - throw new Exception("Phantom not create!"); - } - - private void Create() { - if(ptr != IntPtr.Zero) { - return; - } - if(CurrentPhysicsWorld == null) { - Debug.LogWarning("Not found PhysicsWorld in this scense, please add it before use PhysicsBody."); - return; - } - - var _min = transform.position + m_Min; - var _max = transform.position + m_Max; - if(_min.x > _max.x){ - var o = _max.x; - _max.x = _min.x; - _min.x = o; - } - if(_min.y > _max.y){ - var o = _max.y; - _max.y = _min.y; - _min.y = o; - } - if(_min.z > _max.z){ - var o = _max.z; - _max.z = _min.z; - _min.z = o; - } - - ptr = PhysicsApi.API.CreateAabbPhantom( - CurrentPhysicsWorld.GetPtr(), - _min, _max, - m_EnableListener, - m_Layer); - - - Id = PhysicsApi.API.GetPhantomId(ptr); - CurrentPhysicsWorld.AddPhantom(Id, this); - } - private void Destroy() { - if(CurrentPhysicsWorld == null || ptr == IntPtr.Zero) - return; - - CurrentPhysicsWorld.RemovePhantom(this); - PhysicsApi.API.DestroyPhantom(ptr); - ptr = IntPtr.Zero; - } - - [SLua.CustomLuaClass] - public delegate void OnPhantomOverlappingCollidableCallback(PhysicsPhantom self, PhysicsBody other); - - /// - /// 刚体进入幻影时的事件 - /// - public OnPhantomOverlappingCollidableCallback onOverlappingCollidableAdd; - /// - /// 刚体离开幻影时的事件 - /// - public OnPhantomOverlappingCollidableCallback onOverlappingCollidableRemove; - - public void OnPhantomOverlapCallback(PhysicsBody sbodyOther, int ty) { - if(gameObject.activeSelf) { - if(ty == 1) onOverlappingCollidableAdd?.Invoke(this, sbodyOther); - else onOverlappingCollidableRemove?.Invoke(this, sbodyOther); - } - } - - private Vector3 oldPosition = Vector3.zero; - private Vector3 oldMin = Vector3.zero; - private Vector3 oldMax = Vector3.zero; - - [SLua.DoNotToLua] - public void BackUpRuntimeCanModifieProperties() { - oldPosition = transform.position; - oldMin = m_Min; - oldMax = m_Max; - } - [SLua.DoNotToLua] - public void ApplyModifiedProperties() { - if(oldPosition != transform.position || oldMin != m_Min || oldMax != m_Max) { - BackUpRuntimeCanModifieProperties(); - SetAabb(m_Min, m_Max); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs.meta deleted file mode 100644 index 843ac2a9..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsPhantom.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4479bf253979e394d9f9525083d66d81 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs deleted file mode 100644 index 25773f91..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs +++ /dev/null @@ -1,507 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace PhysicsRT -{ - [SLua.CustomLuaClass] - public enum ShapeType - { - Box, - Sphere, - Capsule, - Cylinder, - Plane, - ConvexHull, - Mesh, - BvCompressedMesh, - List, - StaticCompound, - } - [SLua.CustomLuaClass] - public enum ShapeWrap - { - None = 0, - TranslateShape = 1, - TransformShape = 2, - } - - [AddComponentMenu("PhysicsRT/Physics Shape")] - [DefaultExecutionOrder(210)] - [DisallowMultipleComponent] - [SLua.CustomLuaClass] - public class PhysicsShape : MonoBehaviour - { - [SerializeField] - [Tooltip("为碰撞检测目的定义对象的形状和大小。")] - private ShapeType m_ShapeType = ShapeType.Box; - [SerializeField] - [Tooltip("使用附加变换包裹其他凸面形状。")] - private ShapeWrap m_Wrap = ShapeWrap.None; - - [SerializeField] - private Vector3 m_Translation = Vector3.zero; - [SerializeField] - private Vector3 m_Rotation = Vector3.zero; - [SerializeField] - private Vector3 m_Scale = Vector3.one; - - [SerializeField] - private CustomPhysicsMaterialTags m_CustomTags = CustomPhysicsMaterialTags.Nothing; - - [SerializeField] - private Mesh m_ShapeMesh = null; - [SerializeField] - private Vector3 m_ShapeSize = Vector3.one; - [SerializeField] - private float m_ShapeRadius = 0.5f; - [SerializeField] - private float m_ShapeConvexRadius = 0.0f; - [SerializeField] - private float m_ShapeHeight = 1.0f; - [SerializeField] - private int m_ShapeSideCount = 32; - [SerializeField] - [Tooltip("指定指定给此形状的蒙皮顶点的最小权重和/或自动检测所需的变换子级。值为0时，将包括所有具有指定给此形状层次的任何权重的点。")] - [Range(0f, 1f)] - private float m_MinimumSkinnedVertexWeight = 0.1f; - private IntPtr ptr = IntPtr.Zero; - private IntPtr shapeRealPtr = IntPtr.Zero; - - [SerializeField] - PhysicsLayerTags m_BelongsToCategories = PhysicsLayerTags.Everything; - [SerializeField] - PhysicsLayerTags m_CollidesWithCategories = PhysicsLayerTags.Everything; - [SerializeField] - CustomPhysicsMaterialTags m_CustomMaterialTags = new CustomPhysicsMaterialTags(); - - public int StaticCompoundChildId { get; private set; } - public ShapeType ShapeType { get => m_ShapeType; set => m_ShapeType = value; } - public ShapeWrap Wrap { get => m_Wrap; set => m_Wrap = value; } - public Mesh ShapeMesh { get => m_ShapeMesh; set => m_ShapeMesh = value; } - public Vector3 ShapeSize { get => m_ShapeSize; set => m_ShapeSize = value; } - public float ShapeRadius { get => m_ShapeRadius; set => m_ShapeRadius = value; } - public float ShapeConvexRadius { get => m_ShapeConvexRadius; set => m_ShapeConvexRadius = value; } - public float ShapeHeight { get => m_ShapeHeight; set => m_ShapeHeight = value; } - public int ShapeSideCount { get => m_ShapeSideCount; set => m_ShapeSideCount = value; } - public Vector3 ShapeScale { - get { - switch(m_Wrap) { - case ShapeWrap.TransformShape: - return m_Scale; - default: - case ShapeWrap.None: - case ShapeWrap.TranslateShape: - return Vector3.one; - } - } - set => m_Scale = value; - } - public Vector3 ShapeRotation { get => m_Rotation; set => m_Rotation = value; } - public Vector3 ShapeTranslation { get => m_Translation; set => m_Translation = value; } - public float MinimumSkinnedVertexWeight { get => m_MinimumSkinnedVertexWeight; set => m_MinimumSkinnedVertexWeight = value; } - public CustomPhysicsMaterialTags CustomTags - { - get => m_CustomMaterialTags; - set => m_CustomMaterialTags = value; - } - - private void Start() { - if(m_ShapeMesh == null) { - var m = GetComponent(); - if(m != null) m_ShapeMesh = m.mesh; - } - } - private void OnValidate() - { - m_ShapeConvexRadius = Mathf.Max(m_ShapeConvexRadius, 0f); - m_ShapeRadius = Mathf.Max(m_ShapeRadius, 0f); - m_ShapeSideCount = (int)Mathf.Max(m_ShapeSideCount, 0f); - m_ShapeHeight = Mathf.Max(m_ShapeHeight, 0f); - } - - public IntPtr GetPtr() { return ptr; } - public IntPtr ComputeMassProperties(float mass) - { - IntPtr result = IntPtr.Zero; - switch (ShapeType) - { - case ShapeType.Box: - { - result = PhysicsApi.API.ComputeBoxVolumeMassProperties(ShapeSize, mass); - break; - } - case ShapeType.Sphere: - { - result = PhysicsApi.API.ComputeSphereVolumeMassProperties(ShapeRadius, mass); - break; - } - case ShapeType.Capsule: - { - result = PhysicsApi.API.ComputeCapsuleVolumeMassProperties(new Vector3(0, ShapeHeight / 2, 0), new Vector3(0, -ShapeHeight / 2, 0), ShapeRadius, mass); - break; - } - case ShapeType.Cylinder: - { - result = PhysicsApi.API.ComputeCylinderVolumeMassProperties(new Vector3(0, ShapeHeight / 2, 0), new Vector3(0, -ShapeHeight / 2, 0), ShapeRadius, mass); - break; - } - case ShapeType.Plane: - { - result = PhysicsApi.API.ComputeBoxVolumeMassProperties(new Vector3(ShapeSize.x, 0, ShapeSize.z), mass); - break; - } - case ShapeType.ConvexHull: - case ShapeType.List: - { - result = PhysicsApi.API.ComputeShapeVolumeMassProperties(ptr, mass); - break; - } - case ShapeType.Mesh: - case ShapeType.BvCompressedMesh: - case ShapeType.StaticCompound: - break; - } - return result; - } - - [StructLayout(LayoutKind.Sequential)] - struct sPhysicsShape { - public IntPtr shape; - public UInt16 type; - public IntPtr staticCompoundShapeRetIds; - public int staticCompoundShapeRetIdsCount; - }; - - private void CreateShape(bool forceRecreate, int layout) { - - //Create base shape - switch (m_ShapeType) - { - case ShapeType.Box: - { - shapeRealPtr = PhysicsApi.API.CreateBoxShape(new Vector3(ShapeSize.x / 2, ShapeSize.y / 2, ShapeSize.z / 2), ShapeConvexRadius); - break; - } - case ShapeType.Plane: - { - shapeRealPtr = PhysicsApi.API.CreateBoxShape(new Vector3(ShapeSize.x / 2, 0.01f, ShapeSize.z / 2), ShapeConvexRadius); - break; - } - case ShapeType.Capsule: - { - shapeRealPtr = PhysicsApi.API.CreateCapsuleShape(new Vector3(0, ShapeHeight / 2, 0), new Vector3(0, -ShapeHeight / 2, 0), ShapeRadius); - break; - } - case ShapeType.Cylinder: - { - shapeRealPtr = PhysicsApi.API.CreateCylindeShape(new Vector3(0, ShapeHeight / 2, 0), new Vector3(0, -ShapeHeight / 2, 0), ShapeRadius, ShapeConvexRadius); - break; - } - case ShapeType.Sphere: - { - shapeRealPtr = PhysicsApi.API.CreateSphereShape(ShapeRadius); - break; - } - case ShapeType.ConvexHull: - { - Mesh mesh = ShapeMesh; - if (mesh == null) - { - Debug.LogWarning("ConvexHull need a mesh! " + name); - return; - } - - IntPtr convexHullResult = PhysicsApi.API.Build3DPointsConvexHull(mesh.vertices); - shapeRealPtr = PhysicsApi.API.CreateConvexVerticesShapeByConvexHullResult(convexHullResult, ShapeConvexRadius); - PhysicsApi.API.CommonDelete(convexHullResult); - break; - } - case ShapeType.Mesh: - { - Mesh mesh = ShapeMesh; - if (mesh == null) - { - Debug.LogWarning("Shape " + name + " need a mesh"); - return; - } - - shapeRealPtr = PhysicsApi.API.CreateSimpleMeshShape(mesh.vertices, mesh.triangles, ShapeConvexRadius); - break; - } - case ShapeType.BvCompressedMesh: - { - Mesh mesh = ShapeMesh; - if (mesh == null) - { - Debug.LogWarning("Shape " + name + " need a mesh"); - return; - } - - shapeRealPtr = PhysicsApi.API.CreateBvCompressedMeshShape(mesh.vertices, mesh.triangles, ShapeConvexRadius); - break; - } - case ShapeType.List: - { - List childernTransforms = null; - IntPtr childTransforms = IntPtr.Zero; - IntPtr childs = GetChildernShapes(forceRecreate, layout, false, out int childCount, ref childTransforms, ref childernTransforms); - shapeRealPtr = PhysicsApi.API.CreateListShape(childs, childCount); - Marshal.FreeHGlobal(childs); - break; - } - case ShapeType.StaticCompound: - { - List childernTransforms = new List(); - IntPtr childTransforms = IntPtr.Zero; - IntPtr childs = GetChildernShapes(forceRecreate, layout, true, out int childCount, ref childTransforms, ref childernTransforms); - IntPtr retStruct = PhysicsApi.API.CreateStaticCompoundShape(childs, childTransforms, childCount, layout); - shapeRealPtr = retStruct; - //更新ID至每个shape - sPhysicsShape str = (sPhysicsShape)Marshal.PtrToStructure(retStruct, typeof(sPhysicsShape)); - int[] staticCompoundShapeRetIds = new int[str.staticCompoundShapeRetIdsCount]; - Marshal.Copy(str.staticCompoundShapeRetIds, staticCompoundShapeRetIds, 0, str.staticCompoundShapeRetIdsCount); - for (int i = 0, ia = 0, c = transform.childCount; i < c && ia < str.staticCompoundShapeRetIdsCount; i++) { - if(transform.gameObject.activeSelf) { - var shape = transform.GetChild(i).gameObject.GetComponent(); - if (shape != null) { - shape.StaticCompoundChildId = staticCompoundShapeRetIds[ia]; - ia++; - } - } - } - - Marshal.FreeHGlobal(childs); - Marshal.FreeHGlobal(childTransforms); - - foreach (var p in childernTransforms) - PhysicsApi.API.DestroyTransform(p); - childernTransforms.Clear(); - break; - } - } - - //获取父级，如果父级是容器的话，那么需要使用TransformShape包装 - var parentShape = transform.parent != null ? transform.parent.GetComponent() : null; - if(parentShape != null && parentShape.m_ShapeType == ShapeType.List) { - if(transform.localPosition != Vector3.zero && transform.localRotation.eulerAngles == Vector3.zero && transform.localScale == Vector3.one) { - //只有位置更改，选择TranslateShape - ptr = PhysicsApi.API.CreateConvexTranslateShape(shapeRealPtr, ShapeTranslation + transform.localPosition); - } else if(transform.localPosition != Vector3.zero || transform.localRotation.eulerAngles != Vector3.zero || transform.localScale != Vector3.one) { - //三个任意一个更改，选择TransformShape - var pos = ShapeTranslation + transform.localPosition; - var quaternion = Quaternion.Euler(ShapeRotation + transform.localRotation.eulerAngles); - var scale = GetScaleMaxSame(Vector3.Scale(ShapeScale, transform.localScale)); - - IntPtr posPtr = PhysicsApi.API.CreateTransform( - pos.x, pos.y, pos.z, - quaternion.x, quaternion.y, quaternion.z, quaternion.w, - scale.x, scale.y, scale.z - ); - ptr = PhysicsApi.API.CreateConvexTransformShape(shapeRealPtr, posPtr); - PhysicsApi.API.DestroyTransform(posPtr); - } else CreateDefaultWrapShape(); - } else CreateDefaultWrapShape(); - } - private Vector3 GetScaleMaxSame(Vector3 v) { - if((v.x == v.y && v.y == v.z) || m_ShapeType == ShapeType.Box || m_ShapeType == ShapeType.ConvexHull) - return v; - else { - //其他种类的碰撞体不允许不正的缩放系数，这里改成最大的相同的缩放系数 - var max = Mathf.Max(v.x, v.y, v.z); - return new Vector3(max, max, max); - } - } - //创建默认包装 - private void CreateDefaultWrapShape() { - //如果当前shape直接由PhysicsBody控制，并且缩放不为1，则需要包裹TransformShape以调整缩放比例 - var body = GetComponent(); - if(body != null && transform.lossyScale != Vector3.one) { - var scale = GetScaleMaxSame(transform.lossyScale); - var rot = Quaternion.Euler(0,0,0); - IntPtr posPtr = PhysicsApi.API.CreateTransform( - 0, 0, 0, rot.x, rot.y, rot.z, rot.w, - scale.x, scale.y, scale.z - ); - ptr = PhysicsApi.API.CreateConvexTransformShape(shapeRealPtr, posPtr); - PhysicsApi.API.DestroyTransform(posPtr); - } else { - //Create Wrap shape - switch(m_Wrap) { - case ShapeWrap.None: - ptr = shapeRealPtr; - break; - case ShapeWrap.TransformShape: - { - var pos = ShapeTranslation; - var quaternion = Quaternion.Euler(ShapeRotation); - var scale = ShapeScale; - - IntPtr posPtr = PhysicsApi.API.CreateTransform( - pos.x, pos.y, pos.z, - quaternion.x, quaternion.y, quaternion.z, quaternion.w, - scale.x, scale.y, scale.z - ); - ptr = PhysicsApi.API.CreateConvexTransformShape(shapeRealPtr, posPtr); - PhysicsApi.API.DestroyTransform(posPtr); - break; - } - case ShapeWrap.TranslateShape: - { - ptr = PhysicsApi.API.CreateConvexTranslateShape(shapeRealPtr, ShapeTranslation); - break; - } - } - } - } - //释放 - private void DestroyShape(bool forceRecreate = false) { - if(ptr != shapeRealPtr) { - if(shapeRealPtr != IntPtr.Zero) { - PhysicsApi.API.DestroyShape(shapeRealPtr); - shapeRealPtr = IntPtr.Zero; - } - } else { - shapeRealPtr = IntPtr.Zero; - } - - if(ptr != IntPtr.Zero) { - PhysicsApi.API.DestroyShape(ptr); - ptr = IntPtr.Zero; - } - } - //获取子级Shape - private IntPtr GetChildernShapes(bool forceRecreate, int layout, bool withChildTransforms, out int childCount, ref IntPtr outChildTransforms, ref List childernTransforms) - { - //获取子级 PhysicsShape 的指针 - - List childernShapes = new List(); - for (int i = 0, c = transform.childCount; i < c; i++) { - var child = transform.GetChild(i); - if(child.gameObject.activeSelf) { - var shape = child.gameObject.GetComponent(); - if (shape != null) - { - var ptr = shape.GetShapeBody(forceRecreate, layout); - if(ptr == IntPtr.Zero) - continue; - childernShapes.Add(ptr); - - if (withChildTransforms)// Child Transforms - { - childernTransforms.Add(PhysicsApi.API.CreateTransform( - shape.transform.localPosition.x, shape.transform.localPosition.y, shape.transform.localPosition.z, - shape.transform.localRotation.x, shape.transform.localRotation.y, shape.transform.localRotation.z, shape.transform.localRotation.w, - shape.transform.localScale.x, shape.transform.localScale.y, shape.transform.localScale.z - )); - } - } - } - } - - childCount = childernShapes.Count; - - var outArr = childernShapes.ToArray(); - IntPtr outArrBuf = Marshal.AllocHGlobal(Marshal.SizeOf() * outArr.Length); - Marshal.Copy(outArr, 0, outArrBuf, outArr.Length); - - if (withChildTransforms) - { - var outArr2 = childernTransforms.ToArray(); - IntPtr outArrBuf2 = Marshal.AllocHGlobal(Marshal.SizeOf() * outArr2.Length); - Marshal.Copy(outArr2, 0, outArrBuf2, outArr2.Length); - outChildTransforms = outArrBuf2; - } - - return outArrBuf; - } - - public void ReleaseShapeBody() { - DestroyShape(false); - - if(ShapeType == ShapeType.List || ShapeType == ShapeType.StaticCompound) - for (int i = 0, c = transform.childCount; i < c; i++) { - var shape = transform.GetChild(i).gameObject.GetComponent(); - if (shape != null) - shape.ReleaseShapeBody(); - } - } - public IntPtr GetShapeBody(bool forceRecreate, int layout) - { - if (forceRecreate && ptr != IntPtr.Zero) - DestroyShape(true); - if (ptr == IntPtr.Zero) - CreateShape(forceRecreate, layout); - return ptr; - } - public void FitToEnabledRenderMeshes(float f) { - if(ShapeMesh == null) - { - Debug.LogWarning("Not found mesh in this gameObject"); - return; - } - Bounds bounds = ShapeMesh.bounds; - switch (m_ShapeType) - { - case ShapeType.Box: - case ShapeType.Plane: - ShapeSize = bounds.size; - ShapeTranslation = bounds.center; - break; - case ShapeType.Capsule: - case ShapeType.Cylinder: - ShapeRadius = bounds.size.x / 2; - ShapeHeight = bounds.size.y; - break; - case ShapeType.Sphere: - ShapeRadius = bounds.size.x / 2; - break; - } - } - - /// - /// 设置 StaticCompound 子shape的启用状态 - /// - /// Id，存储在Shape的StaticCompoundChildId字段 - /// 是否启用 - public void SetChildInstanceEnable(int id, bool enable) - { - if(m_ShapeType != ShapeType.StaticCompound) - { - Debug.LogError("Only StaticCompoundShape can use this action"); - return; - } - - PhysicsApi.API.StaticCompoundShapeSetInstanceEnabled(shapeRealPtr, id, PhysicsApi.API.BoolToInt(enable)); - } - /// - /// 获取 StaticCompound 子shape的启用状态 - /// - /// Id，存储在Shape的StaticCompoundChildId字段 - /// - public bool GetChildInstanceEnable(int id) - { - if (m_ShapeType != ShapeType.StaticCompound) - { - Debug.LogError("Only StaticCompoundShape can use this action"); - return false; - } - return PhysicsApi.API.StaticCompoundShapeIsInstanceEnabled(shapeRealPtr, id) > 0; - } - /// - /// 启用 StaticCompound 的所有子shape - /// - public void EnableAllChildInstance() - { - if (m_ShapeType != ShapeType.StaticCompound) - { - Debug.LogError("Only StaticCompoundShape can use this action"); - return; - } - - PhysicsApi.API.StaticCompoundShapeEnableAllInstancesAndShapeKeys(shapeRealPtr); - } - } - -} diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs.meta deleted file mode 100644 index a9ec259a..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsShape.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 28c05039a7674a348b345b6c2bc08bf3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs deleted file mode 100644 index 67086fa7..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; - -namespace PhysicsRT -{ - [AddComponentMenu("PhysicsRT/Physics Spring")] - [DefaultExecutionOrder(250)] - [DisallowMultipleComponent] - [SLua.CustomLuaClass] - public class PhysicsSpring : MonoBehaviour - { - [SerializeField] - [Tooltip("获取弹簧锚点A (世界坐标)")] - private Transform m_PovitA; - [SerializeField] - [Tooltip("获取弹簧锚点B (世界坐标)")] - private Transform m_PovitB; - [Tooltip("在 Awake 时不自动创建，设置为 false 后您需要手动调用 ForceReCreate 来创建")] - [SerializeField] - private bool m_DoNotAutoCreateAtAwake = false; - private IntPtr ptr = IntPtr.Zero; - - public float springStrength = 1000.0f; - public float springDamping = 0.1f; - public float springRestLength = 0.0f; - public bool onCompression = true; - public bool onExtension = true; - [SerializeField] - public PhysicsBody ConnectedBody; - - /// - /// 在 Awake 时不自动创建，设置为 false 后您需要手动调用 ForceReCreate 来创建 - /// - public bool DoNotAutoCreateAtAwake { get => m_DoNotAutoCreateAtAwake; set { m_DoNotAutoCreateAtAwake = value; } } - - /// - /// 获取弹簧锚点A (世界坐标) - /// - /// - public Transform PovitA { get => m_PovitA; set => m_PovitA = value; } - /// - /// 获取弹簧锚点B (世界坐标) - /// - /// - public Transform PovitB { get => m_PovitB; set => m_PovitB = value; } - - /// - /// 重新创建弹簧 - /// - public void ForceReCreate() - { - Destroy(); - Create(); - } - - private void OnDestroy() { - Destroy(); - } - - private PhysicsWorld CurrentPhysicsWorld = null; - - public IntPtr GetPtr() { return ptr; } - - internal bool TryCreate() - { - if (!enabled) - return false; - if (ptr == IntPtr.Zero) - { - var thisBody = GetComponent(); - if (thisBody.GetPtr() != IntPtr.Zero && (ConnectedBody == null || ConnectedBody.GetPtr() != IntPtr.Zero)) - { - Create(); - return true; - } - else if (ConnectedBody != null && ConnectedBody.GetPtr() == IntPtr.Zero) - ConnectedBody.AddPendingCreateSpring(this); - else if (thisBody.GetPtr() == IntPtr.Zero) - thisBody.AddPendingCreateSpring(this); - } - return false; - } - - public void Create() { - if(ptr != IntPtr.Zero) { - return; - } - if(CurrentPhysicsWorld == null) - CurrentPhysicsWorld = PhysicsWorld.GetCurrentScensePhysicsWorld(); - if(CurrentPhysicsWorld == null) { - Debug.LogWarning("Not found PhysicsWorld in this scense, please add it before use PhysicsBody."); - return; - } - - ptr = PhysicsApi.API.CreateSpringAction( - CurrentPhysicsWorld.GetPtr(), - GetComponent().GetPtr(), - ConnectedBody != null ? ConnectedBody.GetPtr() : IntPtr.Zero, - m_PovitA.position, - m_PovitB.position, - springStrength, - springDamping, - springRestLength, - onCompression, - onExtension); - } - public void Destroy() { - if(CurrentPhysicsWorld == null || ptr == IntPtr.Zero) - return; - PhysicsApi.API.DestroySpringAction(CurrentPhysicsWorld.GetPtr(), ptr); - ptr = IntPtr.Zero; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs.meta deleted file mode 100644 index 668f54d4..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsSpring.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d04d5e98edbbdd44ca040e617f545102 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs deleted file mode 100644 index 15206a7d..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace PhysicsRT -{ - public static class PhysicsSystemInit - { - public static void Init() - { - #if !UNITY_EDITOR - DoInit(); - Application.quitting += () => { - DoDestroy(); - }; - #endif - } - - internal static List Worlds = new List(); - - public static void DoPreDestroy() - { - for(int i = Worlds.Count - 1; i >= 0; i--) - Object.DestroyImmediate(Worlds[i]); - Worlds.Clear(); - } - public static void DoDestroy() - { - DoPreDestroy(); - PhysicsApi.PhysicsApiDestroy(); - } - public static void DoInit() - { - PhysicsApi.PhysicsApiInit(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs.meta deleted file mode 100644 index 93a2d98e..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsSystemInit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2437c3a2ccfc93040a7fee15c5987325 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs b/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs deleted file mode 100644 index 997508a4..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs +++ /dev/null @@ -1,413 +0,0 @@ -using Ballance2.Utils; -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using UnityEngine; -using UnityEngine.Profiling; -using UnityEngine.SceneManagement; - -namespace PhysicsRT -{ - [AddComponentMenu("PhysicsRT/Physics World")] - [DefaultExecutionOrder(190)] - [DisallowMultipleComponent] - [SLua.CustomLuaClass] - public class PhysicsWorld : MonoBehaviour - { - [Tooltip("如果需要任何连续模拟，请使用此模拟。 (模拟开始后更改此值无效)")] - [SerializeField] - private bool Continuous = false; - [SerializeField] - [Tooltip("世界的引力。默认值是 (0, -9.8, 0). (模拟开始后更改此值无效，请使用 SetGravity 更改)")] - private Vector3 Gravity = new Vector3(0, -9.81f, 0); - [SerializeField] - [Tooltip("指定物理引擎将执行的解算器迭代次数。值越高，稳定性越高，但性能也越差。 (模拟开始后更改此值无效)")] - private int SolverIterationCount = 4; - [SerializeField] - [Tooltip("设置物理边界为边长原点为中心的立方体。 (模拟开始后更改此值无效)")] - private float BroadPhaseWorldSize = 1000; - [SerializeField] - [Tooltip("碰撞容限。这用于创建和保持接触点，即使对于非穿透性对象也是如此。这大大提高了系统的稳定性。默认碰撞容限为0.1f。 (模拟开始后更改此值无效)")] - private float CollisionTolerance = 0.1f; - [SerializeField] - [Tooltip("是否启用VisualDebugger (模拟开始后更改此值无效)")] - private bool VisualDebugger = true; - [SerializeField] - [Tooltip("是否启用 StableSolver (模拟开始后更改此值无效)")] - private bool StableSolverOn = true; - [Tooltip("是否启用物理模拟")] - public bool Simulating = true; - [Tooltip("是否自动更新物理物体的变换数据")] - public bool AutoSyncTransforms = true; - [Tooltip("是否启用Unity Profiler ")] - public bool EnableProfiler = true; - - /// - /// 所有物理场景 - /// - /// Unity场景的buildIndex - /// - /// - public static Dictionary PhysicsWorlds { get; } = new Dictionary(); - /// - /// 获取当前场景的物理场景 - /// - /// - public static PhysicsWorld GetCurrentScensePhysicsWorld() { - int currentScenseIndex = SceneManager.GetActiveScene().buildIndex; - if(PhysicsWorlds.TryGetValue(currentScenseIndex, out var a)) - return a; - return null; - } - - private Dictionary bodysDict = new Dictionary(); - private Dictionary phantomsList = new Dictionary(); - private Dictionary constraintDict = new Dictionary(); - private Dictionary bodysDictAddContactListener = new Dictionary(); - private IntPtr physicsWorldPtr = IntPtr.Zero; - - private void Awake() { - _OnBodyContactEventCallback = OnBodyPointContactCallback; - _OnConstraintBreakingCallback = OnConstraintBreakingCallback; - _OnBodyTriggerEventCallback = OnBodyTiggerEventCallback; - _OnPhantomOverlapCallback = OnPhantomOverlapCallback; - _OnMaxPositionExceededCallback = OnMaxPositionExceededCallback; - - PhysicsSystemInit.Worlds.Add(this); - - var layerNames = Resources.Load("PhysicsLayerNames"); - Debug.Assert(layerNames != null); - - int currentScenseIndex = SceneManager.GetActiveScene().buildIndex; - if(PhysicsWorlds.ContainsKey(currentScenseIndex)) - Debug.LogError("There can only one PhysicsWorld instance in a scense."); - else { - PhysicsWorlds.Add(currentScenseIndex, this); - physicsWorldPtr = PhysicsApi.API.CreatePhysicsWorld( - Gravity, - SolverIterationCount, - BroadPhaseWorldSize, - CollisionTolerance, - Continuous, - VisualDebugger, - 0xffffffff, - layerNames.GetGroupFilterMasks(), - StableSolverOn, - _OnConstraintBreakingCallback, - _OnBodyTriggerEventCallback, - _OnBodyContactEventCallback, - _OnPhantomOverlapCallback, - _OnMaxPositionExceededCallback); - } - } - private void OnDestroy() { - int currentScenseIndex = SceneManager.GetActiveScene().buildIndex; - Simulating = false; - - var list3 = new List(constraintDict.Values); - for(int i = list3.Count - 1; i >= 0; i--) - DestroyImmediate(list3[i]); - constraintDict.Clear(); - - var list2 = new List(phantomsList.Values); - for(int i = list2.Count - 1; i >= 0; i--) - DestroyImmediate(list2[i]); - phantomsList.Clear(); - - var list = new List(bodysDict.Values); - for(int i = list.Count - 1; i >= 0; i--) - DestroyImmediate(list[i]); - bodysDict.Clear(); - bodysDictAddContactListener.Clear(); - - dictSystemGroup.Clear(); - - if(PhysicsWorlds.ContainsKey(currentScenseIndex)) - PhysicsWorlds.Remove(currentScenseIndex); - if (physicsWorldPtr != IntPtr.Zero) - { - PhysicsApi.API.DestroyPhysicsWorld(physicsWorldPtr); - physicsWorldPtr = IntPtr.Zero; - } - } - private void FixedUpdate() { - if(Simulating) { - - if(EnableProfiler) - Profiler.BeginSample("StepPhysicsWorld"); - - //StepWorld - StepPhysicsWorld(); - - if(EnableProfiler) - Profiler.EndSample(); - - //Update all bodys position - if(EnableProfiler) - Profiler.BeginSample("UpdateAllBodys"); - - if(AutoSyncTransforms) - UpdateAllBodys(); - UpdateContactListenerState(); - - if(EnableProfiler) - Profiler.EndSample(); - } - } - - - /// - /// 执行物理事件模拟 - /// - public void StepPhysicsWorld() { - PhysicsApi.API.StepPhysicsWorld(physicsWorldPtr, Time.fixedDeltaTime); - } - /// - /// 更新所有刚体位置旋转信息 - /// - public void UpdateAllBodys() - { - PhysicsApi.API.UpdateAllPhysicsWorldBodys(physicsWorldPtr); - - float[] dat = new float[4]; - foreach(var bodyCurrent in bodysDict.Values) - { - var t = bodyCurrent.gameObject.transform; - IntPtr ptr = bodyCurrent.GetPtr(); //pos 0 - Marshal.Copy(ptr, dat, 0, 3); //float[3] - - var p = new Vector3(dat[0], dat[1], dat[2]); - if(CommonUtils.IsValid(p)) - t.position = p; - - ptr = new IntPtr(ptr.ToInt64() + Marshal.SizeOf() * 3); //pos 3 - Marshal.Copy(ptr, dat, 0, 4); //float[4] - - t.rotation = new Quaternion(dat[0], dat[1], dat[2], dat[3]); - } - } - - //更新ContactListener的状态 - private void UpdateContactListenerState() { - foreach(var body in bodysDictAddContactListener.Values) - body.FlushPhysicsBodyContactDataTick(); - } - - /// - /// [由PhysicsPhantom自动调用，请勿手动调用] - /// - /// - /// - internal void AddPhantom(int id, PhysicsPhantom phantom) { - phantomsList.Add(id, phantom); - - } - /// - /// [由PhysicsPhantom自动调用，请勿手动调用] - /// - /// - internal void RemovePhantom(PhysicsPhantom phantom) { - phantomsList.Remove(phantom.Id); - } - /// - /// [由PhysicsBody自动调用，请勿手动调用] - /// - /// - /// - internal void AddBody(int id, PhysicsBody body) { - bodysDict.Add(id, body); - if(body.AddContactListener) - bodysDictAddContactListener.Add(id, body); - } - /// - /// [由PhysicsBody自动调用，请勿手动调用] - /// - /// - internal void RemoveBody(PhysicsBody body) { - bodysDict.Remove(body.Id); - if(body.AddContactListener) - bodysDictAddContactListener.Remove(body.Id); - } - /// - /// [由PhysicsConstraint自动调用，请勿手动调用] - /// - /// - /// - internal void AddConstraint(int id, PhysicsConstraint constraint) { - constraintDict.Add(id, constraint); - } - /// - /// [由PhysicsBody自动调用，请勿手动调用] - /// - /// - internal bool RemoveConstraint(PhysicsConstraint constraint) { - bool rs = constraintDict.ContainsKey(constraint.Id); - constraintDict.Remove(constraint.Id); - return rs; - } - - /// - /// 通过ID查找世界中的约束 - /// - /// ID - /// 如果未找到则返回null - public PhysicsConstraint GetConstraintById(int id) { - if(constraintDict.TryGetValue(id, out var r)) - return r; - return null; - } - /// - /// 通过ID查找世界中的幻影 - /// - /// ID - /// 如果未找到则返回null - public PhysicsPhantom GetPhantomById(int phantomId) { - if(phantomsList.TryGetValue(phantomId, out var r)) - return r; - return null; - } - /// - /// 通过ID查找世界中的刚体 - /// - /// ID - /// 如果未找到则返回null - public PhysicsBody GetBodyById(int bodyId) { - if(bodysDict.TryGetValue(bodyId, out var r)) - return r; - return null; - } - /// - /// 获取C++层句柄 - /// - /// - public IntPtr GetPtr() { return physicsWorldPtr; } - /// - /// 设置世界重力 - /// - /// - public void SetGravity(Vector3 gravity) { - Gravity = gravity; - if(physicsWorldPtr != IntPtr.Zero) - PhysicsApi.API.SetPhysicsWorldGravity(physicsWorldPtr, gravity); - } - /// - /// 获取世界重力 - /// - /// - public Vector3 GetGravity() { - return Gravity; - } - /// - /// 通过名称获取碰撞组信息 - /// - /// - /// - public int GetSystemGroup(string name) { - if(physicsWorldPtr == IntPtr.Zero || string.IsNullOrEmpty(name)) - return 0; - if(dictSystemGroup.TryGetValue(name, out var i)) - return i; - i = PhysicsApi.API.GetNewSystemGroup(physicsWorldPtr); - dictSystemGroup[name] = i; - return i; - } - - private Dictionary dictSystemGroup = new Dictionary(); - - public bool CastRay(Vector3 from, Vector3 to, out PhysicsRayCastResult result) { - return CastRay(from, to, out result); - } - public bool CastRay(Vector3 from, Vector3 to, int rayLayout, out PhysicsRayCastResult result) { - if(physicsWorldPtr == IntPtr.Zero) - throw new Exception("World not create or destroyed"); - - int count = PhysicsApi.API.PhysicsWorldRayCastBody(physicsWorldPtr, from, to, rayLayout, out var r); - if(count > 0) { - result = new PhysicsRayCastResult(); - result.bodyId = r.bodyId; - result.normal = new Vector3(r.normal[0], r.normal[1], r.normal[2]); - result.pos = new Vector3(r.pos[0], r.pos[1], r.pos[2]); - result.body = GetBodyById(result.bodyId); - } else { - result = null; - } - return count > 0; - } - public PhysicsRayCastResult[] CastRayAll(Vector3 from, Vector3 to, int rayLayout) { - if(physicsWorldPtr == IntPtr.Zero) - throw new Exception("World not create or destroyed"); - - int count = PhysicsApi.API.PhysicsWorldRayCastHit(physicsWorldPtr, from, to, rayLayout, true, out var r); - if(count > 0) { - var rs = new PhysicsRayCastResult[r.Length]; - var ix = 0; - foreach(var i in r) { - var result = new PhysicsRayCastResult(); - result.bodyId = i.bodyId; - result.normal = new Vector3(i.normal[0], i.normal[1], i.normal[2]); - result.pos = new Vector3(i.pos[0], i.pos[1], i.pos[2]); - result.body = GetBodyById(result.bodyId); - rs[ix++] = result; - } - } - - return new PhysicsRayCastResult[0]; - } - public PhysicsRayCastResult[] CastRayAll(Vector3 from, Vector3 to) { - return CastRayAll(from, to); - } - - public class PhysicsRayCastResult { - public Vector3 normal; - public Vector3 pos; - public float hitFraction; - public int bodyId; - public PhysicsBody body; - } - - private fnOnBodyContactEventCallback _OnBodyContactEventCallback; - private fnOnConstraintBreakingCallback _OnConstraintBreakingCallback; - private fnOnBodyTriggerEventCallback _OnBodyTriggerEventCallback; - private fnOnPhantomOverlapCallback _OnPhantomOverlapCallback; - private fnOnMaxPositionExceededCallback _OnMaxPositionExceededCallback; - - private void OnMaxPositionExceededCallback(IntPtr body, int id) { - var sbody = GetBodyById(id); - if(sbody != null) { - sbody.ForceDePhysics(); - if(sbody.DeactiveWhenLeaveBroadphase) - sbody.gameObject.SetActive(false); - sbody.onLeaveBroadphase?.Invoke(sbody); - } - } - private void OnConstraintBreakingCallback(IntPtr constraint, int id, float forceMagnitude, int removed) { - var c = GetConstraintById(id); - if(c != null && c.onBreaking != null) - c.onBreaking(c, forceMagnitude, removed); - } - private void OnBodyTiggerEventCallback(IntPtr body, IntPtr bodyOther, int id, int otherId, int ty) { - if(ty == 1) { - var sbody = GetBodyById(id); - var sbodyOther = GetBodyById(otherId); - if(sbody != null) - sbody.onTiggerEnter?.Invoke(sbody, sbodyOther); - } else { - var sbody = GetBodyById(id); - var sbodyOther = GetBodyById(otherId); - if(sbody != null) - sbody.onTiggerLeave?.Invoke(sbody, sbodyOther); - } - } - private void OnBodyPointContactCallback(IntPtr body, IntPtr bodyOther, int id, int otherId, IntPtr dataPtr) { - PhysicsBody sbody = GetBodyById(id), sbodyOther = GetBodyById(otherId); - if(sbody != null && sbodyOther != null && sbodyOther != sbody) - sbody.OnBodyPointContactCallback(sbodyOther, Marshal.PtrToStructure(dataPtr)); - } - private void OnPhantomOverlapCallback(IntPtr phantom, IntPtr bodyOther, int id, int otherId, int ty) { - PhysicsPhantom sphantom = GetPhantomById(id); - PhysicsBody sbodyOther = GetBodyById(otherId); - if(sphantom != null && sbodyOther != null) - sphantom.OnPhantomOverlapCallback(sbodyOther, ty); - } - } -} diff --git a/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs.meta b/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs.meta deleted file mode 100644 index a93fa04c..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/PhysicsWorld.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9545bef0f9b70a24ab689bb741fa2d08 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Utils.meta b/Assets/Scripts/PhysicsSystem/Script/Utils.meta deleted file mode 100644 index 06347196..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Utils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e818c9e44e49d045b9047000d402390 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs b/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs deleted file mode 100644 index 6fe36df0..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs +++ /dev/null @@ -1,10 +0,0 @@ - -using UnityEngine; - -public class SafetyChecks -{ - public static void CheckInRangeAndThrow(int v, Vector2 range, string name) { - if(v < range.x || v > range.y) - throw new System.Exception("Property " + name + " must in range " + range.x + "," + range.y); - } -} \ No newline at end of file diff --git a/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs.meta b/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs.meta deleted file mode 100644 index 0d368e7b..00000000 --- a/Assets/Scripts/PhysicsSystem/Script/Utils/SafetyChecks.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 16d0d5580afc41e4cbb4bb77dbd19f86 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaInfo.cs b/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaInfo.cs index 670d0966..65a01842 100644 --- a/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaInfo.cs +++ b/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Ballance2.LuaHelpers; using SLua; using UnityEngine; @@ -18,275 +19,361 @@ namespace Ballance2.Sys.Bridge.LuaWapper { + /// + /// lua 引入 var 信息 + /// + [CustomLuaClass] + [LuaApiDescription("lua 引入 var 信息")] + [Serializable] + public class LuaVarObjectInfo + { /// - /// lua 引入 var 信息 + /// 值类型 /// - [CustomLuaClass] - [LuaApiDescription("lua 引入 var 信息")] - [Serializable] - public class LuaVarObjectInfo - { - /// - /// 值类型 - /// - [Tooltip("值类型")] - [SerializeField] - [LuaApiDescription("值类型")] - public LuaVarObjectType Type; - /// - /// 值名称 - /// - [Tooltip("值名称")] - [SerializeField] - [LuaApiDescription("值名称")] - public string Name; - - public LuaVarObjectInfo() - { - Type = LuaVarObjectType.None; - Name = ""; - } + [Tooltip("值类型")] + [SerializeField] + [LuaApiDescription("值类型")] + public LuaVarObjectType Type; + /// + /// 值名称 + /// + [Tooltip("值名称")] + [SerializeField] + [LuaApiDescription("值名称")] + public string Name; - public override string ToString() { return Name; } + public LuaVarObjectInfo() + { + Type = LuaVarObjectType.None; + Name = ""; + } - [HideInInspector, SerializeField, DoNotToLua] - public Vector2 vector2; - [HideInInspector, SerializeField, DoNotToLua] - public Vector2Int vector2Int; - [HideInInspector, SerializeField, DoNotToLua] - public Vector3 vector3; - [HideInInspector, SerializeField, DoNotToLua] - public Vector3Int vector3Int; - [HideInInspector,SerializeField,DoNotToLua] - public Vector4 vector4; - [HideInInspector, SerializeField, DoNotToLua] - public Rect rect; - [HideInInspector, SerializeField, DoNotToLua] - public RectInt rectInt; - [HideInInspector, SerializeField, DoNotToLua] - public Gradient gradient; - [HideInInspector, SerializeField, DoNotToLua] - public int layer; - [HideInInspector, SerializeField, DoNotToLua] - public AnimationCurve curve; - [HideInInspector, SerializeField, DoNotToLua] - public Color color; - [HideInInspector, SerializeField, DoNotToLua] - public BoundsInt boundsInt; - [HideInInspector, SerializeField, DoNotToLua] - public Bounds bounds; - [HideInInspector, SerializeField, DoNotToLua] - public UnityEngine.Object objectVal; - [HideInInspector, SerializeField, DoNotToLua] - public GameObject gameObjectVal; - [HideInInspector, SerializeField, DoNotToLua] - public long longVal; - [HideInInspector, SerializeField, DoNotToLua] - public string stringVal; - [HideInInspector, SerializeField, DoNotToLua] - public int intVal; - [HideInInspector, SerializeField, DoNotToLua] - public double doubleVal; - [HideInInspector, SerializeField, DoNotToLua] - public bool boolVal; - [HideInInspector, SerializeField, DoNotToLua] - public float floatVal; - [HideInInspector, SerializeField, DoNotToLua] - public string componentClassVal; + public override string ToString() { return Name; } - public Component ComponentClass() { - switch (componentClassVal) - { - case "UnityEngine.Transform": return gameObjectVal.GetComponent(); - case "UnityEngine.RectTransform": return gameObjectVal.GetComponent(); - case "UnityEngine.Skybox": return gameObjectVal.GetComponent(); - case "UnityEngine.Light": return gameObjectVal.GetComponent(); - case "UnityEngine.Animation": return gameObjectVal.GetComponent(); - case "UnityEngine.Camera": return gameObjectVal.GetComponent(); - case "UnityEngine.MeshRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.MeshFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.Animator": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioSource": return gameObjectVal.GetComponent(); - case "UnityEngine.BillboardRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.LineRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.TrailRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.SkinnedMeshRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.SpriteRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.SpriteMask": return gameObjectVal.GetComponent(); - case "UnityEngine.OcclusionPortal": return gameObjectVal.GetComponent(); - case "UnityEngine.OcclusionArea": return gameObjectVal.GetComponent(); - case "UnityEngine.Rigidbody": return gameObjectVal.GetComponent(); - case "UnityEngine.Rigidbody2D": return gameObjectVal.GetComponent(); - case "UnityEngine.Tree": return gameObjectVal.GetComponent(); - case "UnityEngine.TextMesh": return gameObjectVal.GetComponent(); - case "UnityEngine.CanvasRenderer": return gameObjectVal.GetComponent(); - case "UnityEngine.WindZone": return gameObjectVal.GetComponent(); - case "UnityEngine.Cloth": return gameObjectVal.GetComponent(); - case "UnityEngine.CharacterController": return gameObjectVal.GetComponent(); - case "UnityEngine.MeshCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.CapsuleCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.BoxCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.SphereCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.TerrainCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.WheelCollider": return gameObjectVal.GetComponent(); - case "UnityEngine.HingeJoint": return gameObjectVal.GetComponent(); - case "UnityEngine.SpringJoint": return gameObjectVal.GetComponent(); - case "UnityEngine.FixedJoint": return gameObjectVal.GetComponent(); - case "UnityEngine.CharacterJoint": return gameObjectVal.GetComponent(); - case "UnityEngine.ConfigurableJoint": return gameObjectVal.GetComponent(); - case "UnityEngine.MonoBehaviour": return gameObjectVal.GetComponent(); - case "UnityEngine.FlareLayer": return gameObjectVal.GetComponent(); - case "UnityEngine.ReflectionProbe": return gameObjectVal.GetComponent(); - case "UnityEngine.Projector": return gameObjectVal.GetComponent(); - case "UnityEngine.LensFlare": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioBehaviour": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioLowPassFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioHighPassFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioReverbFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioListener": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioReverbZone": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioDistortionFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioEchoFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.AudioChorusFilter": return gameObjectVal.GetComponent(); - case "UnityEngine.ConstantForce": return gameObjectVal.GetComponent(); - case "UnityEngine.ArticulationBody": return gameObjectVal.GetComponent(); - case "UnityEngine.CanvasGroup": return gameObjectVal.GetComponent(); - case "UnityEngine.Canvas": return gameObjectVal.GetComponent(); - default: { - var c = gameObjectVal.GetComponent(componentClassVal); - if(c == null) - UnityEngine.Debug.LogWarning("Can't get component: " + - componentClassVal + " " + (c == null ? "(null)" : (c + "(" + c.GetType().Name + ")")) - + " May be should add reference in LuaVarObjectInfo?"); - return c; - } - } - } - public Vector2 Vector2() { return vector2; } - public Vector2Int Vector2Int() { return vector2Int; } - public Vector3 Vector3() { return vector3; } - public Vector3Int Vector3Int() { return vector3Int; } - public Vector4 Vector4() { return vector4; } - public Rect Rect() { return rect; } - public RectInt RectInt() { return rectInt; } - public Gradient Gradient() { return gradient; } - public int Layer() { return layer; } - public AnimationCurve Curve() { return curve; } - public Color Color() { return color; } - public BoundsInt BoundsInt() { return boundsInt; } - public Bounds Bounds() { return bounds; } - public UnityEngine.Object Object() { return objectVal; } - public UnityEngine.Object GameObject() { return gameObjectVal; } - public long Long() { return longVal; } - public string String() { return stringVal ; } - public int Int() { return intVal; } - public double Double() { return doubleVal; } - public bool Bool() { return boolVal; } - public float Float() { return floatVal; } + [HideInInspector, SerializeField, DoNotToLua] + public Vector2 vector2; + [HideInInspector, SerializeField, DoNotToLua] + public Vector2Int vector2Int; + [HideInInspector, SerializeField, DoNotToLua] + public Vector3 vector3; + [HideInInspector, SerializeField, DoNotToLua] + public Vector3Int vector3Int; + [HideInInspector, SerializeField, DoNotToLua] + public Vector4 vector4; + [HideInInspector, SerializeField, DoNotToLua] + public Rect rect; + [HideInInspector, SerializeField, DoNotToLua] + public RectInt rectInt; + [HideInInspector, SerializeField, DoNotToLua] + public Gradient gradient; + [HideInInspector, SerializeField, DoNotToLua] + public int layer; + [HideInInspector, SerializeField, DoNotToLua] + public AnimationCurve curve; + [HideInInspector, SerializeField, DoNotToLua] + public Color color; + [HideInInspector, SerializeField, DoNotToLua] + public BoundsInt boundsInt; + [HideInInspector, SerializeField, DoNotToLua] + public Bounds bounds; + [HideInInspector, SerializeField, DoNotToLua] + public UnityEngine.Object objectVal; + [HideInInspector, SerializeField, DoNotToLua] + public GameObject gameObjectVal; + [HideInInspector, SerializeField, DoNotToLua] + public long longVal; + [HideInInspector, SerializeField, DoNotToLua] + public string stringVal; + [HideInInspector, SerializeField, DoNotToLua] + public int intVal; + [HideInInspector, SerializeField, DoNotToLua] + public double doubleVal; + [HideInInspector, SerializeField, DoNotToLua] + public bool boolVal; + [HideInInspector, SerializeField, DoNotToLua] + public float floatVal; + [HideInInspector, SerializeField, DoNotToLua] + public string componentClassVal; - /// - /// 更新数据到 Lua - /// - /// self - [LuaApiDescription("更新数据到 Lua")] - [LuaApiParamDescription("LuaSelf", "self")] - public void UpdateToLua(LuaTable LuaSelf) + public Component ComponentClass() + { + if(componentClassVal.Contains(':')) { + Component[] components = null; + string[] buf = componentClassVal.Split(':'); + string componentClassValSp = buf[0]; + int componentClassValIndex = int.Parse(buf[1]); + switch (componentClassValSp) { - switch (Type) + case "UnityEngine.Transform": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.RectTransform": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Skybox": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Light": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Animation": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Camera": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.MeshRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.MeshFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Animator": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioSource": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.BillboardRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.LineRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.TrailRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.SkinnedMeshRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.SpriteRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.SpriteMask": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.OcclusionPortal": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.OcclusionArea": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Rigidbody": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Rigidbody2D": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Tree": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.TextMesh": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.CanvasRenderer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.WindZone": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Cloth": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.CharacterController": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.MeshCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.CapsuleCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.BoxCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.SphereCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.TerrainCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.WheelCollider": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.HingeJoint": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.SpringJoint": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.FixedJoint": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.CharacterJoint": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.ConfigurableJoint": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.MonoBehaviour": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.FlareLayer": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.ReflectionProbe": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Projector": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.LensFlare": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioBehaviour": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioLowPassFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioHighPassFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioReverbFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioListener": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioReverbZone": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioDistortionFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioEchoFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.AudioChorusFilter": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.ConstantForce": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.ArticulationBody": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.CanvasGroup": components = gameObjectVal.GetComponents(); break; + case "UnityEngine.Canvas": components = gameObjectVal.GetComponents(); break; + default: { - case LuaVarObjectType.None: LuaSelf[Name] = null; break; - case LuaVarObjectType.Vector2: LuaSelf[Name] = Vector2(); break; - case LuaVarObjectType.Vector2Int: LuaSelf[Name] = Vector2Int(); break; - case LuaVarObjectType.Vector3: LuaSelf[Name] = Vector3(); break; - case LuaVarObjectType.Vector3Int: LuaSelf[Name] = Vector3Int(); break; - case LuaVarObjectType.Vector4: LuaSelf[Name] = Vector4(); break; - case LuaVarObjectType.Rect: LuaSelf[Name] = Rect(); break; - case LuaVarObjectType.RectInt: LuaSelf[Name] = RectInt(); break; - case LuaVarObjectType.Gradient: LuaSelf[Name] = Gradient(); break; - case LuaVarObjectType.Layer: LuaSelf[Name] = Layer(); break; - case LuaVarObjectType.Curve: LuaSelf[Name] = Curve(); break; - case LuaVarObjectType.Color: LuaSelf[Name] = Color(); break; - case LuaVarObjectType.BoundsInt: LuaSelf[Name] = BoundsInt(); break; - case LuaVarObjectType.Bounds: LuaSelf[Name] = Bounds(); break; - case LuaVarObjectType.Object: LuaSelf[Name] = Object(); break; - case LuaVarObjectType.GameObject: LuaSelf[Name] = GameObject(); break; - case LuaVarObjectType.Long: LuaSelf[Name] = Long(); break; - case LuaVarObjectType.Int: LuaSelf[Name] = Int(); break; - case LuaVarObjectType.String: LuaSelf[Name] = String(); break; - case LuaVarObjectType.Double: LuaSelf[Name] = Double(); break; - case LuaVarObjectType.Bool: LuaSelf[Name] = Bool(); break; - case LuaVarObjectType.Float: LuaSelf[Name] = Float(); break; - case LuaVarObjectType.ComponentClass: LuaSelf[Name] = ComponentClass(); break; + var c = gameObjectVal.GetComponents(); + if (c != null) { + foreach(var t in c) { + if(t.GetType().FullName == componentClassValSp) + return t; + } + } + + UnityEngine.Debug.LogWarning("Can't get component: " + componentClassVal + " May be should add reference in LuaVarObjectInfo?"); + return null; } } - /// - /// 从 Lua 获取数据 - /// - /// self - [LuaApiDescription("从 Lua 获取数据")] - [LuaApiParamDescription("LuaSelf", "self")] - public void UpdateFromLua(LuaTable LuaSelf) + + if(components != null && componentClassValIndex < components.Length) + return components[componentClassValIndex]; + + UnityEngine.Debug.LogWarning("Can't get component: " + componentClassVal + " May be should add reference in LuaVarObjectInfo?"); + return null; + } else { + switch (componentClassVal) { - switch (Type) + case "UnityEngine.Transform": return gameObjectVal.GetComponent(); + case "UnityEngine.RectTransform": return gameObjectVal.GetComponent(); + case "UnityEngine.Skybox": return gameObjectVal.GetComponent(); + case "UnityEngine.Light": return gameObjectVal.GetComponent(); + case "UnityEngine.Animation": return gameObjectVal.GetComponent(); + case "UnityEngine.Camera": return gameObjectVal.GetComponent(); + case "UnityEngine.MeshRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.MeshFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.Animator": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioSource": return gameObjectVal.GetComponent(); + case "UnityEngine.BillboardRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.LineRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.TrailRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.SkinnedMeshRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.SpriteRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.SpriteMask": return gameObjectVal.GetComponent(); + case "UnityEngine.OcclusionPortal": return gameObjectVal.GetComponent(); + case "UnityEngine.OcclusionArea": return gameObjectVal.GetComponent(); + case "UnityEngine.Rigidbody": return gameObjectVal.GetComponent(); + case "UnityEngine.Rigidbody2D": return gameObjectVal.GetComponent(); + case "UnityEngine.Tree": return gameObjectVal.GetComponent(); + case "UnityEngine.TextMesh": return gameObjectVal.GetComponent(); + case "UnityEngine.CanvasRenderer": return gameObjectVal.GetComponent(); + case "UnityEngine.WindZone": return gameObjectVal.GetComponent(); + case "UnityEngine.Cloth": return gameObjectVal.GetComponent(); + case "UnityEngine.CharacterController": return gameObjectVal.GetComponent(); + case "UnityEngine.MeshCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.CapsuleCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.BoxCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.SphereCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.TerrainCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.WheelCollider": return gameObjectVal.GetComponent(); + case "UnityEngine.HingeJoint": return gameObjectVal.GetComponent(); + case "UnityEngine.SpringJoint": return gameObjectVal.GetComponent(); + case "UnityEngine.FixedJoint": return gameObjectVal.GetComponent(); + case "UnityEngine.CharacterJoint": return gameObjectVal.GetComponent(); + case "UnityEngine.ConfigurableJoint": return gameObjectVal.GetComponent(); + case "UnityEngine.MonoBehaviour": return gameObjectVal.GetComponent(); + case "UnityEngine.FlareLayer": return gameObjectVal.GetComponent(); + case "UnityEngine.ReflectionProbe": return gameObjectVal.GetComponent(); + case "UnityEngine.Projector": return gameObjectVal.GetComponent(); + case "UnityEngine.LensFlare": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioBehaviour": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioLowPassFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioHighPassFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioReverbFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioListener": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioReverbZone": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioDistortionFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioEchoFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.AudioChorusFilter": return gameObjectVal.GetComponent(); + case "UnityEngine.ConstantForce": return gameObjectVal.GetComponent(); + case "UnityEngine.ArticulationBody": return gameObjectVal.GetComponent(); + case "UnityEngine.CanvasGroup": return gameObjectVal.GetComponent(); + case "UnityEngine.Canvas": return gameObjectVal.GetComponent(); + default: { - case LuaVarObjectType.Vector2: vector2 = (Vector2)LuaSelf[Name]; break; - case LuaVarObjectType.Vector2Int: vector2Int = (Vector2Int)LuaSelf[Name]; break; - case LuaVarObjectType.Vector3: vector3 = (Vector3)LuaSelf[Name]; break; - case LuaVarObjectType.Vector3Int: vector3Int = (Vector3Int)LuaSelf[Name]; break; - case LuaVarObjectType.Vector4: vector4 = (Vector4)LuaSelf[Name]; break; - case LuaVarObjectType.Rect: rect = (Rect)LuaSelf[Name]; break; - case LuaVarObjectType.RectInt: rectInt = (RectInt)LuaSelf[Name]; ; break; - case LuaVarObjectType.Gradient: gradient = (Gradient)LuaSelf[Name]; break; - case LuaVarObjectType.Layer: intVal = (int)LuaSelf[Name]; break; - case LuaVarObjectType.Curve: curve = (AnimationCurve)LuaSelf[Name]; break; - case LuaVarObjectType.Color: color = (Color)LuaSelf[Name]; break; - case LuaVarObjectType.BoundsInt: boundsInt = (BoundsInt)LuaSelf[Name]; break; - case LuaVarObjectType.Bounds: bounds = (Bounds)LuaSelf[Name]; break; - case LuaVarObjectType.Object: objectVal = (UnityEngine.Object)LuaSelf[Name]; break; - case LuaVarObjectType.GameObject: gameObjectVal = (GameObject)LuaSelf[Name]; break; - case LuaVarObjectType.Long: longVal = (long)LuaSelf[Name]; break; - case LuaVarObjectType.Int: intVal = (int)LuaSelf[Name]; break; - case LuaVarObjectType.String: stringVal = (string)LuaSelf[Name]; break; - case LuaVarObjectType.Double: doubleVal = (double)LuaSelf[Name]; break; - case LuaVarObjectType.Bool: boolVal = (bool)LuaSelf[Name]; break; - case LuaVarObjectType.Float: floatVal = (float)LuaSelf[Name]; break; + var c = gameObjectVal.GetComponent(componentClassVal); + if (c == null) + UnityEngine.Debug.LogWarning("Can't get component: " + + componentClassVal + " " + (c == null ? "(null)" : (c + "(" + c.GetType().Name + ")")) + + " May be should add reference in LuaVarObjectInfo?"); + return c; } } + } } + public Vector2 Vector2() { return vector2; } + public Vector2Int Vector2Int() { return vector2Int; } + public Vector3 Vector3() { return vector3; } + public Vector3Int Vector3Int() { return vector3Int; } + public Vector4 Vector4() { return vector4; } + public Rect Rect() { return rect; } + public RectInt RectInt() { return rectInt; } + public Gradient Gradient() { return gradient; } + public int Layer() { return layer; } + public AnimationCurve Curve() { return curve; } + public Color Color() { return color; } + public BoundsInt BoundsInt() { return boundsInt; } + public Bounds Bounds() { return bounds; } + public UnityEngine.Object Object() { return objectVal; } + public UnityEngine.Object GameObject() { return gameObjectVal; } + public long Long() { return longVal; } + public string String() { return stringVal; } + public int Int() { return intVal; } + public double Double() { return doubleVal; } + public bool Bool() { return boolVal; } + public float Float() { return floatVal; } /// - /// 指定引入数据的类型 + /// 更新数据到 Lua /// - [Serializable] - [CustomLuaClass] - [LuaApiDescription("指定引入数据的类型")] - public enum LuaVarObjectType + /// self + [LuaApiDescription("更新数据到 Lua")] + [LuaApiParamDescription("LuaSelf", "self")] + public void UpdateToLua(LuaTable LuaSelf) { - None = 0, - Vector2, - Vector2Int, - Vector3, - Vector3Int, - Vector4, - Rect, - RectInt, - Gradient, - Layer, - Curve, - Color, - BoundsInt, - Bounds, - Object, - GameObject, - ComponentClass, - - Long, - Int, - String, - Double, - Bool, - Float, + switch (Type) + { + case LuaVarObjectType.None: LuaSelf[Name] = null; break; + case LuaVarObjectType.Vector2: LuaSelf[Name] = Vector2(); break; + case LuaVarObjectType.Vector2Int: LuaSelf[Name] = Vector2Int(); break; + case LuaVarObjectType.Vector3: LuaSelf[Name] = Vector3(); break; + case LuaVarObjectType.Vector3Int: LuaSelf[Name] = Vector3Int(); break; + case LuaVarObjectType.Vector4: LuaSelf[Name] = Vector4(); break; + case LuaVarObjectType.Rect: LuaSelf[Name] = Rect(); break; + case LuaVarObjectType.RectInt: LuaSelf[Name] = RectInt(); break; + case LuaVarObjectType.Gradient: LuaSelf[Name] = Gradient(); break; + case LuaVarObjectType.Layer: LuaSelf[Name] = Layer(); break; + case LuaVarObjectType.Curve: LuaSelf[Name] = Curve(); break; + case LuaVarObjectType.Color: LuaSelf[Name] = Color(); break; + case LuaVarObjectType.BoundsInt: LuaSelf[Name] = BoundsInt(); break; + case LuaVarObjectType.Bounds: LuaSelf[Name] = Bounds(); break; + case LuaVarObjectType.Object: LuaSelf[Name] = Object(); break; + case LuaVarObjectType.GameObject: LuaSelf[Name] = GameObject(); break; + case LuaVarObjectType.Long: LuaSelf[Name] = Long(); break; + case LuaVarObjectType.Int: LuaSelf[Name] = Int(); break; + case LuaVarObjectType.String: LuaSelf[Name] = String(); break; + case LuaVarObjectType.Double: LuaSelf[Name] = Double(); break; + case LuaVarObjectType.Bool: LuaSelf[Name] = Bool(); break; + case LuaVarObjectType.Float: LuaSelf[Name] = Float(); break; + case LuaVarObjectType.ComponentClass: LuaSelf[Name] = ComponentClass(); break; + } + } + /// + /// 从 Lua 获取数据 + /// + /// self + [LuaApiDescription("从 Lua 获取数据")] + [LuaApiParamDescription("LuaSelf", "self")] + public void UpdateFromLua(LuaTable LuaSelf) + { + switch (Type) + { + case LuaVarObjectType.Vector2: vector2 = (Vector2)LuaSelf[Name]; break; + case LuaVarObjectType.Vector2Int: vector2Int = (Vector2Int)LuaSelf[Name]; break; + case LuaVarObjectType.Vector3: vector3 = (Vector3)LuaSelf[Name]; break; + case LuaVarObjectType.Vector3Int: vector3Int = (Vector3Int)LuaSelf[Name]; break; + case LuaVarObjectType.Vector4: vector4 = (Vector4)LuaSelf[Name]; break; + case LuaVarObjectType.Rect: rect = (Rect)LuaSelf[Name]; break; + case LuaVarObjectType.RectInt: rectInt = (RectInt)LuaSelf[Name]; ; break; + case LuaVarObjectType.Gradient: gradient = (Gradient)LuaSelf[Name]; break; + case LuaVarObjectType.Layer: intVal = (int)LuaSelf[Name]; break; + case LuaVarObjectType.Curve: curve = (AnimationCurve)LuaSelf[Name]; break; + case LuaVarObjectType.Color: color = (Color)LuaSelf[Name]; break; + case LuaVarObjectType.BoundsInt: boundsInt = (BoundsInt)LuaSelf[Name]; break; + case LuaVarObjectType.Bounds: bounds = (Bounds)LuaSelf[Name]; break; + case LuaVarObjectType.Object: objectVal = (UnityEngine.Object)LuaSelf[Name]; break; + case LuaVarObjectType.GameObject: gameObjectVal = (GameObject)LuaSelf[Name]; break; + case LuaVarObjectType.Long: longVal = (long)LuaSelf[Name]; break; + case LuaVarObjectType.Int: intVal = (int)LuaSelf[Name]; break; + case LuaVarObjectType.String: stringVal = (string)LuaSelf[Name]; break; + case LuaVarObjectType.Double: doubleVal = (double)LuaSelf[Name]; break; + case LuaVarObjectType.Bool: boolVal = (bool)LuaSelf[Name]; break; + case LuaVarObjectType.Float: floatVal = (float)LuaSelf[Name]; break; + } } + } + + /// + /// 指定引入数据的类型 + /// + [Serializable] + [CustomLuaClass] + [LuaApiDescription("指定引入数据的类型")] + public enum LuaVarObjectType + { + None = 0, + Vector2, + Vector2Int, + Vector3, + Vector3Int, + Vector4, + Rect, + RectInt, + Gradient, + Layer, + Curve, + Color, + BoundsInt, + Bounds, + Object, + GameObject, + ComponentClass, + + Long, + Int, + String, + Double, + Bool, + Float, + } } diff --git a/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaObjectHost.cs b/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaObjectHost.cs index 9d28e81b..e06df304 100644 --- a/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaObjectHost.cs +++ b/Assets/Scripts/Sys/Bridge/LuaWapper/GameLuaObjectHost.cs @@ -214,7 +214,7 @@ public LuaTable CreateClass() } LuaDebugMini.LuaState.doString(File.ReadAllText(path)); - classInit = LuaDebugMini.LuaState.getFunction("CreateClass_" + LuaClassName); + classInit = LuaDebugMini.LuaState.getFunction("CreateClass:" + LuaClassName); #else Log.E(TAG + ":" + Name, "DebugLoadScript can only use in editor"); #endif diff --git a/Assets/Scripts/Sys/GameSystem.cs b/Assets/Scripts/Sys/GameSystem.cs index e4596201..b468f730 100644 --- a/Assets/Scripts/Sys/GameSystem.cs +++ b/Assets/Scripts/Sys/GameSystem.cs @@ -8,7 +8,6 @@ using Ballance2.Sys.Services; using Ballance2.Sys.Utils; using Ballance2.Utils; -using PhysicsRT; using System.Collections.Generic; using UnityEngine; @@ -211,7 +210,7 @@ public static void Init() } //Init physics system - PhysicsSystemInit.Init(); + BallancePhysics.PhysicsSystemInit.Init(); //Init system services RegSystemService("GameMediator", new GameMediator()); diff --git a/Assets/Scripts/Sys/Package/GamePackage.cs b/Assets/Scripts/Sys/Package/GamePackage.cs index 7eeaabab..6aa0b4be 100644 --- a/Assets/Scripts/Sys/Package/GamePackage.cs +++ b/Assets/Scripts/Sys/Package/GamePackage.cs @@ -498,7 +498,7 @@ private void DestroyLuaState() /// /// 导入 Lua 类到当前模块虚拟机中。 - /// 注意，类函数以 “CreateClass_类名” 开头， + /// 注意，类函数以 “CreateClass:类名” 开头， /// 关于 Lua 类，请参考 Docs/LuaClass 。 /// /// 类名 @@ -517,7 +517,11 @@ public LuaFunction RequireLuaClass(string className) if (requiredLuaClasses.TryGetValue(className, out classInit)) return classInit; - classInit = PackageLuaState.getFunction("CreateClass_" + className); + var CreateClass = (PackageLuaState["CreateClass"] as LuaTable); + if(CreateClass == null) + throw new MissingReferenceException("This shouldn't happen: CreateClass is null! "); + + classInit = CreateClass[className] as LuaFunction; if (classInit != null) { requiredLuaClasses.Add(className, classInit); @@ -539,11 +543,11 @@ public LuaFunction RequireLuaClass(string className) throw new Exception(PackageName + " 无法导入 Lua class : " + e.Message); } - classInit = PackageLuaState.getFunction("CreateClass_" + className); + classInit = CreateClass[className] as LuaFunction; if (classInit == null) { throw new MissingReferenceException(PackageName + " 无法导入 Lua class : " + - className + ", 未找到初始类函数: CreateClass_" + className); + className + ", 未找到初始类函数: CreateClass:" + className); } requiredLuaClasses.Add(className, classInit); @@ -555,7 +559,7 @@ public LuaFunction RequireLuaClass(string className) /// LUA文件名 /// 如果对应文件已导入，则返回true，否则返回false /// - /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass_* ，则抛出 MissingReferenceException 异常。 + /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass:* ，则抛出 MissingReferenceException 异常。 /// /// /// 如果Lua执行失败，则抛出此异常。 @@ -569,7 +573,7 @@ public LuaFunction RequireLuaClass(string className) /// LUA文件名 /// 如果对应文件已导入，则返回true，否则返回false /// - /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass_* ，则抛出 MissingReferenceException 异常。 + /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass:* ，则抛出 MissingReferenceException 异常。 /// /// /// 如果Lua执行失败，则抛出此异常。 @@ -583,7 +587,7 @@ public LuaFunction RequireLuaClass(string className) /// LUA文件名 /// 如果对应文件已导入，则返回true，否则返回false /// - /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass_* ，则抛出 MissingReferenceException 异常。 + /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass:* ，则抛出 MissingReferenceException 异常。 /// /// /// 如果Lua执行失败，则抛出此异常。 @@ -597,7 +601,7 @@ public LuaFunction RequireLuaClass(string className) /// LUA文件名 /// 如果对应文件已导入，则返回true，否则返回false /// - /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass_* ，则抛出 MissingReferenceException 异常。 + /// 如果没有在当前模块包中找到类文件或是类创建函数 CreateClass:* ，则抛出 MissingReferenceException 异常。 /// /// /// 如果Lua执行失败，则抛出此异常。 diff --git a/Assets/Scripts/Test/Test.cs b/Assets/Scripts/Test/Test.cs index 74a3bf76..3c7be721 100644 --- a/Assets/Scripts/Test/Test.cs +++ b/Assets/Scripts/Test/Test.cs @@ -1,5 +1,4 @@ using UnityEngine; -using PhysicsRT; using UnityEngine.EventSystems; using System.Collections; @@ -162,12 +161,12 @@ public void Shoot(bool center) go.transform.rotation = Random.rotation; //发射数来的球沿着摄像机到鼠标点击的方向进行移动 - PhysicsBody ball = go.GetComponent(); - StartCoroutine(LateAddForce(ball, shootForce * ray.direction)); + //PhysicsBody ball = go.GetComponent(); + //StartCoroutine(LateAddForce(ball, shootForce * ray.direction)); } - private IEnumerator LateAddForce(PhysicsBody ball, Vector3 f) { - yield return new WaitForSeconds(0.1f); - ball.ApplyLinearImpulse(f); - } + //private IEnumerator LateAddForce(PhysicsBody ball, Vector3 f) { + // yield return new WaitForSeconds(0.1f); + //ball.ApplyLinearImpulse(f); + //} } \ No newline at end of file diff --git a/Assets/Scripts/Test/TimeCheck.cs b/Assets/Scripts/Test/TimeCheck.cs index 1032b1e9..a7f911a7 100644 --- a/Assets/Scripts/Test/TimeCheck.cs +++ b/Assets/Scripts/Test/TimeCheck.cs @@ -1,15 +1,15 @@ -using PhysicsRT; using UnityEngine; +using Ballance2.Game; namespace Ballance2 { public class TimeCheck : MonoBehaviour { - public PhysicsBody currentBody = null; + public GameObject currentBody = null; public float currentTime = 0; - public PhysicsPhantom startTigger = null; - public PhysicsPhantom endTigger = null; + public TiggerTester startTigger = null; + public TiggerTester endTigger = null; public bool isTesting = false; public bool isTestFinish = false; @@ -17,14 +17,14 @@ public class TimeCheck : MonoBehaviour void Start() { - startTigger.onOverlappingCollidableAdd += (self, other) => { + startTigger.onTriggerEnter += (self, other) => { currentBody = other; currentTime = 0; startGuiTick = 50; isTesting = true; isTestFinish = false; }; - endTigger.onOverlappingCollidableAdd += (self, other) => { + endTigger.onTriggerEnter += (self, other) => { if(currentBody == other) { isTesting = false; isTestFinish = true; diff --git a/Assets/Textures/Game/Floor_Side.bmp b/Assets/Textures/Game/Floor_Side.bmp deleted file mode 100644 index 9bcdc252..00000000 Binary files a/Assets/Textures/Game/Floor_Side.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Side.bmp.meta b/Assets/Textures/Game/Floor_Side.bmp.meta deleted file mode 100644 index 919755e7..00000000 --- a/Assets/Textures/Game/Floor_Side.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 18fa43b24d80c8348ab05519b589a903 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Game/Floor_Top_Borderless.bmp b/Assets/Textures/Game/Floor_Top_Borderless.bmp deleted file mode 100644 index 3c5ae9b0..00000000 Binary files a/Assets/Textures/Game/Floor_Top_Borderless.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Top_Borderless.bmp.meta b/Assets/Textures/Game/Floor_Top_Borderless.bmp.meta deleted file mode 100644 index 21b95dc6..00000000 --- a/Assets/Textures/Game/Floor_Top_Borderless.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: a3e16097f776c414695e90bcb99532df -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Game/Floor_Top_Checkpoint.bmp b/Assets/Textures/Game/Floor_Top_Checkpoint.bmp deleted file mode 100644 index ad202041..00000000 Binary files a/Assets/Textures/Game/Floor_Top_Checkpoint.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Top_Checkpoint.bmp.meta b/Assets/Textures/Game/Floor_Top_Checkpoint.bmp.meta deleted file mode 100644 index 460a54d9..00000000 --- a/Assets/Textures/Game/Floor_Top_Checkpoint.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 5bfd1db5d47338142aa4bb6e64ed7211 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Game/Floor_Top_Flat.bmp b/Assets/Textures/Game/Floor_Top_Flat.bmp deleted file mode 100644 index b72f3d43..00000000 Binary files a/Assets/Textures/Game/Floor_Top_Flat.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Top_Flat.bmp.meta b/Assets/Textures/Game/Floor_Top_Flat.bmp.meta deleted file mode 100644 index 383c94ad..00000000 --- a/Assets/Textures/Game/Floor_Top_Flat.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 5c94676e482621e489739862a685fdd5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Game/Floor_Top_Profil.bmp b/Assets/Textures/Game/Floor_Top_Profil.bmp deleted file mode 100644 index be9ab16e..00000000 Binary files a/Assets/Textures/Game/Floor_Top_Profil.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Top_Profil.bmp.meta b/Assets/Textures/Game/Floor_Top_Profil.bmp.meta deleted file mode 100644 index bc6d1a9b..00000000 --- a/Assets/Textures/Game/Floor_Top_Profil.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 0e85ff7d34728db4ca033750083e4d33 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp b/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp deleted file mode 100644 index 41a2812d..00000000 Binary files a/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp and /dev/null differ diff --git a/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp.meta b/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp.meta deleted file mode 100644 index c6cccf45..00000000 --- a/Assets/Textures/Game/Floor_Top_ProfilFlat.bmp.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 9cba49f88bfaa2e478e2d72761f3a25e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Docs/Help/LuaClass.md b/Docs/Help/LuaClass.md index 8a253add..2a3a4098 100644 --- a/Docs/Help/LuaClass.md +++ b/Docs/Help/LuaClass.md @@ -10,7 +10,7 @@ -- 更多变量... } -function CreateClass_类名() +function CreateClass:类名() function 类名:new(o) o = o or {} diff --git a/Docs/SystemModding/LuaPackageClass.md b/Docs/SystemModding/LuaPackageClass.md index 227b91a2..dfc78710 100644 --- a/Docs/SystemModding/LuaPackageClass.md +++ b/Docs/SystemModding/LuaPackageClass.md @@ -13,7 +13,7 @@ MyClass = { --自定义属性 } -function CreateClass_MyClass() +function CreateClass:MyClass() function MyClass:new(o) o = o or {} setmetatable(o, self) diff --git a/ResourceFactory/P_Modul_01_Col01_Mesh.mtl b/ResourceFactory/P_Modul_01_Col01_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Col02_Mesh.mtl b/ResourceFactory/P_Modul_01_Col02_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Col03_Mesh.mtl b/ResourceFactory/P_Modul_01_Col03_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Filler.mtl b/ResourceFactory/P_Modul_01_Filler.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Rinne.mtl b/ResourceFactory/P_Modul_01_Rinne.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Rinne_01_Mesh.mtl b/ResourceFactory/P_Modul_01_Rinne_01_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Rinne_02_Mesh.mtl b/ResourceFactory/P_Modul_01_Rinne_02_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_01_Rinne_03_Mesh.mtl b/ResourceFactory/P_Modul_01_Rinne_03_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_41_Col1_Mesh.mtl b/ResourceFactory/P_Modul_41_Col1_Mesh.mtl new file mode 100644 index 00000000..e69de29b diff --git a/ResourceFactory/P_Modul_41_Col1_Mesh.obj b/ResourceFactory/P_Modul_41_Col1_Mesh.obj new file mode 100644 index 00000000..97dc955e --- /dev/null +++ b/ResourceFactory/P_Modul_41_Col1_Mesh.obj @@ -0,0 +1,86 @@ +mtllib E:\Programming\GameProjects\Ballance\ResourceFactory\P_Modul_41_Col1_Mesh.mtl +v -2.47676 1.35115 -2.48465 +v -2.47676 1.35114 2.51548 +v 2.52545 1.35114 2.51548 +v 2.52545 1.35115 -2.48465 +v -1.96089 -0.359228 -2.48465 +v 2.00958 -0.359228 -2.48465 +v 2.00958 -0.359228 2.51548 +v -1.96089 -0.359228 2.51548 +v -2.47676 1.35115 -2.48465 +v 2.52545 1.35115 -2.48465 +v 2.00958 -0.359228 -2.48465 +v -1.96089 -0.359228 -2.48465 +v 2.52545 1.35115 -2.48465 +v 2.52545 1.35114 2.51548 +v 2.00958 -0.359228 2.51548 +v 2.00958 -0.359228 -2.48465 +v 2.52545 1.35114 2.51548 +v -2.47676 1.35114 2.51548 +v -1.96089 -0.359228 2.51548 +v 2.00958 -0.359228 2.51548 +v -2.47676 1.35114 2.51548 +v -2.47676 1.35115 -2.48465 +v -1.96089 -0.359228 -2.48465 +v -1.96089 -0.359228 2.51548 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vt 0.000000 -0.000000 0 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn 9.09217e-015 1.00016 9.53805e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.72772e-015 -1.00022 -9.53857e-008 +vn -5.3844e-008 1.37494e-007 -0.999773 +vn -4.76682e-008 1.5379e-007 -1.00012 +vn -5.3844e-008 1.37494e-007 -0.999773 +vn -6.0043e-008 1.21274e-007 -0.999917 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 0.957203 -0.288706 -2.75325e-008 +vn 5.3844e-008 -1.41234e-007 0.999773 +vn 4.76682e-008 -1.25035e-007 1.00012 +vn 5.3844e-008 -1.41234e-007 0.999773 +vn 6.0043e-008 -1.57494e-007 0.999917 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +vn -0.957203 -0.288706 -2.75325e-008 +g P_Modul_41_Col1_Mesh +f 2/2/2 3/3/3 1/1/1 +f 4/4/4 1/1/1 3/3/3 +f 6/6/6 7/7/7 5/5/5 +f 8/8/8 5/5/5 7/7/7 +f 10/10/10 11/11/11 9/9/9 +f 12/12/12 9/9/9 11/11/11 +f 14/14/14 15/15/15 13/13/13 +f 16/16/16 13/13/13 15/15/15 +f 18/18/18 19/19/19 17/17/17 +f 20/20/20 17/17/17 19/19/19 +f 22/22/22 23/23/23 21/21/21 +f 24/24/24 21/21/21 23/23/23 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 111fc582..f1df75a0 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 5b00505e00545a595c595a2343215944414e1b297e7f2332742f4d62b5e4603d flags: 0 RecentlyUsedSceneGuid-1: - value: 5b00505e00545a595c595a2343215944414e1b297e7f2332742f4d62b5e4603d + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 224247031146466b011b0b2b1e30103217030c2629203332621b291be3ee3034e7f479cde23730736b3ddc39083b022bfb050728f9061a041f0bf31a5fea1e1a05dc diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index e75959f7..f723f6f6 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Game + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 76 + controlID: 94 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -94,8 +94,8 @@ MonoBehaviour: y: 0 width: 362 height: 561 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -111,7 +111,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -120,16 +120,16 @@ MonoBehaviour: y: 561 width: 1464 height: 386 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 20} - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -225,7 +225,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 77 + controlID: 95 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -250,7 +250,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 78 + controlID: 96 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -261,7 +261,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -272,13 +272,13 @@ MonoBehaviour: height: 561 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} - {fileID: 19} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -554,7 +554,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 35902 + m_LastSelectedObjectID: 31536 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -597,22 +597,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Plugins + - Assets/Game/Prefabs/Core m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Plugins + - Assets/Game/Prefabs/Core m_LastFoldersGridSize: -1 m_LastProjectPath: E:\Programming\GameProjects\Ballance m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d85d0000 - m_LastClickedID: 24024 - m_ExpandedIDs: 00000000765d0000785d00007a5d00007c5d00007e5d0000805d0000825d0000845d0000865d0000885d00008a5d00008c5d00008e5d0000905d0000925d0000945d0000 + m_SelectedIDs: 92720000 + m_LastClickedID: 29330 + m_ExpandedIDs: 0000000036720000387200003a7200003c7200003e72000040720000427200004472000046720000487200004a7200004c7200004e72000050720000527200005472000056720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -640,7 +640,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000765d0000785d00007a5d00007c5d00007e5d0000805d0000825d0000845d0000865d0000885d00008a5d00008c5d00008e5d0000905d0000925d0000945d0000 + m_ExpandedIDs: 0000000036720000387200003a7200003c7200003e72000040720000427200004472000046720000487200004a7200004c7200004e72000050720000527200005472000056720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -667,7 +667,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -770,9 +770,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0a5d0000 - m_LastClickedID: 23818 - m_ExpandedIDs: 16fbffff + m_SelectedIDs: 02730000 + m_LastClickedID: 29442 + m_ExpandedIDs: dcf8ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -875,7 +875,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -897,7 +897,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -908,7 +908,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Camera index: 1 @@ -919,7 +919,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -930,7 +930,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -941,7 +941,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -952,7 +952,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -963,7 +963,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -974,7 +974,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -985,7 +985,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -996,7 +996,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -1014,17 +1014,17 @@ MonoBehaviour: layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_OverrideSceneCullingMask: 0 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.6218166, y: -0.33245373, z: 3.7370129} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 2.6218166, y: -0.33245373, z: 3.7370129} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1036,7 +1036,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -1071,13 +1071,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.093466595, y: -0.81505764, z: 0.13723242, w: -0.5550928} + m_Target: {x: -0.24041632, y: -0.7251848, z: 0.30729517, w: -0.5673565} speed: 2 - m_Value: {x: -0.09346586, y: -0.8150512, z: 0.13723135, w: -0.55508846} + m_Value: {x: -0.2404143, y: -0.7251787, z: 0.3072926, w: -0.5673518} m_Size: - m_Target: 20.872953 + m_Target: 10 speed: 2 - m_Value: 20.872953 + m_Value: 10 m_Ortho: m_Target: 0 speed: 2 @@ -1154,8 +1154,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -550 m_HBaseRangeMax: 550 - m_VBaseRangeMin: -259.5 - m_VBaseRangeMax: 259.5 + m_VBaseRangeMin: -270 + m_VBaseRangeMax: 270 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1164,7 +1164,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1172,11 +1172,11 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 21 + y: 0 width: 1100 - height: 519 + height: 540 m_Scale: {x: 1, y: 1} - m_Translation: {x: 550, y: 259.5} + m_Translation: {x: 550, y: 270} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -1184,9 +1184,9 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -550 - y: -259.5 + y: -270 width: 1100 - height: 519 + height: 540 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 1100, y: 540}