From 798a8d8d310611f61eda580cc9461b778e45f91a Mon Sep 17 00:00:00 2001 From: ClairePeta Date: Fri, 13 Sep 2019 18:54:02 +1000 Subject: [PATCH] Client deaths moves them from screen. Lobby fix to display 8 names Icons in client scene Small Menu changes - remove tutorial scene --- Assets/Data/Inventory/Tutorial5.asset | 4 +- Assets/Data/Logic Blocks/Diagonal Left.asset | 3 - .../Logic Blocks/Diagonal Left.asset.meta | 8 - Assets/Data/Logic Blocks/Diagonal Right.asset | 3 - .../Logic Blocks/Diagonal Right.asset.meta | 8 - Assets/Data/Logic Blocks/Jump.asset | 4 +- Assets/Data/Logic Blocks/Move x2.asset | 4 +- Assets/Data/Logic Blocks/Move.asset | 4 +- Assets/Data/Logic Blocks/Rotate Left.asset | 3 - .../Data/Logic Blocks/Rotate Left.asset.meta | 8 - Assets/Data/Logic Blocks/Rotate Right.asset | 3 - .../Data/Logic Blocks/Rotate Right.asset.meta | 8 - Assets/Data/Logic Blocks/U-Turn.asset | 4 +- .../Plugins/IngameDebugConsole/Sprites.meta | 8 - Assets/Prefabs/UI/Bag Item.prefab | 2 +- Assets/Prefabs/UI/Logic Element.prefab | 148 ++++++++++++++++-- Assets/Scenes/Client Scenes/LoginScreen.unity | 4 +- .../Client Scenes/MainMenu Client.unity | 4 +- Assets/Scenes/Menus/Lobby.unity | 4 +- Assets/Scenes/Menus/MainMenu Server.unity | 4 +- Assets/Scripts/Character.cs | 3 +- Assets/Scripts/Components.meta | 8 - Assets/Scripts/Logic/Blocks/LogicBlock.cs | 2 + Assets/Scripts/UI/LogicElementUI.cs | 14 +- .../LiberationSans SDF.asset | 4 +- .../LogicBlock Icon/Diagonal Left.png | 3 - .../LogicBlock Icon/Diagonal Left.png.meta | 88 ----------- .../LogicBlock Icon/Diagonal Right.png | 3 - .../LogicBlock Icon/Diagonal Right.png.meta | 88 ----------- Assets/Textures/LogicBlock Icon/Jump.png | 3 - Assets/Textures/LogicBlock Icon/Jump.png.meta | 88 ----------- Assets/Textures/LogicBlock Icon/Move x2.png | 3 - .../Textures/LogicBlock Icon/Move x2.png.meta | 88 ----------- Assets/Textures/LogicBlock Icon/Move.png | 3 - Assets/Textures/LogicBlock Icon/Move.png.meta | 88 ----------- .../Textures/LogicBlock Icon/Rotate Left.png | 3 - .../LogicBlock Icon/Rotate Left.png.meta | 88 ----------- .../Textures/LogicBlock Icon/Rotate Right.png | 3 - .../LogicBlock Icon/Rotate Right.png.meta | 88 ----------- Assets/Textures/LogicBlock Icon/U-Turn.png | 3 - .../Textures/LogicBlock Icon/U-Turn.png.meta | 88 ----------- .../LogicBlock Icon/_DiagonalLeft.jpg | 3 - .../LogicBlock Icon/_DiagonalLeft.jpg.meta | 88 ----------- .../LogicBlock Icon/_DiagonalLeft.png | 4 +- .../LogicBlock Icon/_DiagonalLeft.png.meta | 71 ++++++++- .../LogicBlock Icon/_DiagonalRight.jpg | 3 - .../LogicBlock Icon/_DiagonalRight.jpg.meta | 88 ----------- .../LogicBlock Icon/_DiagonalRight.png | 4 +- .../LogicBlock Icon/_DiagonalRight.png.meta | 71 ++++++++- Assets/Textures/LogicBlock Icon/_Jump.jpg | 3 - .../Textures/LogicBlock Icon/_Jump.jpg.meta | 88 ----------- .../Textures/LogicBlock Icon/_Jump.png.meta | 69 +++++++- Assets/Textures/LogicBlock Icon/_Move.jpg | 3 - .../Textures/LogicBlock Icon/_Move.jpg.meta | 88 ----------- .../Textures/LogicBlock Icon/_Move.png.meta | 69 +++++++- Assets/Textures/LogicBlock Icon/_Movex2.jpg | 3 - .../Textures/LogicBlock Icon/_Movex2.jpg.meta | 88 ----------- .../Textures/LogicBlock Icon/_Movex2.png.meta | 69 +++++++- .../Textures/LogicBlock Icon/_RotateLeft.jpg | 3 - .../LogicBlock Icon/_RotateLeft.jpg.meta | 88 ----------- .../LogicBlock Icon/_RotateLeft.png.meta | 69 +++++++- .../Textures/LogicBlock Icon/_RotateRight.jpg | 3 - .../LogicBlock Icon/_RotateRight.jpg.meta | 88 ----------- .../LogicBlock Icon/_RotateRight.png.meta | 69 +++++++- Assets/Textures/LogicBlock Icon/_U-Turn.jpg | 3 - .../Textures/LogicBlock Icon/_U-Turn.jpg.meta | 88 ----------- .../Textures/LogicBlock Icon/_U-Turn.png.meta | 69 +++++++- 67 files changed, 672 insertions(+), 1617 deletions(-) delete mode 100644 Assets/Data/Logic Blocks/Diagonal Left.asset delete mode 100644 Assets/Data/Logic Blocks/Diagonal Left.asset.meta delete mode 100644 Assets/Data/Logic Blocks/Diagonal Right.asset delete mode 100644 Assets/Data/Logic Blocks/Diagonal Right.asset.meta delete mode 100644 Assets/Data/Logic Blocks/Rotate Left.asset delete mode 100644 Assets/Data/Logic Blocks/Rotate Left.asset.meta delete mode 100644 Assets/Data/Logic Blocks/Rotate Right.asset delete mode 100644 Assets/Data/Logic Blocks/Rotate Right.asset.meta delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites.meta delete mode 100644 Assets/Scripts/Components.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Diagonal Left.png delete mode 100644 Assets/Textures/LogicBlock Icon/Diagonal Left.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Diagonal Right.png delete mode 100644 Assets/Textures/LogicBlock Icon/Diagonal Right.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Jump.png delete mode 100644 Assets/Textures/LogicBlock Icon/Jump.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Move x2.png delete mode 100644 Assets/Textures/LogicBlock Icon/Move x2.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Move.png delete mode 100644 Assets/Textures/LogicBlock Icon/Move.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Rotate Left.png delete mode 100644 Assets/Textures/LogicBlock Icon/Rotate Left.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/Rotate Right.png delete mode 100644 Assets/Textures/LogicBlock Icon/Rotate Right.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/U-Turn.png delete mode 100644 Assets/Textures/LogicBlock Icon/U-Turn.png.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_Jump.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_Jump.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_Move.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_Move.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_Movex2.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_Movex2.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_RotateLeft.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_RotateLeft.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_RotateRight.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_RotateRight.jpg.meta delete mode 100644 Assets/Textures/LogicBlock Icon/_U-Turn.jpg delete mode 100644 Assets/Textures/LogicBlock Icon/_U-Turn.jpg.meta diff --git a/Assets/Data/Inventory/Tutorial5.asset b/Assets/Data/Inventory/Tutorial5.asset index 5a0e4a0..887b817 100644 --- a/Assets/Data/Inventory/Tutorial5.asset +++ b/Assets/Data/Inventory/Tutorial5.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c81d2820a9790c0163625e9c05c69cb3f8d3d7492404c40895fd21f9848db8f6 -size 744 +oid sha256:4e946a10e023a49c7d94a0d3ae57ec0764ddd9674ec6e74ffd94f9f098f81853 +size 1436 diff --git a/Assets/Data/Logic Blocks/Diagonal Left.asset b/Assets/Data/Logic Blocks/Diagonal Left.asset deleted file mode 100644 index 948bd41..0000000 --- a/Assets/Data/Logic Blocks/Diagonal Left.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ec63e7f90a7facdb5a834a6de80a1d3a24eefad4e66edf48da4beeea8997828 -size 797 diff --git a/Assets/Data/Logic Blocks/Diagonal Left.asset.meta b/Assets/Data/Logic Blocks/Diagonal Left.asset.meta deleted file mode 100644 index 2c84677..0000000 --- a/Assets/Data/Logic Blocks/Diagonal Left.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 752565cc5a95020498b9ed396343f3c0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Diagonal Right.asset b/Assets/Data/Logic Blocks/Diagonal Right.asset deleted file mode 100644 index 9367242..0000000 --- a/Assets/Data/Logic Blocks/Diagonal Right.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6148522c50f0cd5dc7d6ca8ea8a6b0fd461d82fa7ca2b018633eebd8e5fd6577 -size 798 diff --git a/Assets/Data/Logic Blocks/Diagonal Right.asset.meta b/Assets/Data/Logic Blocks/Diagonal Right.asset.meta deleted file mode 100644 index e4cd8f5..0000000 --- a/Assets/Data/Logic Blocks/Diagonal Right.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: efab8a199b362cb42b3e0bce70dd05f4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Jump.asset b/Assets/Data/Logic Blocks/Jump.asset index 76bc20f..539bbf2 100644 --- a/Assets/Data/Logic Blocks/Jump.asset +++ b/Assets/Data/Logic Blocks/Jump.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9211422d6f3cfba3e04170bd445709448f60af5eb2070a1a6453cb27ec20ca1 -size 534 +oid sha256:14a02c7122e6f6e41dded7d660f2ebfb079e12d62f6ed497703aedb690d199bf +size 652 diff --git a/Assets/Data/Logic Blocks/Move x2.asset b/Assets/Data/Logic Blocks/Move x2.asset index 43c5393..6fd3ffc 100644 --- a/Assets/Data/Logic Blocks/Move x2.asset +++ b/Assets/Data/Logic Blocks/Move x2.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6f80e7840f01c43e8f42617d2f40af783c5ceca1117dea8f4dfd9ca24ccdeb2 -size 554 +oid sha256:29eb5a502a740f7952ebc9213d321f98813c16fbd20cd57fd5ba49e29ffc03b3 +size 629 diff --git a/Assets/Data/Logic Blocks/Move.asset b/Assets/Data/Logic Blocks/Move.asset index 7a409b6..fc2b7b3 100644 --- a/Assets/Data/Logic Blocks/Move.asset +++ b/Assets/Data/Logic Blocks/Move.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c997ef9823b34568317d076bc4e80df598da865723f32016fbbc3cc9f82211d -size 604 +oid sha256:eb83c67920b8147ae74530cd8f069eb410675b3c033fc4708296fc8224626eca +size 627 diff --git a/Assets/Data/Logic Blocks/Rotate Left.asset b/Assets/Data/Logic Blocks/Rotate Left.asset deleted file mode 100644 index 3955742..0000000 --- a/Assets/Data/Logic Blocks/Rotate Left.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4eeaa30543f44211dc633b143fed2198f22e0efffa66487324ddcc30be54401 -size 610 diff --git a/Assets/Data/Logic Blocks/Rotate Left.asset.meta b/Assets/Data/Logic Blocks/Rotate Left.asset.meta deleted file mode 100644 index 4edc23c..0000000 --- a/Assets/Data/Logic Blocks/Rotate Left.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aa238796cf1886244951ec8c2fed1855 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Rotate Right.asset b/Assets/Data/Logic Blocks/Rotate Right.asset deleted file mode 100644 index 2db71c6..0000000 --- a/Assets/Data/Logic Blocks/Rotate Right.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e63d262fe598ea766710e22e16e8a332c70be0f95b9c4e507448c05b99f9bedb -size 612 diff --git a/Assets/Data/Logic Blocks/Rotate Right.asset.meta b/Assets/Data/Logic Blocks/Rotate Right.asset.meta deleted file mode 100644 index 69e6fa2..0000000 --- a/Assets/Data/Logic Blocks/Rotate Right.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 41f4cb946475b2849a802a8297d81e25 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/U-Turn.asset b/Assets/Data/Logic Blocks/U-Turn.asset index 08fdefb..be949c1 100644 --- a/Assets/Data/Logic Blocks/U-Turn.asset +++ b/Assets/Data/Logic Blocks/U-Turn.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21b7a3231e887075a5ab8459ed4e0c0471df331b30a8695e744595e6de124907 -size 736 +oid sha256:5589e116c00bd430e76bca9413dbd9c842eb79e7872fb67a8efcd23645af6c59 +size 812 diff --git a/Assets/Plugins/IngameDebugConsole/Sprites.meta b/Assets/Plugins/IngameDebugConsole/Sprites.meta deleted file mode 100644 index 504a23d..0000000 --- a/Assets/Plugins/IngameDebugConsole/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cb5d7b23a9e684a41a6a5d4f300eb1e6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Bag Item.prefab b/Assets/Prefabs/UI/Bag Item.prefab index fb539b3..282ec30 100644 --- a/Assets/Prefabs/UI/Bag Item.prefab +++ b/Assets/Prefabs/UI/Bag Item.prefab @@ -39,7 +39,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.021874998, y: 0.4595189} m_AnchorMax: {x: 0.14125, y: 0.57900006} - m_AnchoredPosition: {x: -0.2000122, y: -2.399994} + m_AnchoredPosition: {x: -0.20007324, y: -2.399994} m_SizeDelta: {x: -0.9000244, y: -2.5999756} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2209317013564011201 diff --git a/Assets/Prefabs/UI/Logic Element.prefab b/Assets/Prefabs/UI/Logic Element.prefab index 5c0c244..c050abb 100644 --- a/Assets/Prefabs/UI/Logic Element.prefab +++ b/Assets/Prefabs/UI/Logic Element.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 379345338526881263} - {fileID: 2825904309766046644} m_Father: {fileID: 0} m_RootOrder: 0 @@ -60,7 +61,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0.015138149, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -89,6 +90,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LogicElement: {fileID: 0} + background: {fileID: 3145988812348999089} + icon: {fileID: 995834699587958428} +--- !u!1 &3145988812348999089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 379345338526881263} + - component: {fileID: 7343545734767784556} + - component: {fileID: 8597154367142176455} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &379345338526881263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3145988812348999089} + 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: 315265088473579728} + m_RootOrder: 0 + 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_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7343545734767784556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3145988812348999089} + m_CullTransparentMesh: 0 +--- !u!114 &8597154367142176455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3145988812348999089} + 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: 0, b: 0, a: 1} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8739916369872115426 GameObject: m_ObjectHideFlags: 0 @@ -99,7 +176,9 @@ GameObject: m_Component: - component: {fileID: 2825904309766046644} - component: {fileID: 8242920397958318725} - - component: {fileID: 4794918698464335520} + - component: {fileID: 9189242276882465976} + - component: {fileID: 3243462907438011072} + - component: {fileID: 7416201642898487163} m_Layer: 5 m_Name: TextMeshPro Text m_TagString: Untagged @@ -119,7 +198,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 315265088473579728} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -134,7 +213,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8739916369872115426} m_CullTransparentMesh: 0 ---- !u!114 &4794918698464335520 +--- !u!23 &9189242276882465976 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8739916369872115426} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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!33 &3243462907438011072 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8739916369872115426} + m_Mesh: {fileID: 0} +--- !u!114 &7416201642898487163 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -163,8 +287,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -182,10 +306,10 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 37.6 - m_fontSizeBase: 36 + m_fontSize: 17 + m_fontSizeBase: 17 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -200,7 +324,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 0 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -220,9 +344,9 @@ MonoBehaviour: m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 76.430664, z: 0, w: 0} m_textInfo: - textComponent: {fileID: 4794918698464335520} + textComponent: {fileID: 7416201642898487163} characterCount: 5 spriteCount: 0 spaceCount: 0 diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index 6bbc340..ea105c2 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d62fbbd19c357e8a8f7dc643cb14fd4912694dcb56997edb1736298346b4bf9a -size 260483 +oid sha256:8db303555f2b5039989ee896f62f0d295bd6448dddc4bbe893977bd85a65d6ea +size 260334 diff --git a/Assets/Scenes/Client Scenes/MainMenu Client.unity b/Assets/Scenes/Client Scenes/MainMenu Client.unity index 358a5b6..3cf33ad 100644 --- a/Assets/Scenes/Client Scenes/MainMenu Client.unity +++ b/Assets/Scenes/Client Scenes/MainMenu Client.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ad66cb4d20f08011735e1de4453f10efdba672afead991a8c3637be8e46c1c9 -size 147837 +oid sha256:30ff94cec01f8918d38e805f743fbb5377ebe60d129a33158cba29fda8088c60 +size 142860 diff --git a/Assets/Scenes/Menus/Lobby.unity b/Assets/Scenes/Menus/Lobby.unity index f553725..eccdea1 100644 --- a/Assets/Scenes/Menus/Lobby.unity +++ b/Assets/Scenes/Menus/Lobby.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41504b94f956056ec1a07d3a60f25c9ae6fc6bddc8d60d7d614da1b396003576 -size 46619 +oid sha256:6d468b9a3a6350ef29c53054b57586286bf9187c8023a26dc2b1add45b8465c0 +size 46620 diff --git a/Assets/Scenes/Menus/MainMenu Server.unity b/Assets/Scenes/Menus/MainMenu Server.unity index d8f30c1..24b72a0 100644 --- a/Assets/Scenes/Menus/MainMenu Server.unity +++ b/Assets/Scenes/Menus/MainMenu Server.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19e715ef892a3ffdf3f8a66c86509b8a944cbc0c2ce8a48a5e7cc4a871240685 -size 142616 +oid sha256:159c761b5e6cd07723112cccb7f6cd3c7160f84327b1ca89967ad80b68a60404 +size 142635 diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 8ec5b67..b9ab41d 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -15,7 +15,7 @@ public class Character : MonoBehaviour public bool inPit = false; //Did I fall into a pit? public bool stuck = false; //Am I still stuck? public bool justMoved = false; //Was the logic block I just executed a move command? - + Vector3 death = new Vector3(-50, 0, 0); #region Inspector Fields [SerializeField] @@ -73,6 +73,7 @@ public class Character : MonoBehaviour { if(lives < 1) { + this.transform.position = death; //this.enabled = false; //gameObject.SetActive(false); } diff --git a/Assets/Scripts/Components.meta b/Assets/Scripts/Components.meta deleted file mode 100644 index 5a95b09..0000000 --- a/Assets/Scripts/Components.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8d7394d70ec233849a60a26da5f23b75 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Logic/Blocks/LogicBlock.cs b/Assets/Scripts/Logic/Blocks/LogicBlock.cs index 4000e74..e46ceb0 100644 --- a/Assets/Scripts/Logic/Blocks/LogicBlock.cs +++ b/Assets/Scripts/Logic/Blocks/LogicBlock.cs @@ -15,6 +15,8 @@ public abstract class LogicBlock : ScriptableObject [Tooltip("Color which will identify this element")] public Color Color; + public Sprite icon; + [SerializeField] [Tooltip("Name which will appear in the UI")] protected string _DisplayName; diff --git a/Assets/Scripts/UI/LogicElementUI.cs b/Assets/Scripts/UI/LogicElementUI.cs index 4f38598..2163358 100644 --- a/Assets/Scripts/UI/LogicElementUI.cs +++ b/Assets/Scripts/UI/LogicElementUI.cs @@ -30,7 +30,10 @@ public class LogicElementUI : Dragable protected TextMeshProUGUI nameText; //background image to color; - protected Image background; + public GameObject background; + + //sprite imager; + public GameObject icon; protected LogicElementHolder currentHolder; @@ -55,15 +58,16 @@ public class LogicElementUI : Dragable if (nameText == null) nameText = GetComponentInChildren(); - if (background == null) - background = GetComponentInChildren(); - //Set UI if (LogicElement != null) { //If name null use file name nameText.text = LogicElement.DisplayName; - background.color = LogicElement.Color; + nameText.outlineColor = new Color32(0, 0, 0, 255); + nameText.outlineWidth = 0.1f; + + icon.GetComponent().color = LogicElement.Color; + background.GetComponent().sprite = LogicElement.icon; } } diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index cbea438..e16b6aa 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:277a4a5984725c4233f3f633fafa25b65468e01502eb4412444f169070aad458 -size 2174066 +oid sha256:1ec299121e97bcb91f1ef601f23db5a2084e10b846ce5546f25548e85f7aefd4 +size 2174077 diff --git a/Assets/Textures/LogicBlock Icon/Diagonal Left.png b/Assets/Textures/LogicBlock Icon/Diagonal Left.png deleted file mode 100644 index 78d25c2..0000000 --- a/Assets/Textures/LogicBlock Icon/Diagonal Left.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:797c80359d748ca9eb93ae935f6699dc9356c2444013b2767ce9613cfdd6bd30 -size 422 diff --git a/Assets/Textures/LogicBlock Icon/Diagonal Left.png.meta b/Assets/Textures/LogicBlock Icon/Diagonal Left.png.meta deleted file mode 100644 index 39195b2..0000000 --- a/Assets/Textures/LogicBlock Icon/Diagonal Left.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: b5303b6285b27d345a2657490d651805 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Diagonal Right.png b/Assets/Textures/LogicBlock Icon/Diagonal Right.png deleted file mode 100644 index 2baff7f..0000000 --- a/Assets/Textures/LogicBlock Icon/Diagonal Right.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6047cac018dfa6a1237d44383a3e044fd86c1911443d758a296925b2ac3e914 -size 418 diff --git a/Assets/Textures/LogicBlock Icon/Diagonal Right.png.meta b/Assets/Textures/LogicBlock Icon/Diagonal Right.png.meta deleted file mode 100644 index a022db7..0000000 --- a/Assets/Textures/LogicBlock Icon/Diagonal Right.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: f9c121aa5dd94774292bbe7e9697d8d8 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Jump.png b/Assets/Textures/LogicBlock Icon/Jump.png deleted file mode 100644 index 8248507..0000000 --- a/Assets/Textures/LogicBlock Icon/Jump.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93799cce52b318c5b4e43e6930f5e371a4b76d79d922f024b37d38109f79c15f -size 1062 diff --git a/Assets/Textures/LogicBlock Icon/Jump.png.meta b/Assets/Textures/LogicBlock Icon/Jump.png.meta deleted file mode 100644 index f5363d2..0000000 --- a/Assets/Textures/LogicBlock Icon/Jump.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 99c3f925fa4d07b449cdd93a393bd4cb -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Move x2.png b/Assets/Textures/LogicBlock Icon/Move x2.png deleted file mode 100644 index 02e50a1..0000000 --- a/Assets/Textures/LogicBlock Icon/Move x2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13117150ad22150314bc2852c4251e64855a4bcff0166fc4848b131ed33fb7e5 -size 411 diff --git a/Assets/Textures/LogicBlock Icon/Move x2.png.meta b/Assets/Textures/LogicBlock Icon/Move x2.png.meta deleted file mode 100644 index 8feeb2b..0000000 --- a/Assets/Textures/LogicBlock Icon/Move x2.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: d0027d9d4de34bf48876244e09b61986 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Move.png b/Assets/Textures/LogicBlock Icon/Move.png deleted file mode 100644 index 68be504..0000000 --- a/Assets/Textures/LogicBlock Icon/Move.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:198b7478a58b6bc3553bb361803916249b080ef0f80719a5854d93ffc5dcc106 -size 480 diff --git a/Assets/Textures/LogicBlock Icon/Move.png.meta b/Assets/Textures/LogicBlock Icon/Move.png.meta deleted file mode 100644 index 62beacf..0000000 --- a/Assets/Textures/LogicBlock Icon/Move.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 93a9f29ab6aec3d459bade2ad6f8269a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Rotate Left.png b/Assets/Textures/LogicBlock Icon/Rotate Left.png deleted file mode 100644 index 373f079..0000000 --- a/Assets/Textures/LogicBlock Icon/Rotate Left.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c3a129b3f411f4de61a5cf801edf87427e5b9392249e9572a4b6e1217df974 -size 644 diff --git a/Assets/Textures/LogicBlock Icon/Rotate Left.png.meta b/Assets/Textures/LogicBlock Icon/Rotate Left.png.meta deleted file mode 100644 index 3c4d2ad..0000000 --- a/Assets/Textures/LogicBlock Icon/Rotate Left.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 64fc00eca60a5514d9b214f7fa403b1d -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/Rotate Right.png b/Assets/Textures/LogicBlock Icon/Rotate Right.png deleted file mode 100644 index 730c831..0000000 --- a/Assets/Textures/LogicBlock Icon/Rotate Right.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:631aa2b6cdc2cfca015d45c371935803a566feec1c5484d3a79228e3713694ed -size 633 diff --git a/Assets/Textures/LogicBlock Icon/Rotate Right.png.meta b/Assets/Textures/LogicBlock Icon/Rotate Right.png.meta deleted file mode 100644 index 65e9eaf..0000000 --- a/Assets/Textures/LogicBlock Icon/Rotate Right.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 144bff30f700f224d8930e1e21503aa6 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/U-Turn.png b/Assets/Textures/LogicBlock Icon/U-Turn.png deleted file mode 100644 index 309da5e..0000000 --- a/Assets/Textures/LogicBlock Icon/U-Turn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b30d3163eb78e7e67ee8e4f9c4a2cca40c69e4415ce7024e4f85ad1f6e4ccc04 -size 1094 diff --git a/Assets/Textures/LogicBlock Icon/U-Turn.png.meta b/Assets/Textures/LogicBlock Icon/U-Turn.png.meta deleted file mode 100644 index 536883b..0000000 --- a/Assets/Textures/LogicBlock Icon/U-Turn.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: dcd15978a1c1f2d4a939666ac8750eba -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg deleted file mode 100644 index 9cbfc87..0000000 --- a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd59b204419c5aee422363ff1ff1439ef3a1b9fb08ca9bbb60c28d5574ad38c5 -size 1943 diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg.meta b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg.meta deleted file mode 100644 index fa70158..0000000 --- a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 0d08281cc3eb5b0448ff9e615ed06a30 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png index e7b8e2f..84228ac 100644 --- a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png +++ b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38cdec4a7f28cfae770c0a4b0e5fc75e0ba0c75c86656fdc8ac34f63bdda407e -size 449 +oid sha256:0b9ac2019b436b0c877ff6326eef450d6f75a07a3e3fbaf3477167504ab98d5f +size 455 diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png.meta b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png.meta index 20ad32a..89b55e3 100644 --- a/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png.meta +++ b/Assets/Textures/LogicBlock Icon/_DiagonalLeft.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: c90e597d9f8f2c74585ce58cb1b1c145 +guid: a61d8b24d0b9d044280cf21e85b5c636 TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg b/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg deleted file mode 100644 index 0fd4b05..0000000 --- a/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8df6ff6b298a2cc62082edf262c2ed62c9d0266dc62845deb61f9fa4f2728016 -size 1985 diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg.meta b/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg.meta deleted file mode 100644 index 9bdd0bc..0000000 --- a/Assets/Textures/LogicBlock Icon/_DiagonalRight.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 88b528743afadb64eba2de2adac92bcd -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalRight.png b/Assets/Textures/LogicBlock Icon/_DiagonalRight.png index 84228ac..e7b8e2f 100644 --- a/Assets/Textures/LogicBlock Icon/_DiagonalRight.png +++ b/Assets/Textures/LogicBlock Icon/_DiagonalRight.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b9ac2019b436b0c877ff6326eef450d6f75a07a3e3fbaf3477167504ab98d5f -size 455 +oid sha256:38cdec4a7f28cfae770c0a4b0e5fc75e0ba0c75c86656fdc8ac34f63bdda407e +size 449 diff --git a/Assets/Textures/LogicBlock Icon/_DiagonalRight.png.meta b/Assets/Textures/LogicBlock Icon/_DiagonalRight.png.meta index 8738ab8..ff251de 100644 --- a/Assets/Textures/LogicBlock Icon/_DiagonalRight.png.meta +++ b/Assets/Textures/LogicBlock Icon/_DiagonalRight.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: a61d8b24d0b9d044280cf21e85b5c636 +guid: c90e597d9f8f2c74585ce58cb1b1c145 TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_Jump.jpg b/Assets/Textures/LogicBlock Icon/_Jump.jpg deleted file mode 100644 index 66b4cd6..0000000 --- a/Assets/Textures/LogicBlock Icon/_Jump.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e379415ee193de35ca759c551cb3bfcd3ce539613ac817ef399d4c250d65f89 -size 2372 diff --git a/Assets/Textures/LogicBlock Icon/_Jump.jpg.meta b/Assets/Textures/LogicBlock Icon/_Jump.jpg.meta deleted file mode 100644 index 9596993..0000000 --- a/Assets/Textures/LogicBlock Icon/_Jump.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: e1eb7e1008ae1024a8d57230fdd486dc -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_Jump.png.meta b/Assets/Textures/LogicBlock Icon/_Jump.png.meta index 9ca0929..1b3164d 100644 --- a/Assets/Textures/LogicBlock Icon/_Jump.png.meta +++ b/Assets/Textures/LogicBlock Icon/_Jump.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_Move.jpg b/Assets/Textures/LogicBlock Icon/_Move.jpg deleted file mode 100644 index 735ff31..0000000 --- a/Assets/Textures/LogicBlock Icon/_Move.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06db3e29c4be156d7992c2f7446121ea97fb903c4cab99908dce5347e9c50073 -size 2502 diff --git a/Assets/Textures/LogicBlock Icon/_Move.jpg.meta b/Assets/Textures/LogicBlock Icon/_Move.jpg.meta deleted file mode 100644 index 7a89db7..0000000 --- a/Assets/Textures/LogicBlock Icon/_Move.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: a107cd79ff6dabb4993cae4a4b19d982 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_Move.png.meta b/Assets/Textures/LogicBlock Icon/_Move.png.meta index 4c4c3c1..37dd729 100644 --- a/Assets/Textures/LogicBlock Icon/_Move.png.meta +++ b/Assets/Textures/LogicBlock Icon/_Move.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_Movex2.jpg b/Assets/Textures/LogicBlock Icon/_Movex2.jpg deleted file mode 100644 index 5edbc22..0000000 --- a/Assets/Textures/LogicBlock Icon/_Movex2.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea2190d64c3e18ebe2037da53de19fba8bd8183068ea5e926ded6bb60dbb6a76 -size 2430 diff --git a/Assets/Textures/LogicBlock Icon/_Movex2.jpg.meta b/Assets/Textures/LogicBlock Icon/_Movex2.jpg.meta deleted file mode 100644 index eeb8180..0000000 --- a/Assets/Textures/LogicBlock Icon/_Movex2.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 656df421e3971ff44a4c8eb525cd9a8c -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_Movex2.png.meta b/Assets/Textures/LogicBlock Icon/_Movex2.png.meta index 672da8c..895072b 100644 --- a/Assets/Textures/LogicBlock Icon/_Movex2.png.meta +++ b/Assets/Textures/LogicBlock Icon/_Movex2.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg b/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg deleted file mode 100644 index 91314e4..0000000 --- a/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3c30dfc4ede620fa22a474b64e488cca5c371ea6aa15d34b3718ff77c816e88 -size 2663 diff --git a/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg.meta b/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg.meta deleted file mode 100644 index 8e8170b..0000000 --- a/Assets/Textures/LogicBlock Icon/_RotateLeft.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: fc2a7bbbef5647c4c9b52f1a4401f6f4 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_RotateLeft.png.meta b/Assets/Textures/LogicBlock Icon/_RotateLeft.png.meta index d08998a..066a838 100644 --- a/Assets/Textures/LogicBlock Icon/_RotateLeft.png.meta +++ b/Assets/Textures/LogicBlock Icon/_RotateLeft.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_RotateRight.jpg b/Assets/Textures/LogicBlock Icon/_RotateRight.jpg deleted file mode 100644 index 0322b4e..0000000 --- a/Assets/Textures/LogicBlock Icon/_RotateRight.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f9f179ff651994e420d515c2860015e5bb85a59b8d68a471a4f0c40ab1646f8 -size 2522 diff --git a/Assets/Textures/LogicBlock Icon/_RotateRight.jpg.meta b/Assets/Textures/LogicBlock Icon/_RotateRight.jpg.meta deleted file mode 100644 index 051a461..0000000 --- a/Assets/Textures/LogicBlock Icon/_RotateRight.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: f13e285bfcf1797418b354e129156a42 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_RotateRight.png.meta b/Assets/Textures/LogicBlock Icon/_RotateRight.png.meta index 14ecc11..532f69b 100644 --- a/Assets/Textures/LogicBlock Icon/_RotateRight.png.meta +++ b/Assets/Textures/LogicBlock Icon/_RotateRight.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Textures/LogicBlock Icon/_U-Turn.jpg b/Assets/Textures/LogicBlock Icon/_U-Turn.jpg deleted file mode 100644 index 706a3d1..0000000 --- a/Assets/Textures/LogicBlock Icon/_U-Turn.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5562c7e94fe041245601de0277b264da91f328901fe439e90b1f11672cb824cc -size 2339 diff --git a/Assets/Textures/LogicBlock Icon/_U-Turn.jpg.meta b/Assets/Textures/LogicBlock Icon/_U-Turn.jpg.meta deleted file mode 100644 index ee2b48c..0000000 --- a/Assets/Textures/LogicBlock Icon/_U-Turn.jpg.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 052eb90c7d8b4a84c9f21fe233527a1f -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/LogicBlock Icon/_U-Turn.png.meta b/Assets/Textures/LogicBlock Icon/_U-Turn.png.meta index 51b08dc..a9a46a7 100644 --- a/Assets/Textures/LogicBlock Icon/_U-Turn.png.meta +++ b/Assets/Textures/LogicBlock Icon/_U-Turn.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,13 +34,13 @@ TextureImporter: filterMode: -1 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,61 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []