From 17e10cfb2fd5f970901fbb9e099e7d27840e057f Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 27 Feb 2015 11:24:37 +0000 Subject: [PATCH] Renamed PortraitPosition to StagePosition #84 --- .../Fungus/Dialog/Editor/DialogMenuItems.cs | 6 +- ...itPosition.prefab => StagePosition.prefab} | 8 +- ....prefab.meta => StagePosition.prefab.meta} | 0 .../Sherlock/TheExperiment.unity | 157 ++++++++++++++++++ 4 files changed, 164 insertions(+), 7 deletions(-) rename Assets/Fungus/Portrait/Prefabs/{PortraitPosition.prefab => StagePosition.prefab} (91%) rename Assets/Fungus/Portrait/Prefabs/{PortraitPosition.prefab.meta => StagePosition.prefab.meta} (100%) diff --git a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs index 03418203..77a27feb 100644 --- a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs +++ b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs @@ -59,10 +59,10 @@ namespace Fungus FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Portrait/Prefabs/Stage.prefab"); } - [MenuItem("GameObject/Fungus/Portrait/PortraitPosition")] - static void CreatePortraitPosition() + [MenuItem("GameObject/Fungus/Portrait/StagePosition")] + static void CreateStagePosition() { - FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab"); + FungusScriptMenuItems.SpawnPrefab("Assets/Fungus/Portrait/Prefabs/StagePosition.prefab"); } } diff --git a/Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab b/Assets/Fungus/Portrait/Prefabs/StagePosition.prefab similarity index 91% rename from Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab rename to Assets/Fungus/Portrait/Prefabs/StagePosition.prefab index 8d86afc0..dbfbaa06 100644 --- a/Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab +++ b/Assets/Fungus/Portrait/Prefabs/StagePosition.prefab @@ -11,7 +11,7 @@ GameObject: - 222: {fileID: 22295640} - 114: {fileID: 11495640} m_Layer: 0 - m_Name: PortraitPosition + m_Name: StagePosition m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +28,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 84ea47f59517f4ac1815f552cc8d60bc, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 @@ -52,13 +52,13 @@ RectTransform: m_GameObject: {fileID: 195640} 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_LocalScale: {x: 2.31660223, y: 2.31660223, z: 2.31660223} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: .5, y: 0} m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 0, y: 200} + m_AnchoredPosition: {x: -590.733398, y: 483.453583} m_SizeDelta: {x: 1000, y: 1000} m_Pivot: {x: .5, y: 0} --- !u!1001 &100100000 diff --git a/Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab.meta b/Assets/Fungus/Portrait/Prefabs/StagePosition.prefab.meta similarity index 100% rename from Assets/Fungus/Portrait/Prefabs/PortraitPosition.prefab.meta rename to Assets/Fungus/Portrait/Prefabs/StagePosition.prefab.meta diff --git a/Assets/FungusExamples/Sherlock/TheExperiment.unity b/Assets/FungusExamples/Sherlock/TheExperiment.unity index 6c478b11..a6f6e791 100644 --- a/Assets/FungusExamples/Sherlock/TheExperiment.unity +++ b/Assets/FungusExamples/Sherlock/TheExperiment.unity @@ -1008,6 +1008,7 @@ RectTransform: - {fileID: 501235100} - {fileID: 744080994} - {fileID: 1195464370} + - {fileID: 1942205822} m_Father: {fileID: 876464347} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -2523,6 +2524,94 @@ Transform: - {fileID: 684540985} m_Father: {fileID: 678512926} m_RootOrder: 1 +--- !u!1001 &908220527 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 519370006} + m_Modifications: + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchoredPosition.x + value: -590.733398 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchoredPosition.y + value: 483.453583 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_SizeDelta.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_SizeDelta.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchorMin.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchorMax.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_Pivot.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 195640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + propertyPath: m_Name + value: TopRight + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + m_RootGameObject: {fileID: 1942205821} + m_IsPrefabParent: 0 + m_IsExploded: 1 --- !u!1 &935669773 GameObject: m_ObjectHideFlags: 0 @@ -3527,6 +3616,10 @@ Prefab: propertyPath: m_Color.a value: 0 objectReference: {fileID: 0} + - target: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_RootGameObject: {fileID: 876464346} @@ -7151,6 +7244,70 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 +--- !u!1 &1942205821 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 195640, guid: 7a4c270a5c18f6549a7683844dbf9f22, type: 2} + m_PrefabInternal: {fileID: 908220527} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1942205822} + - 222: {fileID: 1942205824} + - 114: {fileID: 1942205823} + m_Layer: 0 + m_Name: TopRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1942205822 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, + type: 2} + m_PrefabInternal: {fileID: 908220527} + m_GameObject: {fileID: 1942205821} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2.31660223, y: 2.31660223, z: 2.31660223} + m_Children: [] + m_Father: {fileID: 519370006} + m_RootOrder: 5 + m_AnchorMin: {x: .5, y: 0} + m_AnchorMax: {x: .5, y: 0} + m_AnchoredPosition: {x: -590.733398, y: 483.453583} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &1942205823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11495640, guid: 7a4c270a5c18f6549a7683844dbf9f22, + type: 2} + m_PrefabInternal: {fileID: 908220527} + m_GameObject: {fileID: 1942205821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1942205824 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22295640, guid: 7a4c270a5c18f6549a7683844dbf9f22, + type: 2} + m_PrefabInternal: {fileID: 908220527} + m_GameObject: {fileID: 1942205821} --- !u!1 &1950804376 GameObject: m_ObjectHideFlags: 0