Commit fbb53563 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'simonthebear' into piethrowing

* simonthebear:
  started working on a facecam for each charactrer
parents f1086ac9 7038a16b
......@@ -219,7 +219,8 @@ RectTransform:
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_Children:
- {fileID: 1207186496}
m_Father: {fileID: 1949598428}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -326,6 +327,10 @@ Prefab:
propertyPath: m_SortingLayerID
value: -1020251125
objectReference: {fileID: 0}
- target: {fileID: 4683994713624020, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a, type: 2}
propertyPath: m_LocalPosition.x
value: -0.11
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a, type: 2}
m_IsPrefabAsset: 0
......@@ -630,7 +635,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &627483501
Transform:
m_ObjectHideFlags: 0
......@@ -903,11 +908,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 885572743}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -251.88899, y: 154.00699, z: -4040.9998}
m_LocalScale: {x: 100, y: 100, z: 44.899998}
m_LocalPosition: {x: 0, y: 0, z: -4040.9998}
m_LocalScale: {x: 100, y: 100, z: 44.9}
m_Children: []
m_Father: {fileID: 1949598428}
m_RootOrder: 1
m_Father: {fileID: 1207186496}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!1 &896048971 stripped
GameObject:
......@@ -1064,6 +1069,76 @@ Transform:
m_Father: {fileID: 757305217}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1207186495
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1207186496}
- component: {fileID: 1207186498}
- component: {fileID: 1207186497}
m_Layer: 0
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1207186496
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1207186495}
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:
- {fileID: 885572747}
m_Father: {fileID: 237130075}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 60, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1207186497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1207186495}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1207186498
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1207186495}
m_CullTransparentMesh: 0
--- !u!1001 &1345390424
Prefab:
m_ObjectHideFlags: 0
......@@ -1359,6 +1434,101 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 1345390424}
--- !u!1 &1623576558 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1766672496195326, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
type: 2}
m_PrefabInternal: {fileID: 251658272}
--- !u!1 &1731327015
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1731327016}
- component: {fileID: 1731327019}
- component: {fileID: 1731327018}
- component: {fileID: 1731327017}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1731327016
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1731327015}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.473, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1424317323}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1731327017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1731327015}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1623576558}
--- !u!81 &1731327018
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1731327015}
m_Enabled: 1
--- !u!20 &1731327019
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1731327015}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 0.4
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 311
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 914f2a757743f4fec91c567ac22fb7e6, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &1748254579
GameObject:
m_ObjectHideFlags: 0
......@@ -1570,7 +1740,6 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 237130075}
- {fileID: 885572747}
m_Father: {fileID: 867173047}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
fileFormatVersion: 2
guid: de8b9e97c9b3f954cafcd1aa9b573972
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: characterHead
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 256
m_Height: 256
m_AntiAliasing: 1
m_DepthFormat: 2
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
fileFormatVersion: 2
guid: 914f2a757743f4fec91c567ac22fb7e6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 914f2a757743f4fec91c567ac22fb7e6
guid: 8016e6b6564a8ad4dbe1200d4bc61965
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8400000
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment