Fixed missing components
This commit is contained in:
Pascal Serrarens
parent
8b199b9c78
commit
f1a4ced59d
@ -1,27 +1,16 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 1547744635115364}
|
||||
m_IsPrefabParent: 1
|
||||
--- !u!1 &1102845541656492
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224080167443833264}
|
||||
- component: {fileID: 222382479412892260}
|
||||
- component: {fileID: 114935358240423544}
|
||||
- component: {fileID: 114123306642843232}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
@ -29,91 +18,53 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1547744635115364
|
||||
GameObject:
|
||||
--- !u!224 &224080167443833264
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 224268792594220398}
|
||||
- component: {fileID: 223133106560874972}
|
||||
- component: {fileID: 114215111648024090}
|
||||
- component: {fileID: 114000307814322182}
|
||||
m_Layer: 0
|
||||
m_Name: NetworkingStatusCanvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &114000307814322182
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &114123306642843232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1102845541656492}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7994b261fec79c4a9a1c329820642f3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &114215111648024090
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
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: 224268792594220398}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222382479412892260
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1102845541656492}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &114935358240423544
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1102845541656492}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 14
|
||||
@ -128,17 +79,51 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: New Text
|
||||
--- !u!222 &222382479412892260
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1102845541656492}
|
||||
--- !u!1 &1547744635115364
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224268792594220398}
|
||||
- component: {fileID: 223133106560874972}
|
||||
- component: {fileID: 114215111648024090}
|
||||
- component: {fileID: 114000307814322182}
|
||||
m_Layer: 0
|
||||
m_Name: NetworkingStatusCanvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &224268792594220398
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_LocalRotation: {x: -0.0000015646192, y: -0.0000072655666, z: -0.0000067270753, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.5}
|
||||
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 224080167443833264}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!223 &223133106560874972
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
@ -150,45 +135,49 @@ Canvas:
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &224080167443833264
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1102845541656492}
|
||||
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: 224268792594220398}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!224 &224268792594220398
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
--- !u!114 &114215111648024090
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_LocalRotation: {x: -0.0000015646192, y: -0.0000072655666, z: -0.0000067270753,
|
||||
w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.5}
|
||||
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
|
||||
m_Children:
|
||||
- {fileID: 224080167443833264}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!114 &114000307814322182
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1547744635115364}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace Passer.Humanoid {
|
||||
|
||||
#if !hPUNVOICE2
|
||||
public partial class HumanoidPlayerPunVoice : MonoBehaviour {
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c48e8d9c90f89154daf3a86de9a5f2ad
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -6,7 +6,7 @@ using Photon.Pun;
|
||||
namespace Passer.Humanoid {
|
||||
|
||||
#if !hPUNVOICE2
|
||||
public partial class HumanoidPlayerPunVoice : MonoBehaviour {
|
||||
public class HumanoidPlayerPunVoice : MonoBehaviour {
|
||||
#else
|
||||
public class HumanoidPlayerPunVoice : MonoBehaviourPunCallbacks {
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,20 +2,26 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: MakeHuman_ClassicShoes
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
m_CustomRenderQueue: 3000
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -55,6 +61,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
|
||||
@ -75,3 +82,4 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0.1, g: 0.1, b: 0.1, a: 0.9}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -2,20 +2,26 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: MakeHuman_Jeans
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
m_CustomRenderQueue: 3000
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -55,6 +61,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
|
||||
@ -75,3 +82,4 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0.0426, g: 0.0557, b: 0.2079, a: 0.9574}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -2,20 +2,26 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: MakeHuman_Longsleeve
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
m_CustomRenderQueue: 3000
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -55,6 +61,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
|
||||
@ -75,3 +82,4 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 0.19999999}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -2,20 +2,26 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: MakeHuman_Skin
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
m_CustomRenderQueue: 3000
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -55,6 +61,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
|
||||
@ -75,3 +82,4 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0.8, g: 0.54, b: 0.35, a: 0.19999999}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -4,9 +4,10 @@ using UnityEngine.TestTools;
|
||||
|
||||
#if pHUMANOID4
|
||||
using NUnit.Framework;
|
||||
using Passer;
|
||||
using Passer.Humanoid;
|
||||
public class SocketTest : IPrebuildSetup {
|
||||
|
||||
namespace Passer {
|
||||
|
||||
public class SocketTest : IPrebuildSetup {
|
||||
|
||||
public static string testScene = "Sockets";
|
||||
|
||||
@ -16,7 +17,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
"Assets/_TestCases/[Test]" + testScene + ".unity");
|
||||
}
|
||||
|
||||
#region Static Socket
|
||||
#region Static Socket
|
||||
[Test]
|
||||
[Category("Socket")]
|
||||
public void StaticSocket_RigidbodyHandle() {
|
||||
@ -40,7 +41,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Joint joint = handle.GetComponent<Joint>();
|
||||
@ -55,9 +56,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Socket should not have moved
|
||||
distance = Vector3.Distance(socketPosition, socket.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -66,7 +67,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Handle should still be at socket position
|
||||
distance = Vector3.Distance(socket.transform.position, handle.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
}
|
||||
catch (Exception e) {
|
||||
@ -94,7 +95,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -105,9 +106,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Socket should not have moved
|
||||
distance = Vector3.Distance(socket.transform.position, socketPosition);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -117,7 +118,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Socket should not have moved
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, socketPosition), 0.0001F);
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -148,7 +149,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform != null);
|
||||
@ -158,9 +159,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
// Socket should not have moved
|
||||
Assert.Less(Vector3.Distance(socketPosition, socket.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -168,7 +169,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
|
||||
// Handle should still be at socket position
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -178,9 +179,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
throw (e);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Rigidbody Socket
|
||||
#region Rigidbody Socket
|
||||
[Test]
|
||||
[Category("Socket")]
|
||||
public void RigidbodySocket_RigidbodyHandle() {
|
||||
@ -200,7 +201,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.AreEqual(socket.attachedTransform, handle.transform);
|
||||
@ -212,9 +213,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Socket should not have moved
|
||||
distance = Vector3.Distance(socketPosition, socket.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -223,7 +224,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Handle should be at socket position
|
||||
distance = Vector3.Distance(socket.transform.position, handle.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -253,7 +254,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Joint joint = socket.GetComponent<Joint>();
|
||||
@ -267,9 +268,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
// Handle should not have moved
|
||||
Assert.Less(Vector3.Distance(handle.transform.position, handlePosition), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -280,7 +281,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
|
||||
// Socket should still be at handle position
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -310,7 +311,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.AreEqual(socket.attachedTransform, handle.transform);
|
||||
@ -321,9 +322,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Handle should not have moved
|
||||
Assert.Less(Vector3.Distance(handle.transform.position, handlePosition), 0.0001F);
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null, "Socket still is attached to transform");
|
||||
@ -331,7 +332,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
|
||||
// Socket should be at handle position
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -341,9 +342,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
throw (e);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Kinematic Socket
|
||||
#region Kinematic Socket
|
||||
[Test]
|
||||
[Category("Socket")]
|
||||
public void KinematicSocket_RigidbodyHandle() {
|
||||
@ -364,7 +365,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.AreEqual(socket.attachedTransform, handle.transform);
|
||||
@ -376,9 +377,9 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Socket should not have moved
|
||||
distance = Vector3.Distance(socketPosition, socket.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
@ -387,7 +388,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
// Handle should still be at socket position
|
||||
distance = Vector3.Distance(socket.transform.position, handle.transform.position);
|
||||
Assert.Less(distance, 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -419,7 +420,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.AreEqual(socket.attachedTransform, handle.transform);
|
||||
@ -429,14 +430,14 @@ public class SocketTest : IPrebuildSetup {
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
// Handle should not have moved
|
||||
Assert.Less(Vector3.Distance(handlePosition, handle.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
Assert.AreEqual(socket.transform.parent, socketParent);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -468,7 +469,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
Vector3 socketPosition = socket.transform.position;
|
||||
Vector3 handlePosition = handle.transform.position;
|
||||
|
||||
#region Attach
|
||||
#region Attach
|
||||
socket.Attach(handle.transform, false);
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform != null);
|
||||
@ -478,14 +479,14 @@ public class SocketTest : IPrebuildSetup {
|
||||
Assert.Less(Vector3.Distance(socket.transform.position, handle.transform.position), 0.0001F);
|
||||
// Socket should not have moved
|
||||
Assert.Less(Vector3.Distance(socketPosition, socket.transform.position), 0.0001F);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Release
|
||||
#region Release
|
||||
socket.Release();
|
||||
|
||||
Assert.IsTrue(socket.attachedTransform == null);
|
||||
Assert.AreEqual(handle.transform.parent, handleParent);
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
socket.transform.localPosition = Vector3.zero;
|
||||
handle.transform.localPosition = Vector3.zero;
|
||||
@ -495,7 +496,7 @@ public class SocketTest : IPrebuildSetup {
|
||||
throw (e);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user