Skip to content
Snippets Groups Projects
Commit 12c2135b authored by John Schihada's avatar John Schihada
Browse files

Adjusted Angle-Prefab. Implemented Angle-GO Creation

parent f0e3abd1
Branches
No related tags found
No related merge requests found
...@@ -233,7 +233,32 @@ public void OnHit(RaycastHit hit) ...@@ -233,7 +233,32 @@ public void OnHit(RaycastHit hit)
//Event for end of line-rendering in "ShinyThings" //Event for end of line-rendering in "ShinyThings"
CommunicationEvents.StopCurveDrawingEvent.Invoke(null); CommunicationEvents.StopCurveDrawingEvent.Invoke(null);
//Create AngleFact //Create AngleFact
//TODO: CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact()); //Check if selected Lines are the same -> if true -> cancel
if (!(angleModeFirstLineSelected.Id == tempFact.Id))
{
//Check if selected Lines have a common Point = id2 for AngleFact
if (((LineFact)angleModeFirstLineSelected).Pid1 == ((LineFact)tempFact).Pid1)
{
CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact(((LineFact)angleModeFirstLineSelected).Pid2, ((LineFact)tempFact).Pid1, ((LineFact)tempFact).Pid2, GetFirstEmptyID()));
}
else if (((LineFact)angleModeFirstLineSelected).Pid1 == ((LineFact)tempFact).Pid2)
{
CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact(((LineFact)angleModeFirstLineSelected).Pid2, ((LineFact)tempFact).Pid2, ((LineFact)tempFact).Pid1, GetFirstEmptyID()));
}
else if (((LineFact)angleModeFirstLineSelected).Pid2 == ((LineFact)tempFact).Pid1)
{
CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact(((LineFact)angleModeFirstLineSelected).Pid1, ((LineFact)tempFact).Pid1, ((LineFact)tempFact).Pid2, GetFirstEmptyID()));
}
else if (((LineFact)angleModeFirstLineSelected).Pid2 == ((LineFact)tempFact).Pid2)
{
CommunicationEvents.AddFactEvent.Invoke(this.AddAngleFact(((LineFact)angleModeFirstLineSelected).Pid1, ((LineFact)tempFact).Pid2, ((LineFact)tempFact).Pid1, GetFirstEmptyID()));
}
else
{
//TODO: Hint that the selected Lines have no common point
}
}
this.angleModeIsFirstLineSelected = false; this.angleModeIsFirstLineSelected = false;
this.angleModeFirstLineSelected = null; this.angleModeFirstLineSelected = null;
} }
...@@ -248,6 +273,7 @@ public void OnHit(RaycastHit hit) ...@@ -248,6 +273,7 @@ public void OnHit(RaycastHit hit)
} }
else else
{ {
//TODO: If Point was hit: Angle Drawing with Selecting 3 Points
if (this.angleModeIsFirstLineSelected) if (this.angleModeIsFirstLineSelected)
{ {
//Deactivate CurveDrawing and first line selection //Deactivate CurveDrawing and first line selection
......
fileFormatVersion: 2
guid: eec83b50c1e0c604aa91430f72c8dbb0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -31,6 +31,9 @@ public void FactAction(Fact fact) ...@@ -31,6 +31,9 @@ public void FactAction(Fact fact)
case LineFact lineFact: case LineFact lineFact:
SpawnLine(lineFact); SpawnLine(lineFact);
break; break;
case AngleFact angleFact:
SpawnAngle(angleFact);
break;
} }
} }
...@@ -93,6 +96,82 @@ public void SpawnLine(LineFact lineFact) ...@@ -93,6 +96,82 @@ public void SpawnLine(LineFact lineFact)
} }
public void SpawnAngle(AngleFact angleFact)
{
Vector3 point1 = (Facts[angleFact.Pid1] as PointFact).Point;
Vector3 point2 = (Facts[angleFact.Pid2] as PointFact).Point;
Vector3 point3 = (Facts[angleFact.Pid3] as PointFact).Point;
Vector3 tempPoint1;
Vector3 tempPoint3;
//Length of the Angle relative to the Length of the shortest of the two lines (point2->point1) and (point2->point3)
float lengthFactor = 0.3f;
//AngleGO: Triangle-Length: 3/4, Circle-Length: 1/4
float angleGoFactorTriangleToCircle = 1.25f;
//Make 2 TempPoints positioned on length% from Point2 to Point3 and on length% from Point2 to Point1
//Will be used for z-Coordinate of the Angle
float length = 0;
if ((point1 - point2).magnitude >= (point3 - point2).magnitude)
{
length = lengthFactor * (point3 - point2).magnitude;
tempPoint1 = point2 + length * (point1 - point2).normalized;
tempPoint3 = point2 + length * (point3 - point2).normalized;
}
else
{
length = lengthFactor * (point1 - point2).magnitude;
tempPoint1 = point2 + length * (point1 - point2).normalized;
tempPoint3 = point2 + length * (point3 - point2).normalized;
}
//Change FactRepresentation to Angle
this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Angle", typeof(GameObject));
GameObject angle = GameObject.Instantiate(FactRepresentation);
//Place the Angle at position of point2
angle.transform.position = point2;
//Change scale and rotation, so that the angle is in between the two lines
var v3T = angle.transform.localScale;
//Calculate the Vector from point 2 to a POINT, where (point2->POINT) is orthogonal to (POINT->tempPoint3)
Vector3 tempProjection = Vector3.Project((tempPoint3 - point2), (Vector3.Lerp((tempPoint1 - point2).normalized, (tempPoint3 - point2).normalized, 0.5f)));
//Make the Angle as long as length + length of the half-circle
v3T.x = (tempProjection).magnitude * angleGoFactorTriangleToCircle;
//For every Coordinate x,y,z we have to devide it by the LocalScale of the Child,
//because actually the Child should be of this length and not the parent, which is only the Collider
v3T.x = v3T.x / angle.transform.GetChild(0).GetChild(0).localScale.x;
//y of the angle-GameObject here hard coded = ratio of sphere-prefab
v3T.y = 0.05f / angle.transform.GetChild(0).GetChild(0).localScale.y;
//z should be as long as the distance between tempPoint1 and tempPoint3
v3T.z = (tempPoint3 - tempPoint1).magnitude / angle.transform.GetChild(0).GetChild(0).localScale.z;
//Change Scale/Rotation of the Line-GameObject without affecting Scale of the Text
angle.transform.GetChild(0).localScale = v3T;
//Rotate so that the rotation points from point2 to the middle of point3 and point1
angle.transform.GetChild(0).rotation = Quaternion.FromToRotation(Vector3.right, (Vector3.Lerp((tempPoint1 - point2).normalized, (tempPoint3 - point2).normalized, 0.5f)));
//Now the rotation around that direction must also be adjusted
angle.transform.GetChild(0).RotateAround(point2, (Vector3.Lerp((tempPoint1 - point2).normalized, (tempPoint3 - point2).normalized, 0.5f)), Vector3.Angle(angle.transform.GetChild(0).forward.normalized, (tempPoint3 - tempPoint1).normalized));
string letter = ((Char)(64 + angleFact.Id + 1)).ToString();
angle.GetComponentInChildren<TextMeshPro>().transform.localPosition = new Vector3((0.5f * tempProjection).x, angle.GetComponentInChildren<TextMeshPro>().transform.localPosition.y, (0.5f * tempProjection).z);
angle.GetComponentInChildren<TextMeshPro>().text = letter;
angle.GetComponentInChildren<FactObject>().Id = angleFact.Id;
//If a new Angle was spawned -> We are in CreateAngleMode -> Then we want the collider to be disabled
if (CommunicationEvents.ActiveToolMode != ToolMode.ExtraMode)
//Deactivate the Collider of the Angle itself
angle.transform.GetComponentInChildren<MeshCollider>().enabled = false;
angleFact.Representation = angle;
}
public void DeleteObject(Fact fact) public void DeleteObject(Fact fact)
{ {
Debug.Log("delete obj of "+ fact.Id); Debug.Log("delete obj of "+ fact.Id);
......
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: 9f7e793cb50361841bf7c68acd3505f7 guid: 834543ca2c0b995498182c977a48f8ed
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 4300000 mainObjectFileID: 4300000
......
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &6830236405438992229 --- !u!1 &4650993678488610235
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -8,88 +8,11 @@ GameObject: ...@@ -8,88 +8,11 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 6830236405438992228} - component: {fileID: 4650993678488610234}
- component: {fileID: 6830236405438992230} - component: {fileID: 4650993678488610228}
- component: {fileID: 6830236405438992231} - component: {fileID: 4650993678488610229}
m_Layer: 12 - component: {fileID: 4650993678488610230}
m_Name: AngleInner - component: {fileID: 4650993678488610231}
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6830236405438992228
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405438992229}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 0.5, z: 0.95}
m_Children: []
m_Father: {fileID: 6830236405704037598}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6830236405438992230
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405438992229}
m_Mesh: {fileID: 4300000, guid: 9f7e793cb50361841bf7c68acd3505f7, type: 2}
--- !u!23 &6830236405438992231
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405438992229}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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
--- !u!1 &6830236405704037599
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6830236405704037598}
- component: {fileID: 6830236405704037592}
- component: {fileID: 6830236405704037593}
- component: {fileID: 4446603963375557330}
- component: {fileID: 6830236405704037595}
m_Layer: 12 m_Layer: 12
m_Name: AngleOuter m_Name: AngleOuter
m_TagString: Untagged m_TagString: Untagged
...@@ -97,36 +20,36 @@ GameObject: ...@@ -97,36 +20,36 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &6830236405704037598 --- !u!4 &4650993678488610234
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405704037599} m_GameObject: {fileID: 4650993678488610235}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_LocalScale: {x: 1, y: 0.02, z: 1}
m_Children: m_Children:
- {fileID: 6830236405438992228} - {fileID: 4650993679319476103}
m_Father: {fileID: 6830236406689330782} m_Father: {fileID: 4650993679089994826}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6830236405704037592 --- !u!33 &4650993678488610228
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405704037599} m_GameObject: {fileID: 4650993678488610235}
m_Mesh: {fileID: 4300000, guid: 9f7e793cb50361841bf7c68acd3505f7, type: 2} m_Mesh: {fileID: 4300000, guid: 834543ca2c0b995498182c977a48f8ed, type: 2}
--- !u!23 &6830236405704037593 --- !u!23 &4650993678488610229
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405704037599} m_GameObject: {fileID: 4650993678488610235}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
...@@ -157,34 +80,34 @@ MeshRenderer: ...@@ -157,34 +80,34 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!114 &4446603963375557330 --- !u!114 &4650993678488610230
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405704037599} m_GameObject: {fileID: 4650993678488610235}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Id: 0 Id: 0
--- !u!64 &6830236405704037595 --- !u!64 &4650993678488610231
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236405704037599} m_GameObject: {fileID: 4650993678488610235}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Convex: 0 m_Convex: 0
m_CookingOptions: 14 m_CookingOptions: 14
m_Mesh: {fileID: 4300000, guid: 9f7e793cb50361841bf7c68acd3505f7, type: 2} m_Mesh: {fileID: 4300000, guid: 834543ca2c0b995498182c977a48f8ed, type: 2}
--- !u!1 &6830236406108326479 --- !u!1 &4650993678926258989
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -192,12 +115,12 @@ GameObject: ...@@ -192,12 +115,12 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 6830236406108326478} - component: {fileID: 4650993678926258988}
- component: {fileID: 6830236406108326517} - component: {fileID: 4650993678926258987}
- component: {fileID: 6830236406108326474} - component: {fileID: 4650993678926258984}
- component: {fileID: 6830236406108326475} - component: {fileID: 4650993678926258985}
- component: {fileID: 6830236406108326472} - component: {fileID: 4650993678926258990}
- component: {fileID: 6830236406108326473} - component: {fileID: 4650993678926258991}
m_Layer: 12 m_Layer: 12
m_Name: AngleText m_Name: AngleText
m_TagString: Untagged m_TagString: Untagged
...@@ -205,32 +128,32 @@ GameObject: ...@@ -205,32 +128,32 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &6830236406108326478 --- !u!224 &4650993678926258988
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6830236406689330782} m_Father: {fileID: 4650993679089994826}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0.75, y: 0.5}
m_SizeDelta: {x: 2, y: 0.5} m_SizeDelta: {x: 2, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.25, y: 0}
--- !u!23 &6830236406108326517 --- !u!23 &4650993678926258987
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
...@@ -261,29 +184,29 @@ MeshRenderer: ...@@ -261,29 +184,29 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!33 &6830236406108326474 --- !u!33 &4650993678926258984
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!222 &6830236406108326475 --- !u!222 &4650993678926258985
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &6830236406108326472 --- !u!114 &4650993678926258990
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
...@@ -361,9 +284,9 @@ MonoBehaviour: ...@@ -361,9 +284,9 @@ MonoBehaviour:
m_firstVisibleCharacter: 0 m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1 m_useMaxVisibleDescender: 1
m_pageToDisplay: 1 m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0} m_margin: {x: 0, y: 0, z: 1.1672716, w: 0}
m_textInfo: m_textInfo:
textComponent: {fileID: 6830236406108326472} textComponent: {fileID: 4650993678926258990}
characterCount: 4 characterCount: 4
spriteCount: 0 spriteCount: 0
spaceCount: 0 spaceCount: 0
...@@ -376,7 +299,7 @@ MonoBehaviour: ...@@ -376,7 +299,7 @@ MonoBehaviour:
m_isVolumetricText: 0 m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0} m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_renderer: {fileID: 6830236406108326517} m_renderer: {fileID: 4650993678926258987}
m_subTextObjects: m_subTextObjects:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
...@@ -387,20 +310,20 @@ MonoBehaviour: ...@@ -387,20 +310,20 @@ MonoBehaviour:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
m_maskType: 0 m_maskType: 0
--- !u!114 &6830236406108326473 --- !u!114 &4650993678926258991
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406108326479} m_GameObject: {fileID: 4650993678926258989}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Cam: {fileID: 0} Cam: {fileID: 0}
--- !u!1 &6830236406689330783 --- !u!1 &4650993679089994827
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -408,27 +331,104 @@ GameObject: ...@@ -408,27 +331,104 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 6830236406689330782} - component: {fileID: 4650993679089994826}
m_Layer: 12 m_Layer: 12
m_Name: Angle m_Name: Angle_1
m_TagString: Selectable m_TagString: Selectable
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &6830236406689330782 --- !u!4 &4650993679089994826
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830236406689330783} m_GameObject: {fileID: 4650993679089994827}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.8530397, y: 0.6731256, z: -0.23275426} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6830236405704037598} - {fileID: 4650993678488610234}
- {fileID: 6830236406108326478} - {fileID: 4650993678926258988}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4650993679319476100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4650993679319476103}
- component: {fileID: 4650993679319476097}
- component: {fileID: 4650993679319476102}
m_Layer: 12
m_Name: AngleInner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4650993679319476103
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4650993679319476100}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 0.5, z: 0.95}
m_Children: []
m_Father: {fileID: 4650993678488610234}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4650993679319476097
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4650993679319476100}
m_Mesh: {fileID: 4300000, guid: 834543ca2c0b995498182c977a48f8ed, type: 2}
--- !u!23 &4650993679319476102
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4650993679319476100}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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
fileFormatVersion: 2 fileFormatVersion: 2
guid: 20c1f6ab9fb2f4144821b0c1bfaa83a9 guid: 8272752f56f418e40a9ffcaca59055f3
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
......
fileFormatVersion: 2
guid: ac72be71662640f4ab0aaf102090fb95
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment