diff --git a/.gitignore b/.gitignore index 0c8b33f..2f4fe25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /AssetStoreTools* -Diplomata/*.meta -Diplomata/*/*.meta -Diplomata/*/*/*.meta +*.meta *.unitypackage diff --git a/Diplomata Canvas.prefab b/Diplomata Canvas.prefab index 467c06a..fc64b8f 100644 Binary files a/Diplomata Canvas.prefab and b/Diplomata Canvas.prefab differ diff --git a/Diplomata Canvas.prefab.meta b/Diplomata Canvas.prefab.meta index a6b823e..fdc8d6d 100644 --- a/Diplomata Canvas.prefab.meta +++ b/Diplomata Canvas.prefab.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 7aafaeb89065055488a480eb69f6f90b -timeCreated: 1509662328 +guid: ab21347be76d2c64c98c7db5e9703fde +timeCreated: 1505607513 licenseType: Free NativeFormatImporter: - mainObjectFileID: 0 + mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Diplomata.meta b/Diplomata.meta index 2cdd63a..f4debb4 100644 --- a/Diplomata.meta +++ b/Diplomata.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e0df3f16e5144bc40b4e78198bf2755d +guid: 9ad2dc20ab846304db3dbdf02c38b958 folderAsset: yes -timeCreated: 1509662215 +timeCreated: 1504796521 licenseType: Free DefaultImporter: userData: diff --git a/Diplomata/Editor/MessagesEditor.cs b/Diplomata/Editor/MessagesEditor.cs index 536c1c9..22abda1 100644 --- a/Diplomata/Editor/MessagesEditor.cs +++ b/Diplomata/Editor/MessagesEditor.cs @@ -211,6 +211,14 @@ public static void Main() { } text += condition.DisplayHasItem(itemName); break; + case Condition.Type.DoesNotHaveTheItem: + var itemNameDont = ""; + if (Item.Find(diplomataEditor.inventory.items, condition.itemId) != null) { + itemNameDont = DictHandler.ContainsKey(Item.Find(diplomataEditor.inventory.items, condition.itemId).name, + diplomataEditor.preferences.currentLanguage).value; + } + text += condition.DisplayDoesNotHaveItem(itemNameDont); + break; case Condition.Type.ItemWasDiscarded: var itemNameDiscarded = ""; if (Item.Find(diplomataEditor.inventory.items, condition.itemId) != null) { @@ -966,7 +974,35 @@ public static void Sidebar() { GUILayout.EndHorizontal(); break; - + + case Condition.Type.DoesNotHaveTheItem: + GUILayout.BeginHorizontal(); + UpdateItemList(); + + var itemNameDont = ""; + + if (itemList.Length > 0) { + itemNameDont = DictHandler.ContainsKey(Item.Find(diplomataEditor.inventory.items, condition.itemId).name, diplomataEditor.preferences.currentLanguage).value; + } + + EditorGUI.BeginChangeCheck(); + + itemNameDont = DGUI.Popup("Does not have the item ", itemNameDont, itemList); + + if (EditorGUI.EndChangeCheck()) { + foreach (Item item in diplomataEditor.inventory.items) { + + if (DictHandler.ContainsKey(item.name, diplomataEditor.preferences.currentLanguage).value == itemNameDont) { + condition.itemId = item.id; + break; + } + + } + } + + GUILayout.EndHorizontal(); + break; + case Condition.Type.ItemIsEquipped: GUILayout.BeginHorizontal(); UpdateItemList(); diff --git a/Diplomata/Lib/Condition.cs b/Diplomata/Lib/Condition.cs index 062f408..dff7f4e 100644 --- a/Diplomata/Lib/Condition.cs +++ b/Diplomata/Lib/Condition.cs @@ -27,7 +27,8 @@ public enum Type { ItemWasDiscarded, CustomFlagEqualTo, ItemIsEquipped, - InteractsWith + InteractsWith, + DoesNotHaveTheItem } [System.Serializable] @@ -76,6 +77,10 @@ public string DisplayHasItem(string itemName) { return "Has the item: " + itemName + ""; } + public string DisplayDoesNotHaveItem(string itemName) { + return "Does not have the item: " + itemName + ""; + } + public string DisplayItemWasDiscarded(string itemName) { return "item was discarded: " + itemName + ""; } diff --git a/Diplomata/Lib/DiplomataCharacter.cs b/Diplomata/Lib/DiplomataCharacter.cs index 3729bc2..69ee099 100644 --- a/Diplomata/Lib/DiplomataCharacter.cs +++ b/Diplomata/Lib/DiplomataCharacter.cs @@ -2,12 +2,12 @@ using UnityEngine; namespace DiplomataLib { - + [System.Serializable] [ExecuteInEditMode] [DisallowMultipleComponent] public class DiplomataCharacter : MonoBehaviour { - + public List choices = new List(); public Message currentMessage; public Character character; @@ -18,13 +18,13 @@ public class DiplomataCharacter : MonoBehaviour { private Context currentContext; private Column currentColumn; private string lastUniqueId; - + public void Start() { controlIndexes = new Dictionary(); controlIndexes.Add("context", 0); controlIndexes.Add("column", 0); controlIndexes.Add("message", 0); - + if (character != null && Application.isPlaying) { character = Character.Find(Diplomata.characters, character.name); } @@ -44,7 +44,7 @@ public void StartTalk() { currentMessage = null; choices = new List(); - + for (controlIndexes["context"] = 0; controlIndexes["context"] < character.contexts.Length; controlIndexes["context"]++) { var context = Context.Find(character, controlIndexes["context"]); var lastContext = character.contexts.Length - 1; @@ -78,7 +78,7 @@ public void StartTalk() { EndTalk(); } } - + private void Next(bool hasFate) { if (character != null && currentContext != null) { @@ -173,6 +173,27 @@ private void Next(bool hasFate) { condition.proceed = false; } + break; + case Condition.Type.DoesNotHaveTheItem: + var itemDont = Item.Find(Diplomata.inventory.items, condition.itemId); + + if (itemDont != null) { + + if (itemDont.have) { + condition.proceed = false; + } + + else { + condition.proceed = true; + } + + } + + else { + Debug.LogWarning("Cannot find the item with id " + condition.itemId + " to check."); + condition.proceed = false; + } + break; case Condition.Type.ItemIsEquipped: var equippedItem = Item.Find(Diplomata.inventory.items, condition.itemId); @@ -332,7 +353,7 @@ private void Next(bool hasFate) { public string ShowMessageContentSubtitle() { if (talking) { - if (currentMessage != null && Diplomata.gameProgress.options.currentSubtitledLanguage != string.Empty) { + if (currentMessage != null) { var talkLog = TalkLog.Find(Diplomata.gameProgress.talkLog, character.name); if (talkLog == null) { @@ -358,7 +379,7 @@ public string ShowMessageContentSubtitle() { } public void PlayMessageAudioContent() { - if (currentMessage != null && Diplomata.gameProgress.options.currentDubbedLanguage != string.Empty) { + if (currentMessage != null) { var audioClipPath = DictHandler.ContainsKey(currentMessage.audioClipPath, Diplomata.gameProgress.options.currentDubbedLanguage); if (audioClipPath.value != string.Empty) { @@ -386,7 +407,7 @@ public void PlayMessageAudioContent() { } public void StopMessageAudioContent() { - if (currentMessage != null && Diplomata.gameProgress.options.currentDubbedLanguage != string.Empty) { + if (currentMessage != null) { var audioClipPath = DictHandler.ContainsKey(currentMessage.audioClipPath, Diplomata.gameProgress.options.currentDubbedLanguage); if (audioClipPath.value != string.Empty) { @@ -467,7 +488,6 @@ public void ResetAnimators() { var animators = FindObjectsOfType(typeof(Animator)); foreach (Animator animator in animators) { - if (animator.runtimeAnimatorController != null) { foreach (AnimatorAttributeSetter animatorAttribute in currentMessage.animatorAttributesSetters) { @@ -532,13 +552,13 @@ public void EndTalk() { public void NextMessage() { var hasFate = false; - + if (currentMessage != null) { controlIndexes["column"] = currentMessage.columnId; controlIndexes["message"] = currentMessage.id; lastUniqueId = currentMessage.GetUniqueId(); - + foreach (Effect effect in currentMessage.effects) { switch (effect.type) { @@ -682,11 +702,11 @@ public void NextMessage() { Next(false); } } - + public List MessageChoices() { List choicesText = new List(); - if (choices.Count > 0 && Diplomata.gameProgress.options.currentSubtitledLanguage != string.Empty) { + if (choices.Count > 0) { foreach (Message choice in choices) { if (!choice.alreadySpoked && choice.disposable) { choicesText.Add(DictHandler.ContainsKey(choice.title, Diplomata.gameProgress.options.currentSubtitledLanguage).value); @@ -720,10 +740,10 @@ public void OnStartCallbacks() { } public void ChooseMessage(string title) { - if (currentColumn != null && Diplomata.gameProgress.options.currentSubtitledLanguage != string.Empty) { + if (currentColumn != null) { foreach (Message msg in choices) { var localTitle = DictHandler.ContainsKey(msg.title, Diplomata.gameProgress.options.currentSubtitledLanguage).value; - + if (localTitle == title) { currentMessage = msg; OnStartCallbacks(); @@ -871,11 +891,11 @@ public Message GetLastMessage() { } public string GetLastMessageContent() { - if (lastUniqueId == null || lastUniqueId == "" || Diplomata.gameProgress.options.currentSubtitledLanguage == string.Empty) { + if (lastUniqueId == null || lastUniqueId == "") { return ""; } - return DictHandler.ContainsKey(GetLastMessage().content, + return DictHandler.ContainsKey(GetLastMessage().content, Diplomata.gameProgress.options.currentSubtitledLanguage).value; } diff --git a/Diplomata/Lib/Preferences.cs b/Diplomata/Lib/Preferences.cs index b1323db..bc26e39 100644 --- a/Diplomata/Lib/Preferences.cs +++ b/Diplomata/Lib/Preferences.cs @@ -17,16 +17,6 @@ public Language(Language other) { subtitle = other.subtitle; dubbing = other.dubbing; } - - public static Language Find(Language[] languages, string name) { - foreach (Language lang in languages) { - if (lang.name == name) { - return lang; - } - } - - return null; - } } [System.Serializable] diff --git a/LICENSE.md.meta b/LICENSE.md.meta index 59e885b..f888e61 100644 --- a/LICENSE.md.meta +++ b/LICENSE.md.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 001e2c228b7b45048a464c4c6a506783 -timeCreated: 1509662215 +guid: d321a0fd3ec9b3e4ba7c868cb0eacacf +timeCreated: 1504796522 licenseType: Free DefaultImporter: userData: diff --git a/README.md.meta b/README.md.meta index c629025..86be068 100644 --- a/README.md.meta +++ b/README.md.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: db9204695dbb97343b51ac5579e84df6 -timeCreated: 1509662215 +guid: 50d450cd416fbcf409d1a9065b32d36b +timeCreated: 1504796521 licenseType: Free DefaultImporter: userData: diff --git a/Textures.meta b/Textures.meta index 99154ed..930da30 100644 --- a/Textures.meta +++ b/Textures.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9d4528e2c290a124bb8e0d03f3647a08 +guid: 296400dd7a7ec214691bfde2cf229336 folderAsset: yes -timeCreated: 1509662215 +timeCreated: 1505602173 licenseType: Free DefaultImporter: userData: diff --git a/Textures/DIPLOMATA-Logo_CC-BY-ND_by-Bruno-Araujo.png.meta b/Textures/DIPLOMATA-Logo_CC-BY-ND_by-Bruno-Araujo.png.meta index c36eeb0..cfe8d18 100644 --- a/Textures/DIPLOMATA-Logo_CC-BY-ND_by-Bruno-Araujo.png.meta +++ b/Textures/DIPLOMATA-Logo_CC-BY-ND_by-Bruno-Araujo.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 04fa3abf51d7d6c4582a17118fab5e8b -timeCreated: 1509662302 +guid: e50615bbd2e516c47a3df2f9ffedff79 +timeCreated: 1504796784 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Textures/DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo.png.meta b/Textures/DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo.png.meta index 7f9f51c..4446ff4 100644 --- a/Textures/DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo.png.meta +++ b/Textures/DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo.png.meta @@ -1,28 +1,35 @@ fileFormatVersion: 2 -guid: 41d1e4d245297ec48b9a7dfb64cf8fa3 -timeCreated: 1509915976 +guid: 04458da21fc8d344f8ceade640f111df +timeCreated: 1505603812 licenseType: Free TextureImporter: fileIDToRecycleName: - 21300000: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_0 - 21300002: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_1 - 21300004: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_2 - 21300006: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_3 - 21300008: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_4 - 21300010: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_5 - 21300012: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_6 - 21300014: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_7 - 21300016: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_8 - 21300018: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_9 - 21300020: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_10 - 21300022: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_11 - 21300024: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_12 - 21300026: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_14 - 21300028: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_13 + 21300000: UI_0 + 21300002: UI_1 + 21300004: UI_2 + 21300006: UI_3 + 21300008: UI_4 + 21300010: UI_5 + 21300012: UI_6 + 21300014: UI_7 + 21300016: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_0 + 21300018: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_1 + 21300020: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_2 + 21300022: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_3 + 21300024: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_4 + 21300026: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_5 + 21300028: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_6 + 21300030: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_7 + 21300032: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_8 + 21300034: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_9 + 21300036: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_10 + 21300038: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_11 + 21300040: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_12 + 21300042: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_13 serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -41,16 +48,16 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 + textureFormat: -1 + maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 + filterMode: 1 + aniso: 16 mipBias: -1 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -71,47 +78,7 @@ TextureImporter: textureFormatSet: 0 platformSettings: - buildTarget: DefaultTexturePlatform - maxTextureSize: 512 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 512 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: iPhone - maxTextureSize: 512 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Android - maxTextureSize: 512 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Windows Store Apps - maxTextureSize: 512 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: WebGL - maxTextureSize: 512 + maxTextureSize: 1024 textureFormat: -1 textureCompression: 1 compressionQuality: 50 @@ -129,9 +96,9 @@ TextureImporter: y: 366 width: 341 height: 146 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 38, y: 36, z: 36, w: 34} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 37, y: 35, z: 34, w: 31} outline: [] physicsShape: [] tessellationDetail: 0 @@ -143,9 +110,9 @@ TextureImporter: y: 384 width: 154 height: 124 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 26, y: 24, z: 24, w: 30} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 23, y: 27, z: 21, w: 28} outline: [] physicsShape: [] tessellationDetail: 0 @@ -157,8 +124,8 @@ TextureImporter: y: 280 width: 339 height: 78 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 28, y: 30, z: 28, w: 26} outline: [] physicsShape: [] @@ -171,9 +138,9 @@ TextureImporter: y: 252 width: 154 height: 124 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 26, y: 27, z: 24, w: 26} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 26, y: 28, z: 24, w: 29} outline: [] physicsShape: [] tessellationDetail: 0 @@ -185,9 +152,9 @@ TextureImporter: y: 142 width: 324 height: 130 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 29, y: 31, z: 30, w: 27} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 24, y: 26, z: 22, w: 22} outline: [] physicsShape: [] tessellationDetail: 0 @@ -199,9 +166,9 @@ TextureImporter: y: 124 width: 154 height: 124 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 26, y: 22, z: 24, w: 28} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 26, y: 29, z: 27, w: 30} outline: [] physicsShape: [] tessellationDetail: 0 @@ -213,8 +180,8 @@ TextureImporter: y: 0 width: 132 height: 132 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -227,92 +194,92 @@ TextureImporter: y: 21 width: 159 height: 80 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 31, y: 30, z: 33, w: 26} + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 29, y: 31, z: 27, w: 27} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_9 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_8 rect: serializedVersion: 2 x: 336 y: 67 width: 37 height: 48 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_11 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_9 rect: serializedVersion: 2 - x: 418 - y: 69 - width: 42 - height: 42 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + x: 377 + y: 67 + width: 37 + height: 48 + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_14 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_10 rect: serializedVersion: 2 - x: 405 - y: 14 - width: 60 - height: 48 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + x: 418 + y: 69 + width: 43 + height: 43 + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_13 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_11 rect: serializedVersion: 2 - x: 377 - y: 67 - width: 37 - height: 48 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + x: 465 + y: 69 + width: 43 + height: 43 + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_8 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_12 rect: serializedVersion: 2 - x: 465 - y: 69 - width: 42 - height: 42 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + x: 342 + y: 14 + width: 60 + height: 48 + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] tessellationDetail: 0 - serializedVersion: 2 - name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_10 + name: DIPLOMATA-UI_CC-BY-ND_by-Bruno-Araujo_13 rect: serializedVersion: 2 - x: 342 + x: 405 y: 14 width: 60 height: 48 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 1 + pivot: {x: 0, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Textures/Screenshot.jpg.meta b/Textures/Screenshot.jpg.meta index 6a2264d..db20e0b 100644 --- a/Textures/Screenshot.jpg.meta +++ b/Textures/Screenshot.jpg.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6465b1a37ad99ab4da1784a49d49d23d -timeCreated: 1509662309 +guid: 0fb0407e4a7c89d41a26fdad4692d988 +timeCreated: 1504796573 licenseType: Free TextureImporter: fileIDToRecycleName: {}