diff --git a/Assets/materials/icons.meta b/Assets/Icons.meta similarity index 100% rename from Assets/materials/icons.meta rename to Assets/Icons.meta diff --git a/Assets/Icons/Resources.meta b/Assets/Icons/Resources.meta new file mode 100644 index 0000000..5d56fdd --- /dev/null +++ b/Assets/Icons/Resources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a2ee9314016f134459698e3866dd5790 +folderAsset: yes +timeCreated: 1425593865 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/materials/icons/cidre.png b/Assets/Icons/Resources/cidre.png similarity index 100% rename from Assets/materials/icons/cidre.png rename to Assets/Icons/Resources/cidre.png diff --git a/Assets/materials/icons/cidre.png.meta b/Assets/Icons/Resources/cidre.png.meta similarity index 90% rename from Assets/materials/icons/cidre.png.meta rename to Assets/Icons/Resources/cidre.png.meta index aef6635..cea577c 100644 --- a/Assets/materials/icons/cidre.png.meta +++ b/Assets/Icons/Resources/cidre.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/materials/icons/crepiere.png b/Assets/Icons/Resources/crepiere.png similarity index 100% rename from Assets/materials/icons/crepiere.png rename to Assets/Icons/Resources/crepiere.png diff --git a/Assets/materials/icons/crepiere.png.meta b/Assets/Icons/Resources/crepiere.png.meta similarity index 90% rename from Assets/materials/icons/crepiere.png.meta rename to Assets/Icons/Resources/crepiere.png.meta index 4d206d2..d2f8785 100644 --- a/Assets/materials/icons/crepiere.png.meta +++ b/Assets/Icons/Resources/crepiere.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/materials/icons/empty.png b/Assets/Icons/Resources/empty.png similarity index 100% rename from Assets/materials/icons/empty.png rename to Assets/Icons/Resources/empty.png diff --git a/Assets/materials/icons/empty.png.meta b/Assets/Icons/Resources/empty.png.meta similarity index 90% rename from Assets/materials/icons/empty.png.meta rename to Assets/Icons/Resources/empty.png.meta index edd31ea..95a603b 100644 --- a/Assets/materials/icons/empty.png.meta +++ b/Assets/Icons/Resources/empty.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/materials/icons/omelette.png b/Assets/Icons/Resources/omelette.png similarity index 100% rename from Assets/materials/icons/omelette.png rename to Assets/Icons/Resources/omelette.png diff --git a/Assets/materials/icons/omelette.png.meta b/Assets/Icons/Resources/omelette.png.meta similarity index 90% rename from Assets/materials/icons/omelette.png.meta rename to Assets/Icons/Resources/omelette.png.meta index 61f19f8..6404d4a 100644 --- a/Assets/materials/icons/omelette.png.meta +++ b/Assets/Icons/Resources/omelette.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/materials/icons/veillee.png b/Assets/Icons/Resources/veillee.png similarity index 100% rename from Assets/materials/icons/veillee.png rename to Assets/Icons/Resources/veillee.png diff --git a/Assets/materials/icons/veillee.png.meta b/Assets/Icons/Resources/veillee.png.meta similarity index 90% rename from Assets/materials/icons/veillee.png.meta rename to Assets/Icons/Resources/veillee.png.meta index 5c4d17c..e140271 100644 --- a/Assets/materials/icons/veillee.png.meta +++ b/Assets/Icons/Resources/veillee.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/animation.meta b/Assets/animation.meta index f0346cb..f04569e 100644 --- a/Assets/animation.meta +++ b/Assets/animation.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: 00e2af6c63dfa2a4781ac59573a7a0ae +guid: ab83de13d4659f84ca93d4d31fad16d0 folderAsset: yes +timeCreated: 1425579568 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/materials.meta b/Assets/materials.meta index 2f1fde0..65d9f6e 100644 --- a/Assets/materials.meta +++ b/Assets/materials.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: 3bb12dca988ff874f87f55a848f3cc83 +guid: dd37b90355c05dc4a9b3e5da46d2a0ba folderAsset: yes +timeCreated: 1425579568 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models.meta b/Assets/models.meta index 7f2ae6e..59f462e 100644 --- a/Assets/models.meta +++ b/Assets/models.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: 437008696c8ebfd4da2e9a8b8c483f0f +guid: a4113e4b33c0344419e7e84151998093 folderAsset: yes +timeCreated: 1425579568 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs.meta b/Assets/prefabs.meta index 49654b2..1c44622 100644 --- a/Assets/prefabs.meta +++ b/Assets/prefabs.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: a4ad31e315acd3244901382254759209 +guid: c042a61522935b24992f456bc6704336 folderAsset: yes +timeCreated: 1425579568 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/rules.meta b/Assets/rules.meta index a8ee2ea..ca0c20b 100644 --- a/Assets/rules.meta +++ b/Assets/rules.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: 2888cbe7ebb784642a964f4c7dd302ec +guid: 9a209352d8c516a41a0debb9e9bf758e folderAsset: yes +timeCreated: 1425579568 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/rules/spells.2da b/Assets/rules/spells.2da index f2bfbbb..8bf0785 100644 --- a/Assets/rules/spells.2da +++ b/Assets/rules/spells.2da @@ -1,5 +1,5 @@ id _name name_strref icon _description script -0 "veille nocturne" 1 "veillee.png" "se rend invincible pendant un tour" _ -1 "coup de crépière" 2 "crepiere.png" "inflige 25 pv de dégats à un personnage" _ -2 "goulée de cidre" 3 "cidre.png" "soigne un personnage de 50 PV" _ -3 "omelette aux champignons" 4 "omelette.png" "rend un personnage malade pendant un tour, ne peux ni parler, ni rien faire pendant un tour" _ +0 "veille nocturne" 1 "veillee" "se rend invincible pendant un tour" _ +1 "coup de crépière" 2 "crepiere" "inflige 25 pv de dégats à un personnage" _ +2 "goulée de cidre" 3 "cidre" "soigne un personnage de 50 PV" _ +3 "omelette aux champignons" 4 "omelette" "rend un personnage malade pendant un tour, ne peux ni parler, ni rien faire pendant un tour" _ diff --git a/Assets/scene.unity b/Assets/scene.unity index 237280f..4bf85d3 100644 --- a/Assets/scene.unity +++ b/Assets/scene.unity @@ -10295,6 +10295,7 @@ GameObject: - 222: {fileID: 893547563} - 114: {fileID: 893547562} - 114: {fileID: 893547561} + - 114: {fileID: 893547564} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -10388,6 +10389,19 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 893547559} +--- !u!114 &893547564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 893547559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76b745b171184de4b9790ed6c5871a98, type: 3} + m_Name: + m_EditorClassIdentifier: + spellID: 3 + ico: {fileID: 21300000, guid: 1b09e1b8c17acf847abcd18a59078ad9, type: 3} --- !u!1 &900663497 GameObject: m_ObjectHideFlags: 0 @@ -10784,7 +10798,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 961916966} - m_LocalRotation: {x: .0119617237, y: .78026706, z: -.0460129343, w: .623636842} + m_LocalRotation: {x: .0119617246, y: .780267119, z: -.046012938, w: .623636901} m_LocalPosition: {x: 0, y: 0, z: 6.03999615} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -15892,7 +15906,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1437703997} - m_LocalRotation: {x: 0, y: .251361459, z: 0, w: .967893243} + m_LocalRotation: {x: 0, y: .251361489, z: 0, w: .967893302} m_LocalPosition: {x: -217.623383, y: 60.3925133, z: 179.930847} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -16521,7 +16535,7 @@ Transform: m_PrefabParentObject: {fileID: 400084, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1458696782} - m_LocalRotation: {x: -.421016425, y: .328104585, z: .661922395, w: .526261568} + m_LocalRotation: {x: -.421016455, y: .328104615, z: .661922455, w: .526261628} m_LocalPosition: {x: -.932753563, y: -.239872217, z: .350313157} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] diff --git a/Assets/scripts/CameraController.cs.meta b/Assets/scripts/CameraController.cs.meta index ae48e8e..26ffcc8 100644 --- a/Assets/scripts/CameraController.cs.meta +++ b/Assets/scripts/CameraController.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/ChatWindow.cs.meta b/Assets/scripts/ChatWindow.cs.meta index b95e134..9c0dac7 100644 --- a/Assets/scripts/ChatWindow.cs.meta +++ b/Assets/scripts/ChatWindow.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/Clock.cs.meta b/Assets/scripts/Clock.cs.meta index 71bd0b7..5e4aa60 100644 --- a/Assets/scripts/Clock.cs.meta +++ b/Assets/scripts/Clock.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/CreateScrollList.cs.meta b/Assets/scripts/CreateScrollList.cs.meta index 9c9f6db..0089e91 100644 --- a/Assets/scripts/CreateScrollList.cs.meta +++ b/Assets/scripts/CreateScrollList.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/DayController.cs.meta b/Assets/scripts/DayController.cs.meta index 1db809f..c69dd9d 100644 --- a/Assets/scripts/DayController.cs.meta +++ b/Assets/scripts/DayController.cs.meta @@ -6,3 +6,5 @@ MonoImporter: executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/Gui.AbilityButton.cs b/Assets/scripts/Gui.AbilityButton.cs deleted file mode 100644 index 533ae9c..0000000 --- a/Assets/scripts/Gui.AbilityButton.cs +++ /dev/null @@ -1,26 +0,0 @@ -using UnityEngine; -using System.Collections; - - -namespace Gui{ - public class AbilityButton : UnityEngine.UI.Button, MonoBehaviour, Databind.Slave { - - public int spellID; - - void Start(){ - onClick.AddListener(()=>{ - Debug.Log("Clicked"); - }); - - SetSpellID(spellID); - } - - void SetSpellID(int _spellID){ - //Set image, callback - - string sIcon = Rdb.GetTable("spells").GetValue(_spellID, "icon"); - } - - } -} - diff --git a/Assets/scripts/Gui_AbilityButton.cs b/Assets/scripts/Gui_AbilityButton.cs new file mode 100644 index 0000000..04b1a21 --- /dev/null +++ b/Assets/scripts/Gui_AbilityButton.cs @@ -0,0 +1,47 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; + + +public class Gui_AbilityButton : MonoBehaviour{ + + public int spellID; + public Sprite ico; + + void Awake(){ + button = GetComponent