Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
875f7e22
Commit
875f7e22
authored
Feb 12, 2019
by
gstuitje
Browse files
Intro scene is now okay.
parent
736fc963
Changes
6
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Scenes/IntroScene.unity
View file @
875f7e22
...
...
@@ -419,7 +419,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID:
277655077
}
- m_Target: {fileID:
0
}
m_MethodName: ButtonPress
m_Mode: 3
m_Arguments:
...
...
@@ -1129,7 +1129,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID:
277655077
}
- m_Target: {fileID:
0
}
m_MethodName: ButtonPress
m_Mode: 3
m_Arguments:
...
...
@@ -1328,7 +1328,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 63.5, y: -96.8
4
}
m_AnchoredPosition: {x: 63.5, y: -96.8
39966
}
m_SizeDelta: {x: -147, y: 173.57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237130076
...
...
@@ -1538,7 +1538,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 503603553}
m_RootOrder:
1
m_RootOrder:
2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &258363428
AudioSource:
...
...
@@ -1658,12 +1658,6 @@ MonoBehaviour:
songs:
- {fileID: 8300000, guid: 6492c1c2b65dd475ebbe25ebcae4f780, type: 3}
- {fileID: 8300000, guid: 1e5816223313147d088f56ac191b233a, type: 3}
--- !u!114 &277655077 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 1109435144}
m_Script: {fileID: 11500000, guid: 2b6520c4e0b254f33b7f838739288d21, type: 3}
--- !u!1 &327992298
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -1831,7 +1825,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 382599332}
m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681}
m_LocalPosition: {x: -45.
31
, y: -1.5, z: -18.97}
m_LocalPosition: {x: -45.
47
, y: -1.5, z: -18.97}
m_LocalScale: {x: 5.29, y: 3.6999998, z: 1}
m_Children: []
m_Father: {fileID: 1230210401}
...
...
@@ -1906,7 +1900,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x:
6.21
, y: 0.44}
m_Size: {x:
1.74
, y: 0.44}
m_EdgeRadius: 0
--- !u!1 &421719281
GameObject:
...
...
@@ -2211,6 +2205,7 @@ GameObject:
- component: {fileID: 503603553}
- component: {fileID: 503603552}
- component: {fileID: 503603551}
- component: {fileID: 503603554}
m_Layer: 0
m_Name: PerformanceEntrance
m_TagString: Untagged
...
...
@@ -2265,12 +2260,27 @@ Transform:
m_LocalPosition: {x: 0.049999595, y: 0.5700002, z: -1.8535156}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 968441770}
- {fileID: 1397976877}
- {fileID: 258363427}
- {fileID: 2138223315}
m_Father: {fileID: 1230210401}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &503603554
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 503603550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5129d7d5680834fe88358a8adf14fc14, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1230432787}
faceCamDisplay: {fileID: 968441769}
box: {fileID: 865213187}
--- !u!1 &504731123
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -2871,7 +2881,7 @@ RectTransform:
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_AnchoredPosition: {x: 0, y:
-96.84
}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &708397159
...
...
@@ -3027,6 +3037,107 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &740712756
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 740712757}
- component: {fileID: 740712759}
- component: {fileID: 740712758}
m_Layer: 0
m_Name: Fence_1 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &740712757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 740712756}
m_LocalRotation: {x: 0.032746498, y: 0.76534414, z: 0.027477575, w: 0.64220005}
m_LocalPosition: {x: 29.2, y: -1.5, z: -18.97}
m_LocalScale: {x: 5.290002, y: 3.6999993, z: 1.0000005}
m_Children: []
m_Father: {fileID: 1230210401}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 100, z: 4.9}
--- !u!61 &740712758
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 740712756}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.79, y: 0.44}
m_EdgeRadius: 0
--- !u!212 &740712759
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 740712756}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, 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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.21, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &757305216
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -7752,6 +7863,60 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &807781316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 807781317}
- component: {fileID: 807781318}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &807781317
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 807781316}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.94, y: 0.27, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1422126451}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &807781318
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 807781316}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!1 &832870303
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -8114,7 +8279,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 54.9989
62
, y: -89.570015}
m_AnchoredPosition: {x: 54.9989, y: -89.570015}
m_SizeDelta: {x: -130, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &865213187
...
...
@@ -8138,10 +8303,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 2
9
m_FontSize: 2
0
m_FontStyle: 0
m_BestFit: 0
m_MinSize:
10
m_MinSize:
2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
...
...
@@ -12954,6 +13119,93 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 928319862}
m_CullTransparentMesh: 0
--- !u!1 &968441769
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1516274406560312, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 968441770}
- component: {fileID: 968441772}
- component: {fileID: 968441771}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &968441770
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 4967593859512098, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 968441769}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.14, y: 0.8, z: -10.146484}
m_LocalScale: {x: 0.86767995, y: 1.20156, z: 1}
m_Children: []
m_Father: {fileID: 503603553}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &968441771
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114609290062385056, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 968441769}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1402622833}
isCamera: 1
--- !u!20 &968441772
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 20141266176392738, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 968441769}
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: 2.8865895
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 &981168062
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -17906,7 +18158,7 @@ Transform:
m_LocalScale: {x: 0.21691974, y: 0.3003905, z: 1}
m_Children: []
m_Father: {fileID: 1422126451}
m_RootOrder:
1
m_RootOrder:
2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1083551488
MonoBehaviour:
...
...
@@ -18038,83 +18290,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1109435144
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1936604887}
m_Modifications:
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalPosition.x
value: -6
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: playerResponses.Array.data[0]
value:
objectReference: {fileID: 1199441910}
- target: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: playerResponses.Array.data[1]
value:
objectReference: {fileID: 173653533}
- target: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: playerResponses.Array.data[2]
value:
objectReference: {fileID: 1231582144}
- target: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: playerResponses.Array.data[3]
value:
objectReference: {fileID: 72725770}
- target: {fileID: 114368199130414440, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: m_Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114368199130414440, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114368199130414440, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2c7917ac87eca42679b31ab33e2eec29, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1110041559
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -18476,7 +18651,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID:
277655077
}
- m_Target: {fileID:
0
}
m_MethodName: ButtonPress
m_Mode: 3
m_Arguments:
...
...
@@ -18721,6 +18896,7 @@ Transform:
- {fileID: 102930289}
- {fileID: 1008886849}
- {fileID: 382599333}
- {fileID: 740712757}
m_Father: {fileID: 491873958}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...
...
@@ -18786,7 +18962,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID:
277655077
}
- m_Target: {fileID:
0
}
m_MethodName: ButtonPress
m_Mode: 3
m_Arguments:
...
...
@@ -19013,7 +19189,7 @@ RectTransform:
- {fileID: 708397158}
- {fileID: 1931458619}
m_Father: {fileID: 1422126451}
m_RootOrder:
0
m_RootOrder:
1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
...
...
@@ -19343,7 +19519,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 503603553}
m_RootOrder:
0
m_RootOrder:
1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!199 &1397976878
ParticleSystemRenderer:
...
...
@@ -24104,6 +24280,7 @@ Transform:
m_LocalPosition: {x: -29.35, y: -1, z: 0}
m_LocalScale: {x: 4, y: 4, z: 1}
m_Children:
- {fileID: 807781317}
- {fileID: 1321537895}
- {fileID: 1083551487}
m_Father: {fileID: 1936604887}
...
...
@@ -24138,6 +24315,7 @@ MonoBehaviour:
- {fileID: 1231582144}
- {fileID: 72725770}
faceCam: {fileID: 1083551489}
interactWall: {fileID: 807781316}
movementText: {fileID: 355402846}
leftArrow: {fileID: 504731126}
rightArrow: {fileID: 7902344}
...
...
@@ -24164,7 +24342,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: 0
.07090902
, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
...
...
@@ -24175,7 +24353,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.
35
, y: 1.64}
m_Size: {x: 0.
9527254
, y: 1.64}
m_EdgeRadius: 0
--- !u!1 &1428727415
GameObject:
...
...
@@ -29244,11 +29422,6 @@ Canvas:
m_CorrespondingSourceObject: {fileID: 223530405003063200, guid: a6dd0ddad611645efbc5ef92c67041a7,
type: 2}
m_PrefabInternal: {fileID: 1532274092}
--- !u!4 &1603416592 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4885089913599246, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2}
m_PrefabInternal: {fileID: 1109435144}
--- !u!1 &1646371379
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -34097,7 +34270,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive:
0
m_IsActive:
1
--- !u!114 &1931458617
MonoBehaviour:
m_ObjectHideFlags: 0
...
...
@@ -34179,7 +34352,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1422126451}
- {fileID: 1603416592}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...
...
@@ -39290,7 +39462,7 @@ RectTransform:
m_Children:
- {fileID: 113816537}
m_Father: {fileID: 503603553}
m_RootOrder:
2
m_RootOrder:
3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs
View file @
875f7e22
...
...
@@ -24,31 +24,8 @@ public class PaperSpeech : MonoBehaviour, Character {
{
loadConversation
();
if
(
GameManager
.
ConversationStage
==
1
)
{
currentResponses
=
new
string
[]
{
"Hi there"
,
"Who are you"
,
"what is this place"
};
return
"Hello Player, I am Ahava"
;
}
else
if
(
GameManager
.
ConversationStage
==
2
)
{
currentResponses
=
new
string
[]
{
"stage 2 greeting response"
};
return
"well done on your performances!"
;
}
else
if
(
GameManager
.
ConversationStage
==
3
)
{
currentResponses
=
new
string
[]
{
"stage 3 greeting response"
};
return
"stage 3 greeting"
;
}
else
if
(
GameManager
.
ConversationStage
==
4
)
{
currentResponses
=
new
string
[]
{
"stage 4 greeting response"
};
return
"stage 4 greeting"
;
}
return
"Something has gone terribly wrong: The stage is: "
+
GameManager
.
ConversationStage
;
currentResponses
=
new
string
[]
{
"Read"
};
return
"You encounter a well drawn piece of paper on the ground. You can use the number keys to interact"
;
}
public
string
GoodbyeMessage
()
...
...
@@ -98,8 +75,6 @@ public class PaperSpeech : MonoBehaviour, Character {
private
void
loadConversation
()
{
conversation
.
Clear
();
responseQueue
.
Clear
();