diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs index 992d2ffd..2c63e227 100755 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs @@ -12,6 +12,10 @@ namespace Fungus.Script Rect cursorChangeRect; public const float minViewWidth = 300; + static bool locked = false; + static GUIStyle lockButtonStyle; + static FungusScript activeFungusScript; + private List windowSequenceMap = new List(); [MenuItem("Window/Fungus Script")] @@ -20,8 +24,14 @@ namespace Fungus.Script GetWindow(typeof(FungusScriptWindow), false, "Fungus Script"); } - void OnEnable() - { + // Implementing this method causes the padlock image to display on the window + // https://leahayes.wordpress.com/2013/04/30/adding-the-little-padlock-button-to-your-editorwindow/#more-455 + void ShowButton(Rect position) { + if (lockButtonStyle == null) + { + lockButtonStyle = "IN LockButton"; + } + locked = GUI.Toggle(position, locked, GUIContent.none, lockButtonStyle); } public void OnInspectorUpdate() @@ -31,9 +41,17 @@ namespace Fungus.Script static public FungusScript GetFungusScript() { + if (locked && activeFungusScript != null) + { + return activeFungusScript; + } + + locked = false; + if (Selection.activeGameObject != null) { - return Selection.activeGameObject.GetComponent(); + activeFungusScript = Selection.activeGameObject.GetComponent(); + return activeFungusScript; } return null; diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta index c6e53bd9..f8a7fac2 100644 --- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta +++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta @@ -4,5 +4,5 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 2800000, guid: c22400d5bd211479099238aaacbd4852, type: 3} userData: diff --git a/Assets/Fungus/Sprite/Sprites/Button.psd b/Assets/Fungus/Sprite/Sprites/Button.psd deleted file mode 100644 index c884e9d2..00000000 Binary files a/Assets/Fungus/Sprite/Sprites/Button.psd and /dev/null differ diff --git a/Assets/Fungus/Sprite/Sprites/Button.psd.meta b/Assets/Fungus/Sprite/Sprites/Button.psd.meta deleted file mode 100644 index a98e776b..00000000 --- a/Assets/Fungus/Sprite/Sprites/Button.psd.meta +++ /dev/null @@ -1,48 +0,0 @@ -fileFormatVersion: 2 -guid: 83e4bd04047eb419fbb6b205dd1f2f91 -TextureImporter: - fileIDToRecycleName: - 21300000: Button - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Sprite/Sprites/Fungus.png b/Assets/Fungus/Sprite/Sprites/Fungus.png deleted file mode 100644 index 9d934a99..00000000 Binary files a/Assets/Fungus/Sprite/Sprites/Fungus.png and /dev/null differ diff --git a/Assets/Fungus/Sprite/Sprites/ScriptIcon.png b/Assets/Fungus/Sprite/Sprites/ScriptIcon.png deleted file mode 100644 index 995f5ea7..00000000 Binary files a/Assets/Fungus/Sprite/Sprites/ScriptIcon.png and /dev/null differ diff --git a/Assets/Fungus/Sprite/Sprites/ScriptIcon.png.meta b/Assets/Fungus/Sprite/Sprites/ScriptIcon.png.meta deleted file mode 100644 index ee295d47..00000000 --- a/Assets/Fungus/Sprite/Sprites/ScriptIcon.png.meta +++ /dev/null @@ -1,50 +0,0 @@ -fileFormatVersion: 2 -guid: 0e15bd6b84cec4a2499ad47398736102 -TextureImporter: - fileIDToRecycleName: - 21300000: Mushroom - 21300002: Mushroom 1 - 21300004: ScriptIcon - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Sprite/Sprites/ScriptIcon32.png b/Assets/Fungus/Sprite/Sprites/ScriptIcon32.png new file mode 100644 index 00000000..ab22ce9c Binary files /dev/null and b/Assets/Fungus/Sprite/Sprites/ScriptIcon32.png differ diff --git a/Assets/Fungus/Sprite/Sprites/Fungus.png.meta b/Assets/Fungus/Sprite/Sprites/ScriptIcon32.png.meta similarity index 91% rename from Assets/Fungus/Sprite/Sprites/Fungus.png.meta rename to Assets/Fungus/Sprite/Sprites/ScriptIcon32.png.meta index c21f13cd..c34583e9 100644 --- a/Assets/Fungus/Sprite/Sprites/Fungus.png.meta +++ b/Assets/Fungus/Sprite/Sprites/ScriptIcon32.png.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 773b12a7efad440aeaaed4ef18989818 +guid: c22400d5bd211479099238aaacbd4852 TextureImporter: fileIDToRecycleName: - 21300000: Fungus + 21300000: ScriptIcon32 serializedVersion: 2 mipmaps: mipMapMode: 0 @@ -25,7 +25,7 @@ TextureImporter: textureFormat: -1 maxTextureSize: 1024 textureSettings: - filterMode: 0 + filterMode: -1 aniso: 1 mipBias: -1 wrapMode: 1 diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index d489f974..5577c1be 100644 Binary files a/Assets/Shuttle/ShuttleGame.unity and b/Assets/Shuttle/ShuttleGame.unity differ