Skip to content
Snippets Groups Projects
Commit 34555ee6 authored by Richard Marcus's avatar Richard Marcus
Browse files

UI fix and color tests

parent cbfa68ff
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3216 additions and 189 deletions
Assets/Canvas.prefab 0 → 100644
+ 580
− 0
View file @ 34555ee6
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5327365558672202250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5327365558672202251}
- component: {fileID: 5327365558672202246}
- component: {fileID: 5327365558672202249}
- component: {fileID: 5327365558672202248}
m_Layer: 5
m_Name: Scrollscreen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5327365558672202251
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365558672202250}
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: 5327365559183764513}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300, y: -253.04}
m_SizeDelta: {x: 600, y: 506.09}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5327365558672202246
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365558672202250}
m_CullTransparentMesh: 0
--- !u!114 &5327365558672202249
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365558672202250}
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_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
m_UseSpriteMesh: 0
--- !u!114 &5327365558672202248
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365558672202250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3}
m_Name:
m_EditorClassIdentifier:
scrolls: []
ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261,
type: 3}
DetailScreen: {fileID: 1220993978259625549}
x_Start: -240
y_Start: 200
X_Pacece_Between_Items: 110
y_Pacece_Between_Items: 110
number_of_Column: 3
--- !u!1 &5327365559183764517
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5327365559183764513}
- component: {fileID: 5327365559183764512}
- component: {fileID: 5327365559183764515}
- component: {fileID: 5327365559183764514}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5327365559183764513
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365559183764517}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 5327365560116525626}
- {fileID: 5327365560177621531}
- {fileID: 5327365558672202251}
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: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &5327365559183764512
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365559183764517}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &5327365559183764515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365559183764517}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &5327365559183764514
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365559183764517}
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!1 &5327365560116525629
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5327365560116525626}
- component: {fileID: 5327365560116525625}
- component: {fileID: 5327365560116525624}
- component: {fileID: 5327365560116525627}
m_Layer: 5
m_Name: Scrolls-Show
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5327365560116525626
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560116525629}
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: 1220993978259625550}
m_Father: {fileID: 5327365559183764513}
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: 300, y: 300}
m_SizeDelta: {x: 600, y: 600}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5327365560116525625
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560116525629}
m_CullTransparentMesh: 0
--- !u!114 &5327365560116525624
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560116525629}
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_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
m_UseSpriteMesh: 0
--- !u!114 &5327365560116525627
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560116525629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 92f58ba8e8c7bf243bfde7e6656c9064, type: 3}
m_Name:
m_EditorClassIdentifier:
scroll:
problemTheory:
solutionTheory:
label:
description:
declarations: []
--- !u!1 &5327365560177621530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5327365560177621531}
- component: {fileID: 5327365560177621526}
- component: {fileID: 5327365560177621529}
- component: {fileID: 5327365560177621528}
m_Layer: 5
m_Name: Factscreen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5327365560177621531
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560177621530}
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: 5327365559183764513}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -182.30078, y: -540}
m_SizeDelta: {x: 364.6, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5327365560177621526
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560177621530}
m_CullTransparentMesh: 0
--- !u!114 &5327365560177621529
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560177621530}
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_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
m_UseSpriteMesh: 0
--- !u!114 &5327365560177621528
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5327365560177621530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3}
m_Name:
m_EditorClassIdentifier:
prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
type: 3}
prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
type: 3}
prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143,
type: 3}
prefab_Default: {fileID: 0}
x_Start: -125
y_Start: 475
X_Pacece_Between_Items: 105
y_Pacece_Between_Items: 105
number_of_Column: 3
--- !u!114 &5327365560291695983
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1220993978259625549}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 92f58ba8e8c7bf243bfde7e6656c9064, type: 3}
m_Name:
m_EditorClassIdentifier:
scroll:
problemTheory:
solutionTheory:
label:
description:
declarations: []
--- !u!1001 &244219982806656404
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5327365560116525626}
m_Modifications:
- target: {fileID: 1410316395273548761, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_Name
value: ScrollPrefab
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000045776367
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_SizeDelta.x
value: 600
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_SizeDelta.y
value: 600
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6314539909600817396, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6314539909600817396, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6314539909600817396, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2966758062926209900, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0042141946
objectReference: {fileID: 0}
- target: {fileID: 4536977264099877230, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4536977264099877230, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4536977264099877230, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7189591644879713249, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_Value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7189591644879713249, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_Size
value: 0.2596249
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: efd7037a57100574780bb26bea0c0683, type: 3}
--- !u!1 &1220993978259625549 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1410316395273548761, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
m_PrefabInstance: {fileID: 244219982806656404}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1220993978259625550 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1410316395273548762, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
m_PrefabInstance: {fileID: 244219982806656404}
m_PrefabAsset: {fileID: 0}
Assets/Canvas.prefab.meta 0 → 100644
+ 7
− 0
View file @ 34555ee6
fileFormatVersion: 2
guid: 8f9a0c43755ac234f8bbc8cb59e4d244
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/HideUI.cs
+ 8
− 5
View file @ 34555ee6
...@@ -9,12 +9,15 @@ public class HideUI : MonoBehaviour ...@@ -9,12 +9,15 @@ public class HideUI : MonoBehaviour
public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl; public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl;
public bool LockOnly = true; public bool LockOnly = true;
public MeshRenderer CursorRenderer; public MeshRenderer CursorRenderer;
public Canvas UICanvas;
void Start() void Start()
{ {
if (!LockOnly) if (!LockOnly)
{ {
bool camActive = transform.localScale.x != 1; if(UICanvas==null)
UICanvas = GetComponentInChildren<Canvas>();
bool camActive = !UICanvas.enabled;
CamControl.enabled = camActive; CamControl.enabled = camActive;
CursorRenderer.enabled = camActive; CursorRenderer.enabled = camActive;
} }
...@@ -34,10 +37,10 @@ void Update() ...@@ -34,10 +37,10 @@ void Update()
} }
else else
{ {
transform.localScale = Vector3.one * ((transform.localScale.x + 1) % 2); // Rect.localScale = Vector3.one * ((Rect.localScale.x + 1) % 2);
bool camActive = transform.localScale.x != 1; //bool camActive = Rect.localScale.x != 1;
bool camActive = UICanvas.enabled;
UICanvas.enabled = !UICanvas.enabled;
CamControl.enabled = camActive; CamControl.enabled = camActive;
CursorRenderer.enabled = camActive; CursorRenderer.enabled = camActive;
} }
......
Assets/InventoryStuff/Inventory.meta 0 → 100644
+ 8
− 0
View file @ 34555ee6
fileFormatVersion: 2
guid: b543d9677cbde534ab69c0a229bfdb06
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/LineMaterial.mat
+ 1
− 1
View file @ 34555ee6
...@@ -79,5 +79,5 @@ Material: ...@@ -79,5 +79,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.43529412} - _Color: {r: 0.2737103, g: 0.5471698, b: 0.028390888, a: 0.43529412}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
Assets/Resources/Prefabs/Angle.prefab
+ 4
− 4
View file @ 34555ee6
...@@ -119,8 +119,8 @@ MonoBehaviour: ...@@ -119,8 +119,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4293217343
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.25, g: 0.3, b: 0.9, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
...@@ -538,8 +538,8 @@ MonoBehaviour: ...@@ -538,8 +538,8 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4293217343
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.25, g: 0.3, b: 0.9, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
......
Assets/Resources/Prefabs/Line.prefab
+ 3
− 3
View file @ 34555ee6
...@@ -146,14 +146,14 @@ MonoBehaviour: ...@@ -146,14 +146,14 @@ MonoBehaviour:
m_text: Test m_text: Test
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967293
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 0.993, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
m_fontColorGradient: m_fontColorGradient:
......
Assets/Resources/Prefabs/Sphere.prefab
+ 1
− 1
View file @ 34555ee6
...@@ -222,7 +222,7 @@ MonoBehaviour: ...@@ -222,7 +222,7 @@ MonoBehaviour:
m_text: Test m_text: Test
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
......
Assets/ToolModeSelector.cs
+ 4
− 1
View file @ 34555ee6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
public class ToolModeSelector : MonoBehaviour public class ToolModeSelector : MonoBehaviour
{ {
private Button[] Buttons; private Button[] Buttons;
private HideUI UIManager;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
...@@ -27,6 +28,7 @@ void Start() ...@@ -27,6 +28,7 @@ void Start()
Buttons[(int)CommunicationEvents.ActiveToolMode].transform.localScale *= 2; Buttons[(int)CommunicationEvents.ActiveToolMode].transform.localScale *= 2;
UIManager = GetComponentInParent<HideUI>();
} }
...@@ -42,7 +44,8 @@ public void Select(int id) ...@@ -42,7 +44,8 @@ public void Select(int id)
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ //Check if the ToolMode was switched { //Check if the ToolMode was switched
CheckToolModeSelection(); if(!UIManager.UICanvas.enabled)
CheckToolModeSelection();
} }
......
Assets/TreeWorld.unity
+ 2600
− 174
View file @ 34555ee6
This diff is collapsed.
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