diff --git a/Assets/IsoUnity/Source/EvenManagers/AnimationManager.cs b/Assets/IsoUnity/Source/EvenManagers/AnimationManager.cs index 7cd56a2..4c2d324 100644 --- a/Assets/IsoUnity/Source/EvenManagers/AnimationManager.cs +++ b/Assets/IsoUnity/Source/EvenManagers/AnimationManager.cs @@ -25,6 +25,28 @@ public override void ReceiveEvent(IGameEvent ev) AutoAnimator anim = go.GetComponent(); anim.registerEvent(ev); } + + if (ev.Name == "show decoration animation") + { + Decoration dec = (ev.getParameter("objective") as GameObject).GetComponent(); + + GameObject go = GameObject.CreatePrimitive(PrimitiveType.Quad); + Decoration decoration = go.AddComponent(); + decoration.IsoDec = (IsoDecoration)ev.getParameter("animation"); + + decoration.GetComponent().sharedMaterial = new Material(Shader.Find("Transparent/Cutout/Diffuse")); + decoration.Father = dec; + decoration.adaptate(); + + AutoAnimator anim = go.AddComponent(); + anim.FrameSecuence = new int[8] { 0, 1, 2, 3, 4, 5, 6, 7 }; + anim.FrameRate = 0.07f; + anim.AutoDestroy = true; + anim.Repeat = 1; + anim.registerEvent(ev); + + go.transform.Translate(new Vector3(0, 0, -2.8f)); + } } public override void Tick() { } diff --git a/Assets/Scenes/Demo/Animacion_crusader_attack.asset b/Assets/Scenes/Demo/Animacion_crusader_attack.asset new file mode 100644 index 0000000..6b38b78 --- /dev/null +++ b/Assets/Scenes/Demo/Animacion_crusader_attack.asset @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animacion_crusader_attack + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 0 + duration: 0.03 + - column: 1 + duration: 0.03 + - column: 2 + duration: 0.03 + - column: 3 + duration: 0.03 + - column: 4 + duration: 0.03 + - column: 5 + duration: 0.03 + - column: 6 + duration: 0.03 + - column: 7 + duration: 0.03 + - column: 8 + duration: 0.03 + - column: 9 + duration: 0.03 + - column: 10 + duration: 0.03 + - column: 11 + duration: 0.03 + - column: 12 + duration: 0.03 + - column: 13 + duration: 0.03 + - column: 14 + duration: 0.03 + - column: 15 + duration: 0.03 + - column: 16 + duration: 0.03 + - column: 0 + duration: 0 + sheet: + overrideSheet: {fileID: 11400000, guid: 4a34f5e00a36a3d4d9580b54ddb41695, type: 2} diff --git a/Assets/Scenes/Demo/Animacion_crusader_attack.asset.meta b/Assets/Scenes/Demo/Animacion_crusader_attack.asset.meta new file mode 100644 index 0000000..84163ec --- /dev/null +++ b/Assets/Scenes/Demo/Animacion_crusader_attack.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c0c3d61cc3a8240ba8d741fdc6fa08b0 +timeCreated: 1528832220 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_archer_attack.asset b/Assets/Scenes/Demo/Animation_archer_attack.asset new file mode 100644 index 0000000..fa469b2 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_attack.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_archer_attack + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 0 + duration: 0.05 + - column: 1 + duration: 0.05 + - column: 2 + duration: 0.05 + - column: 3 + duration: 0.05 + - column: 4 + duration: 0.05 + - column: 5 + duration: 0.05 + - column: 6 + duration: 0.05 + - column: 7 + duration: 0.05 + - column: 8 + duration: 0.05 + - column: 9 + duration: 0.05 + - column: 10 + duration: 0.05 + - column: 11 + duration: 0.05 + - column: 12 + duration: 0.05 + - column: 13 + duration: 0.05 + - column: 14 + duration: 0.05 + - column: 15 + duration: 0.05 + sheet: + overrideSheet: {fileID: 11400000, guid: c162fd6e288a5fd46961a7aa03528468, type: 2} diff --git a/Assets/Scenes/Demo/Animation_archer_attack.asset.meta b/Assets/Scenes/Demo/Animation_archer_attack.asset.meta new file mode 100644 index 0000000..b7b190d --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_attack.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68bbd02ebdf6943f1854aeb835f5529e +timeCreated: 1528833973 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_archer_left.asset b/Assets/Scenes/Demo/Animation_archer_left.asset new file mode 100644 index 0000000..c7857c5 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_left.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_archer_left + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 6 + duration: 0.05 + - column: 7 + duration: 0.05 + - column: 8 + duration: 0.05 + - column: 9 + duration: 0.05 + - column: 10 + duration: 0.05 + - column: 11 + duration: 0.05 + - column: 10 + duration: 0.05 + - column: 9 + duration: 0.05 + - column: 8 + duration: 0.05 + - column: 7 + duration: 0.05 + - column: 6 + duration: 0.05 + sheet: run + overrideSheet: {fileID: 0} diff --git a/Assets/Scenes/Demo/Animation_archer_left.asset.meta b/Assets/Scenes/Demo/Animation_archer_left.asset.meta new file mode 100644 index 0000000..fc29413 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_left.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a4ddbf7a0b26f4b40a31a58cdea30ac4 +timeCreated: 1528842764 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_archer_right.asset b/Assets/Scenes/Demo/Animation_archer_right.asset new file mode 100644 index 0000000..fc44688 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_right.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_archer_right + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 0 + duration: 0.05 + - column: 1 + duration: 0.05 + - column: 2 + duration: 0.05 + - column: 3 + duration: 0.05 + - column: 4 + duration: 0.05 + - column: 5 + duration: 0.05 + - column: 4 + duration: 0.05 + - column: 3 + duration: 0.05 + - column: 2 + duration: 0.05 + - column: 1 + duration: 0.05 + - column: 0 + duration: 0.05 + sheet: run + overrideSheet: {fileID: 0} diff --git a/Assets/Scenes/Demo/Animation_archer_right.asset.meta b/Assets/Scenes/Demo/Animation_archer_right.asset.meta new file mode 100644 index 0000000..9b53095 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_archer_right.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5bb90b061065c4e4ab7711a2a5630fa2 +timeCreated: 1528842775 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_archer_run.asset b/Assets/Scenes/Demo/Animation_archer_run.asset index 1fa2b32..f2bb4a6 100644 --- a/Assets/Scenes/Demo/Animation_archer_run.asset +++ b/Assets/Scenes/Demo/Animation_archer_run.asset @@ -16,26 +16,24 @@ MonoBehaviour: - column: 0 duration: 0.05 - column: 1 - duration: 0.05 + duration: 0.03 - column: 2 - duration: 0.05 + duration: 0.03 - column: 3 - duration: 0.05 + duration: 0.03 - column: 4 - duration: 0.05 + duration: 0.03 - column: 5 - duration: 0.05 + duration: 0.03 - column: 6 - duration: 0.05 + duration: 0.03 - column: 7 - duration: 0.05 + duration: 0.03 - column: 8 - duration: 0.05 + duration: 0.03 - column: 9 - duration: 0.05 + duration: 0.03 - column: 10 - duration: 0.05 - - column: 11 - duration: 0.05 + duration: 0.03 sheet: overrideSheet: {fileID: 11400000, guid: 862f95a5b3e081b48abefe6ed5f30358, type: 2} diff --git a/Assets/Scenes/Demo/Animation_crusader_hit.asset b/Assets/Scenes/Demo/Animation_crusader_hit.asset new file mode 100644 index 0000000..55d036b --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_hit.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_crusader_hit + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 0 + duration: 0.03 + - column: 1 + duration: 0.03 + - column: 2 + duration: 0.03 + - column: 3 + duration: 0.03 + - column: 4 + duration: 0.03 + - column: 5 + duration: 0.03 + - column: 6 + duration: 0.03 + - column: 7 + duration: 0.03 + - column: 8 + duration: 0.03 + - column: 9 + duration: 0.03 + - column: 10 + duration: 0.03 + - column: 11 + duration: 0.03 + - column: 12 + duration: 0.03 + - column: 13 + duration: 0.03 + sheet: + overrideSheet: {fileID: 11400000, guid: 72f2ab05b7a26ba49bef1986a4f4e9ca, type: 2} diff --git a/Assets/Scenes/Demo/Animation_crusader_hit.asset.meta b/Assets/Scenes/Demo/Animation_crusader_hit.asset.meta new file mode 100644 index 0000000..4a9365a --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_hit.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b7b55ce0d742e4b588e80ea79e3bcdce +timeCreated: 1528831878 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_crusader_left.asset b/Assets/Scenes/Demo/Animation_crusader_left.asset new file mode 100644 index 0000000..d5823f6 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_left.asset @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_crusader_left + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 9 + duration: 0.038 + - column: 10 + duration: 0.038 + - column: 11 + duration: 0.038 + - column: 12 + duration: 0.038 + - column: 13 + duration: 0.038 + - column: 14 + duration: 0.038 + - column: 15 + duration: 0.038 + - column: 16 + duration: 0.038 + - column: 17 + duration: 0.038 + - column: 16 + duration: 0.038 + - column: 15 + duration: 0.038 + - column: 14 + duration: 0.038 + - column: 13 + duration: 0.038 + - column: 12 + duration: 0.038 + - column: 11 + duration: 0.038 + - column: 10 + duration: 0.038 + - column: 9 + duration: 0.038 + sheet: run + overrideSheet: {fileID: 0} diff --git a/Assets/Scenes/Demo/Animation_crusader_left.asset.meta b/Assets/Scenes/Demo/Animation_crusader_left.asset.meta new file mode 100644 index 0000000..5f87850 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_left.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5581316731ae78c4b924c084283961a9 +timeCreated: 1528841080 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_crusader_rigth.asset b/Assets/Scenes/Demo/Animation_crusader_rigth.asset new file mode 100644 index 0000000..9b569b3 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_rigth.asset @@ -0,0 +1,51 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} + m_Name: Animation_crusader_rigth + m_EditorClassIdentifier: + loop: 0 + frames: + - column: 0 + duration: 0.038 + - column: 1 + duration: 0.038 + - column: 2 + duration: 0.038 + - column: 3 + duration: 0.038 + - column: 4 + duration: 0.038 + - column: 5 + duration: 0.038 + - column: 6 + duration: 0.038 + - column: 7 + duration: 0.038 + - column: 8 + duration: 0.038 + - column: 7 + duration: 0.038 + - column: 6 + duration: 0.038 + - column: 5 + duration: 0.038 + - column: 4 + duration: 0.038 + - column: 3 + duration: 0.038 + - column: 2 + duration: 0.038 + - column: 1 + duration: 0.038 + - column: 0 + duration: 0.038 + sheet: run + overrideSheet: {fileID: 0} diff --git a/Assets/Scenes/Demo/Animation_crusader_rigth.asset.meta b/Assets/Scenes/Demo/Animation_crusader_rigth.asset.meta new file mode 100644 index 0000000..1f2bfc2 --- /dev/null +++ b/Assets/Scenes/Demo/Animation_crusader_rigth.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9529566643c0a6b47bc77c41821846e7 +timeCreated: 1528841066 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Animation_crusader_run.asset b/Assets/Scenes/Demo/Animation_crusader_run.asset index eb44746..aeb0c09 100644 --- a/Assets/Scenes/Demo/Animation_crusader_run.asset +++ b/Assets/Scenes/Demo/Animation_crusader_run.asset @@ -16,36 +16,36 @@ MonoBehaviour: - column: 0 duration: 0.1 - column: 1 - duration: 0.05 + duration: 0.03 - column: 2 - duration: 0.05 + duration: 0.03 - column: 3 - duration: 0.05 + duration: 0.03 - column: 4 - duration: 0.05 + duration: 0.03 - column: 5 - duration: 0.05 + duration: 0.03 - column: 6 - duration: 0.05 + duration: 0.03 - column: 7 - duration: 0.05 + duration: 0.03 - column: 8 - duration: 0.05 + duration: 0.03 - column: 9 - duration: 0.05 + duration: 0.03 - column: 10 - duration: 0.05 + duration: 0.03 - column: 11 - duration: 0.05 + duration: 0.03 - column: 12 - duration: 0.05 + duration: 0.03 - column: 13 - duration: 0.05 + duration: 0.03 - column: 14 - duration: 0.05 + duration: 0.03 - column: 15 - duration: 0.05 + duration: 0.03 - column: 16 - duration: 0.05 - sheet: - overrideSheet: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + duration: 0.03 + sheet: run + overrideSheet: {fileID: 0} diff --git a/Assets/Scenes/Demo/Archer_attack.asset b/Assets/Scenes/Demo/Archer_attack.asset new file mode 100644 index 0000000..ae030ba --- /dev/null +++ b/Assets/Scenes/Demo/Archer_attack.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} + m_Name: Archer_attack + m_EditorClassIdentifier: + realTexture: {fileID: 2800000, guid: edc61df66f9caca449c12b9ffb897707, type: 3} + nrows: 4 + ncols: 16 diff --git a/Assets/Scenes/Demo/Archer_attack.asset.meta b/Assets/Scenes/Demo/Archer_attack.asset.meta new file mode 100644 index 0000000..0a57c5d --- /dev/null +++ b/Assets/Scenes/Demo/Archer_attack.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c162fd6e288a5fd46961a7aa03528468 +timeCreated: 1528989744 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Archer_idle.asset b/Assets/Scenes/Demo/Archer_idle.asset index 84fd289..c90269f 100644 --- a/Assets/Scenes/Demo/Archer_idle.asset +++ b/Assets/Scenes/Demo/Archer_idle.asset @@ -11,6 +11,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} m_Name: Archer_idle m_EditorClassIdentifier: - realTexture: {fileID: 2800000, guid: 05d8753502f69a44fb23e25771465cef, type: 3} + realTexture: {fileID: 2800000, guid: 95333656a1c17d146b07a53ca23e1fb4, type: 3} nrows: 4 ncols: 13 diff --git a/Assets/Scenes/Demo/Archer_run.asset b/Assets/Scenes/Demo/Archer_run.asset index d8dde29..deecf8f 100644 --- a/Assets/Scenes/Demo/Archer_run.asset +++ b/Assets/Scenes/Demo/Archer_run.asset @@ -11,6 +11,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} m_Name: Archer_run m_EditorClassIdentifier: - realTexture: {fileID: 2800000, guid: 4541f7ce5c3091841a3643ab9e639a1d, type: 3} + realTexture: {fileID: 2800000, guid: 3cc4c0a72b33dcf4d852518d9e0ec748, type: 3} nrows: 4 ncols: 12 diff --git a/Assets/Scenes/Demo/Crusader_attack.asset b/Assets/Scenes/Demo/Crusader_attack.asset new file mode 100644 index 0000000..0745c1d --- /dev/null +++ b/Assets/Scenes/Demo/Crusader_attack.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} + m_Name: Crusader_attack + m_EditorClassIdentifier: + realTexture: {fileID: 2800000, guid: c74c67d6620ea9d4ca2642908eaee6cc, type: 3} + nrows: 4 + ncols: 18 diff --git a/Assets/Scenes/Demo/Crusader_attack.asset.meta b/Assets/Scenes/Demo/Crusader_attack.asset.meta new file mode 100644 index 0000000..3ef2ae8 --- /dev/null +++ b/Assets/Scenes/Demo/Crusader_attack.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4a34f5e00a36a3d4d9580b54ddb41695 +timeCreated: 1528989641 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Crusader_idle.asset b/Assets/Scenes/Demo/Crusader_idle.asset index 93d0de0..1253536 100644 --- a/Assets/Scenes/Demo/Crusader_idle.asset +++ b/Assets/Scenes/Demo/Crusader_idle.asset @@ -11,6 +11,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} m_Name: Crusader_idle m_EditorClassIdentifier: - realTexture: {fileID: 2800000, guid: 4ea7a452502fb1b44907d3804caa6e61, type: 3} + realTexture: {fileID: 2800000, guid: b49e444cb4d20aa42bc8b8ed2a224db6, type: 3} nrows: 4 ncols: 16 diff --git a/Assets/Scenes/Demo/Demo.unity b/Assets/Scenes/Demo/Demo.unity index 3b1ef1e..9794844 100644 --- a/Assets/Scenes/Demo/Demo.unity +++ b/Assets/Scenes/Demo/Demo.unity @@ -639,9 +639,9 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 05d8753502f69a44fb23e25771465cef, type: 3} + m_Texture: {fileID: 2800000, guid: 95333656a1c17d146b07a53ca23e1fb4, type: 3} m_Scale: {x: 0.07692308, y: 0.25} - m_Offset: {x: 0, y: 0.25} + m_Offset: {x: 0.84615386, y: 0.25} m_Floats: - _Cutoff: 0.5 m_Colors: @@ -4552,23 +4552,6 @@ Texture2D: offset: 0 size: 0 path: ---- !u!114 &141291347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.3 - sheet: jump - overrideSheet: {fileID: 0} --- !u!43 &142842440 Mesh: m_ObjectHideFlags: 0 @@ -9262,44 +9245,6 @@ Material: - _Cutoff: 0.5 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &283802861 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 2 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} ---- !u!114 &284069492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.3 - sheet: jump - overrideSheet: {fileID: 0} --- !u!114 &284908410 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -9546,9 +9491,9 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 05d8753502f69a44fb23e25771465cef, type: 3} + m_Texture: {fileID: 2800000, guid: 95333656a1c17d146b07a53ca23e1fb4, type: 3} m_Scale: {x: 0.07692308, y: 0.25} - m_Offset: {x: 0, y: 0.25} + m_Offset: {x: 0.84615386, y: 0.25} m_Floats: - _Cutoff: 0.5 m_Colors: @@ -12806,27 +12751,6 @@ Material: - _Cutoff: 0.5 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &396746597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 1 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} --- !u!114 &397375918 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -16165,8 +16089,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: 8b3985d89bff9e84c8269b6577b9fb3e, type: 2} - team: {fileID: 11400000, guid: 75b4e445de9c04745b3a22e8492f058d, type: 2} + character: {fileID: 11400000, guid: feaf72e7d5baa91418684d6f974ad5fc, type: 2} + team: {fileID: 11400000, guid: 385789b268b178944865bdcf9f75bb2c, type: 2} --- !u!114 &494325675 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21029,7 +20953,7 @@ MonoBehaviour: angle: 0 parallel: 0 centered: 1 - tile: 54 + tile: 59 --- !u!114 &651502394 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21041,8 +20965,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: 66fd8f4b0ecbceb48a868393a4e0d17f, type: 2} - team: {fileID: 11400000, guid: 49d53ed427b550447a697a83cd70e34a, type: 2} + character: {fileID: 11400000, guid: 09e864a14e864144286282d876a8d276, type: 2} + team: {fileID: 11400000, guid: ba200b6df757bec428c655443f61d03f, type: 2} --- !u!114 &651502395 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21074,20 +20998,26 @@ MonoBehaviour: isoDecoration: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} - name: die isoDecoration: {fileID: 11400000, guid: 72f2ab05b7a26ba49bef1986a4f4e9ca, type: 2} + - name: run + isoDecoration: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} isoAnimations: - name: idle isoAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} - name: left step - isoAnimation: {fileID: 11400000, guid: 65c3797bc46351c478477b2aa2e29023, type: 2} + isoAnimation: {fileID: 11400000, guid: 5581316731ae78c4b924c084283961a9, type: 2} - name: right step - isoAnimation: {fileID: 11400000, guid: 65c3797bc46351c478477b2aa2e29023, type: 2} + isoAnimation: {fileID: 11400000, guid: 9529566643c0a6b47bc77c41821846e7, type: 2} - name: jump isoAnimation: {fileID: 11400000, guid: 65c3797bc46351c478477b2aa2e29023, type: 2} - name: die isoAnimation: {fileID: 11400000, guid: 1b0147351d112534cac9378fb32dd927, type: 2} - currentFrame: 25 + - name: gothit + isoAnimation: {fileID: 11400000, guid: b7b55ce0d742e4b588e80ea79e3bcdce, type: 2} + - name: attack + isoAnimation: {fileID: 11400000, guid: c0c3d61cc3a8240ba8d741fdc6fa08b0, type: 2} + currentFrame: 12 currentAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} - timeInCurrentFrame: 0.018820059 + timeInCurrentFrame: 0.029290613 currentSheet: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} animationLocked: 0 --- !u!114 &651502397 @@ -30064,27 +29994,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &716847008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 1 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} --- !u!21 &718379175 Material: serializedVersion: 6 @@ -31532,6 +31441,7 @@ GameObject: - component: {fileID: 770915871} - component: {fileID: 770915877} - component: {fileID: 770915878} + - component: {fileID: 770915879} m_Layer: 0 m_Name: Game m_TagString: Untagged @@ -31640,6 +31550,17 @@ MonoBehaviour: attackCell: {fileID: 11400000, guid: e7bd64f3e7f95d54289deccf42920283, type: 2} skillCell: {fileID: 11400000, guid: 121fd29bd24ece6439bdf3010f2e1b41, type: 2} arrowDecoration: {fileID: 11400000, guid: 0db37da799e54d5458c420331560f165, type: 2} +--- !u!114 &770915879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 770915870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71c30babe57963c4ba6a38d2c1796588, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!43 &771847860 Mesh: m_ObjectHideFlags: 0 @@ -34929,13 +34850,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55e00223589bdce4693914cd49b4b0d5, type: 3} m_Name: m_EditorClassIdentifier: - isoDec: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + isoDec: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} father: {fileID: 443358618} center: {x: 5.340369, y: 0.01194191, z: 1.7807965} angle: 0 parallel: 0 centered: 1 - tile: 51 + tile: 59 --- !u!114 &909185161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34947,8 +34868,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: d10b6ff2c4211464e8491819614ebaaa, type: 2} - team: {fileID: 11400000, guid: 49d53ed427b550447a697a83cd70e34a, type: 2} + character: {fileID: 11400000, guid: 09e864a14e864144286282d876a8d276, type: 2} + team: {fileID: 11400000, guid: ba200b6df757bec428c655443f61d03f, type: 2} --- !u!114 &909185162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34975,23 +34896,33 @@ MonoBehaviour: m_EditorClassIdentifier: sheets: - name: normal - isoDecoration: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + isoDecoration: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} - name: jump + isoDecoration: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + - name: die + isoDecoration: {fileID: 11400000, guid: 72f2ab05b7a26ba49bef1986a4f4e9ca, type: 2} + - name: run isoDecoration: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} isoAnimations: - name: idle - isoAnimation: {fileID: 1766185619} + isoAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} - name: left step - isoAnimation: {fileID: 396746597} + isoAnimation: {fileID: 11400000, guid: 5581316731ae78c4b924c084283961a9, type: 2} - name: right step - isoAnimation: {fileID: 1269163943} + isoAnimation: {fileID: 11400000, guid: 9529566643c0a6b47bc77c41821846e7, type: 2} - name: jump - isoAnimation: {fileID: 141291347} - currentFrame: 0 - currentAnimation: {fileID: 1766185619} - timeInCurrentFrame: 0 - currentSheet: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} - animationLocked: 1 + isoAnimation: {fileID: 11400000, guid: 65c3797bc46351c478477b2aa2e29023, type: 2} + - name: die + isoAnimation: {fileID: 11400000, guid: 1b0147351d112534cac9378fb32dd927, type: 2} + - name: gothit + isoAnimation: {fileID: 11400000, guid: b7b55ce0d742e4b588e80ea79e3bcdce, type: 2} + - name: attack + isoAnimation: {fileID: 11400000, guid: c0c3d61cc3a8240ba8d741fdc6fa08b0, type: 2} + currentFrame: 12 + currentAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} + timeInCurrentFrame: 0.029290613 + currentSheet: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + animationLocked: 0 --- !u!114 &909185164 MonoBehaviour: m_ObjectHideFlags: 0 @@ -35007,8 +34938,8 @@ MonoBehaviour: canBlockMe: 1 blocks: 1 maxJumpSize: 1.5 - normalSprite: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} - jumpingSprite: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + normalSprite: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + jumpingSprite: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} direction: 3 --- !u!114 &910986340 stripped MonoBehaviour: @@ -35795,23 +35726,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &933875908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.3 - sheet: jump - overrideSheet: {fileID: 0} --- !u!4 &936381811 stripped Transform: m_PrefabParentObject: {fileID: 400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, type: 2} @@ -37289,27 +37203,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &987498719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a413602f9429a24e943fe8c6b8b2508, type: 3} - m_Name: animate entity - m_EditorClassIdentifier: - keys: - - synchronous - - animation - - then - - decorationanimator - values: - - {fileID: 1201584208} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} --- !u!114 &989835603 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -39106,7 +38999,6 @@ GameObject: - component: {fileID: 1054756147} - component: {fileID: 1054756146} - component: {fileID: 1054756145} - - component: {fileID: 1054756148} m_Layer: 0 m_Name: Monk m_TagString: Untagged @@ -39185,7 +39077,7 @@ MonoBehaviour: angle: 0 parallel: 0 centered: 1 - tile: 13 + tile: 24 --- !u!114 &1054756144 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39197,8 +39089,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: c099832cf744e4a40855e6468d1d3105, type: 2} - team: {fileID: 11400000, guid: 75b4e445de9c04745b3a22e8492f058d, type: 2} + character: {fileID: 11400000, guid: feaf72e7d5baa91418684d6f974ad5fc, type: 2} + team: {fileID: 11400000, guid: 385789b268b178944865bdcf9f75bb2c, type: 2} --- !u!114 &1054756145 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39246,32 +39138,26 @@ MonoBehaviour: isoDecoration: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} - name: jump isoDecoration: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} + - name: run + isoDecoration: {fileID: 11400000, guid: 862f95a5b3e081b48abefe6ed5f30358, type: 2} isoAnimations: - name: idle - isoAnimation: {fileID: 1272165525} + isoAnimation: {fileID: 11400000, guid: 4e1b5e14704585e4cbdd0e6b79ea60ce, type: 2} - name: left step - isoAnimation: {fileID: 716847008} + isoAnimation: {fileID: 11400000, guid: a4ddbf7a0b26f4b40a31a58cdea30ac4, type: 2} - name: right step - isoAnimation: {fileID: 1240596009} + isoAnimation: {fileID: 11400000, guid: 5bb90b061065c4e4ab7711a2a5630fa2, type: 2} - name: jump - isoAnimation: {fileID: 933875908} - currentFrame: 0 - currentAnimation: {fileID: 1272165525} - timeInCurrentFrame: 0 + isoAnimation: {fileID: 11400000, guid: e655fec61eff44b4e85d1cf1933aa44e, type: 2} + - name: attack + isoAnimation: {fileID: 11400000, guid: 68bbd02ebdf6943f1854aeb835f5529e, type: 2} + - name: die + isoAnimation: {fileID: 11400000, guid: 0ec499439614b4147bf22ef457990d03, type: 2} + currentFrame: 12 + currentAnimation: {fileID: 11400000, guid: 4e1b5e14704585e4cbdd0e6b79ea60ce, type: 2} + timeInCurrentFrame: 0.029290613 currentSheet: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} - animationLocked: 1 ---- !u!114 &1054756148 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1054756139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa0e7214bd7b75b42b431db2b4524132, type: 3} - m_Name: - m_EditorClassIdentifier: - sequence: {fileID: 1454664399} + animationLocked: 0 --- !u!43 &1059062617 Mesh: m_ObjectHideFlags: 0 @@ -41866,13 +41752,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55e00223589bdce4693914cd49b4b0d5, type: 3} m_Name: m_EditorClassIdentifier: - isoDec: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + isoDec: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} father: {fileID: 1437772850} center: {x: 5.9026814, y: 0.011942863, z: -2.956696} angle: 0 parallel: 0 centered: 1 - tile: 51 + tile: 59 --- !u!114 &1140926018 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41884,8 +41770,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: 112bec7ec7965d247817c4e4055f64d8, type: 2} - team: {fileID: 11400000, guid: 49d53ed427b550447a697a83cd70e34a, type: 2} + character: {fileID: 11400000, guid: 09e864a14e864144286282d876a8d276, type: 2} + team: {fileID: 11400000, guid: ba200b6df757bec428c655443f61d03f, type: 2} --- !u!114 &1140926019 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41912,23 +41798,33 @@ MonoBehaviour: m_EditorClassIdentifier: sheets: - name: normal - isoDecoration: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + isoDecoration: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} - name: jump + isoDecoration: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + - name: die + isoDecoration: {fileID: 11400000, guid: 72f2ab05b7a26ba49bef1986a4f4e9ca, type: 2} + - name: run isoDecoration: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} isoAnimations: - name: idle - isoAnimation: {fileID: 1821524379} + isoAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} - name: left step - isoAnimation: {fileID: 1240643035} + isoAnimation: {fileID: 11400000, guid: 5581316731ae78c4b924c084283961a9, type: 2} - name: right step - isoAnimation: {fileID: 283802861} + isoAnimation: {fileID: 11400000, guid: 9529566643c0a6b47bc77c41821846e7, type: 2} - name: jump - isoAnimation: {fileID: 284069492} - currentFrame: 0 - currentAnimation: {fileID: 1821524379} - timeInCurrentFrame: 0 - currentSheet: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} - animationLocked: 1 + isoAnimation: {fileID: 11400000, guid: 65c3797bc46351c478477b2aa2e29023, type: 2} + - name: die + isoAnimation: {fileID: 11400000, guid: 1b0147351d112534cac9378fb32dd927, type: 2} + - name: gothit + isoAnimation: {fileID: 11400000, guid: b7b55ce0d742e4b588e80ea79e3bcdce, type: 2} + - name: attack + isoAnimation: {fileID: 11400000, guid: c0c3d61cc3a8240ba8d741fdc6fa08b0, type: 2} + currentFrame: 12 + currentAnimation: {fileID: 11400000, guid: 3dc49f986da35e54ca2bce7120921458, type: 2} + timeInCurrentFrame: 0.029290613 + currentSheet: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + animationLocked: 0 --- !u!114 &1140926021 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41944,8 +41840,8 @@ MonoBehaviour: canBlockMe: 1 blocks: 1 maxJumpSize: 1.5 - normalSprite: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} - jumpingSprite: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2} + normalSprite: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} + jumpingSprite: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2} direction: 3 --- !u!21 &1142156841 Material: @@ -44352,28 +44248,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &1201584208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8daaa0a8c5652f247939f4ab49339994, type: 3} - m_Name: - m_EditorClassIdentifier: - i: 0 - f: 0 - d: 0 - s: - v2: {x: 0, y: 0} - v3: {x: 0, y: 0, z: 0} - v4: {x: 0, y: 0, z: 0, w: 0} - q: {x: 0, y: 0, z: 0, w: 0} - b: 0 - c: 0 - whatIs: System.Boolean --- !u!21 &1202786937 Material: serializedVersion: 6 @@ -45267,48 +45141,6 @@ Material: - _Cutoff: 0.5 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &1240596009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 2 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} ---- !u!114 &1240643035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 1 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} --- !u!21 &1241528983 Material: serializedVersion: 6 @@ -46404,44 +46236,6 @@ Material: - _Cutoff: 0.5 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &1269163943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.075 - - column: 2 - duration: 0.15 - - column: 0 - duration: 0.075 - sheet: normal - overrideSheet: {fileID: 0} ---- !u!114 &1272165525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 1 - frames: - - column: 0 - duration: 0 - sheet: normal - overrideSheet: {fileID: 0} --- !u!43 &1272933160 Mesh: m_ObjectHideFlags: 0 @@ -53225,23 +53019,6 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 178030902} m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3} ---- !u!114 &1454664399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2610de954cb4f247a9d6e9f34762f4b, type: 3} - m_Name: - m_EditorClassIdentifier: - root: {fileID: 1871074703} - localVariables: {fileID: 1785921793} - nodes: - - {fileID: 1871074703} - ids: - - -802262 --- !u!114 &1455430379 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -57363,7 +57140,7 @@ MonoBehaviour: angle: 0 parallel: 0 centered: 1 - tile: 13 + tile: 24 --- !u!114 &1573021070 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57387,8 +57164,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3} m_Name: m_EditorClassIdentifier: - character: {fileID: 11400000, guid: d388687b4332b46469ef10c7ccabaff7, type: 2} - team: {fileID: 11400000, guid: 75b4e445de9c04745b3a22e8492f058d, type: 2} + character: {fileID: 11400000, guid: feaf72e7d5baa91418684d6f974ad5fc, type: 2} + team: {fileID: 11400000, guid: 385789b268b178944865bdcf9f75bb2c, type: 2} --- !u!114 &1573021072 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57418,22 +57195,24 @@ MonoBehaviour: isoDecoration: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} - name: jump isoDecoration: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} - - name: die - isoDecoration: {fileID: 11400000, guid: 1930c6dbb77a15549aef5a42a2be2780, type: 2} + - name: run + isoDecoration: {fileID: 11400000, guid: 862f95a5b3e081b48abefe6ed5f30358, type: 2} isoAnimations: - name: idle isoAnimation: {fileID: 11400000, guid: 4e1b5e14704585e4cbdd0e6b79ea60ce, type: 2} - name: left step - isoAnimation: {fileID: 11400000, guid: e655fec61eff44b4e85d1cf1933aa44e, type: 2} + isoAnimation: {fileID: 11400000, guid: a4ddbf7a0b26f4b40a31a58cdea30ac4, type: 2} - name: right step - isoAnimation: {fileID: 11400000, guid: e655fec61eff44b4e85d1cf1933aa44e, type: 2} + isoAnimation: {fileID: 11400000, guid: 5bb90b061065c4e4ab7711a2a5630fa2, type: 2} - name: jump - isoAnimation: {fileID: 1772967783} + isoAnimation: {fileID: 11400000, guid: e655fec61eff44b4e85d1cf1933aa44e, type: 2} + - name: attack + isoAnimation: {fileID: 11400000, guid: 68bbd02ebdf6943f1854aeb835f5529e, type: 2} - name: die isoAnimation: {fileID: 11400000, guid: 0ec499439614b4147bf22ef457990d03, type: 2} - currentFrame: 1 + currentFrame: 12 currentAnimation: {fileID: 11400000, guid: 4e1b5e14704585e4cbdd0e6b79ea60ce, type: 2} - timeInCurrentFrame: 0.018820059 + timeInCurrentFrame: 0.029290613 currentSheet: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2} animationLocked: 0 --- !u!114 &1573021074 @@ -62849,9 +62628,9 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 4ea7a452502fb1b44907d3804caa6e61, type: 3} + m_Texture: {fileID: 2800000, guid: b49e444cb4d20aa42bc8b8ed2a224db6, type: 3} m_Scale: {x: 0.0625, y: 0.25} - m_Offset: {x: 0.375, y: 0.75} + m_Offset: {x: 0.6875, y: 0.75} m_Floats: - _Cutoff: 0.5 m_Colors: @@ -62976,23 +62755,6 @@ Texture2D: offset: 0 size: 0 path: ---- !u!114 &1766185619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 1 - frames: - - column: 0 - duration: 0 - sheet: normal - overrideSheet: {fileID: 0} --- !u!21 &1768041253 Material: serializedVersion: 6 @@ -63258,23 +63020,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, type: 2} m_IsPrefabParent: 0 ---- !u!114 &1772967783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 0 - frames: - - column: 0 - duration: 0.3 - sheet: jump - overrideSheet: {fileID: 0} --- !u!114 &1773564128 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -63682,18 +63427,6 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 133230860} m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3} ---- !u!114 &1785921793 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f903b5c05730594280dcba273e69bc4, type: 3} - m_Name: - m_EditorClassIdentifier: - switches: [] --- !u!114 &1786927755 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, @@ -64960,23 +64693,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &1821524379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3} - m_Name: - m_EditorClassIdentifier: - loop: 1 - frames: - - column: 0 - duration: 0 - sheet: normal - overrideSheet: {fileID: 0} --- !u!28 &1821751040 Texture2D: m_ObjectHideFlags: 0 @@ -66572,29 +66288,6 @@ Mesh: m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshOptimized: 0 ---- !u!114 &1871074703 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e06a4f01aa6e07542a2f9cdadd91cc10, type: 3} - m_Name: GameEvent - m_EditorClassIdentifier: - childs: - - {fileID: 0} - isUnityObject: 1 - objectContent: {fileID: 987498719} - secuence: {fileID: 1454664399} - position: - serializedVersion: 2 - x: 505 - y: 193 - width: 380 - height: 125 - collapsed: 0 --- !u!1001 &1871347022 Prefab: m_ObjectHideFlags: 0 @@ -66697,9 +66390,9 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f8110001e7132c64cbaad9d3d87a3d53, type: 3} - m_Scale: {x: 0.05882353, y: 0.25} - m_Offset: {x: 0, y: 0.75} + m_Texture: {fileID: 2800000, guid: b49e444cb4d20aa42bc8b8ed2a224db6, type: 3} + m_Scale: {x: 0.0625, y: 0.25} + m_Offset: {x: 0.6875, y: 0.75} m_Floats: - _Cutoff: 0.5 m_Colors: @@ -71618,9 +71311,9 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: f8110001e7132c64cbaad9d3d87a3d53, type: 3} - m_Scale: {x: 0.05882353, y: 0.25} - m_Offset: {x: 0, y: 0.75} + m_Texture: {fileID: 2800000, guid: b49e444cb4d20aa42bc8b8ed2a224db6, type: 3} + m_Scale: {x: 0.0625, y: 0.25} + m_Offset: {x: 0.6875, y: 0.75} m_Floats: - _Cutoff: 0.5 m_Colors: diff --git a/Assets/Scenes/Demo/Fire.asset b/Assets/Scenes/Demo/Fire.asset new file mode 100644 index 0000000..ebb4e94 --- /dev/null +++ b/Assets/Scenes/Demo/Fire.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} + m_Name: Fire + m_EditorClassIdentifier: + realTexture: {fileID: 2800000, guid: 3f734e9b67a34aa4696d945cfb81862c, type: 3} + nrows: 1 + ncols: 8 diff --git a/Assets/Scenes/Demo/Fire.asset.meta b/Assets/Scenes/Demo/Fire.asset.meta new file mode 100644 index 0000000..48b22cc --- /dev/null +++ b/Assets/Scenes/Demo/Fire.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fd93e3770e82ad14790220e225fb2de3 +timeCreated: 1528990063 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo/Soldier.asset b/Assets/Scenes/Demo/Soldier.asset index f4a7568..774742f 100644 --- a/Assets/Scenes/Demo/Soldier.asset +++ b/Assets/Scenes/Demo/Soldier.asset @@ -11,6 +11,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe252187c579bc5458136333ca4f0a07, type: 3} m_Name: Soldier m_EditorClassIdentifier: - realTexture: {fileID: 2800000, guid: 9b30d6f97a0696b4e8e605b97d99b1dc, type: 3} + realTexture: {fileID: 2800000, guid: f8110001e7132c64cbaad9d3d87a3d53, type: 3} nrows: 4 ncols: 9 diff --git a/Assets/TRPGMaker/Database/Attributes.meta b/Assets/TRPGMaker/Database/Attributes.meta new file mode 100644 index 0000000..1b380a0 --- /dev/null +++ b/Assets/TRPGMaker/Database/Attributes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e96bebc00a3d1e44b08938b03a03994 +folderAsset: yes +timeCreated: 1528988505 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset b/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset new file mode 100644 index 0000000..5f9dfd2 --- /dev/null +++ b/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7f1e8c1c34b233449ea2318f93532d9, type: 3} + m_Name: New Attribute 000 + m_EditorClassIdentifier: + name: New Attribute 000 + id: X00 + description: + isCore: 1 diff --git a/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset.meta b/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset.meta new file mode 100644 index 0000000..6b8510f --- /dev/null +++ b/Assets/TRPGMaker/Database/Attributes/New Attribute 000.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2afeffe0fceb67d4eb950e27c55adcf0 +timeCreated: 1528988505 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset b/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset new file mode 100644 index 0000000..552fe9e --- /dev/null +++ b/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7f1e8c1c34b233449ea2318f93532d9, type: 3} + m_Name: New Attribute 001 + m_EditorClassIdentifier: + name: New Attribute 001 + id: X01 + description: + isCore: 1 diff --git a/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset.meta b/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset.meta new file mode 100644 index 0000000..0538755 --- /dev/null +++ b/Assets/TRPGMaker/Database/Attributes/New Attribute 001.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 00b32d973bd8ccd48ab8d7e4700c3020 +timeCreated: 1528988507 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset new file mode 100644 index 0000000..6561a14 --- /dev/null +++ b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d9fb3b8c5fa23c4e8313ab14ed5bdb8, type: 3} + m_Name: NewCharacter(1) + m_EditorClassIdentifier: + name: NewCharacter(1) + inventory: {fileID: 0} + Slots: [] + attributes: + - _attribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + maxValue: 100 + minValue: 0 + value: 100 + - _attribute: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + maxValue: 5 + minValue: 0 + value: 5 + attributesWithFormulas: + - _attribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + maxValue: 100 + minValue: 0 + value: 100 + - _attribute: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + maxValue: 5 + minValue: 0 + value: 5 + specializedClasses: + - {fileID: 11400000, guid: 7de533e914c78ac448f60caddde5804e, type: 2} + specializedClassesCount: 1 diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset.meta b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset.meta new file mode 100644 index 0000000..a195549 --- /dev/null +++ b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 09e864a14e864144286282d876a8d276 +timeCreated: 1528988520 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset new file mode 100644 index 0000000..8556f9d --- /dev/null +++ b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d9fb3b8c5fa23c4e8313ab14ed5bdb8, type: 3} + m_Name: NewCharacter + m_EditorClassIdentifier: + name: NewCharacter + inventory: {fileID: 0} + Slots: [] + attributes: + - _attribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + maxValue: 100 + minValue: 0 + value: 100 + - _attribute: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + maxValue: 5 + minValue: 0 + value: 5 + attributesWithFormulas: + - _attribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + maxValue: 100 + minValue: 0 + value: 0 + - _attribute: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + maxValue: 5 + minValue: 0 + value: 5 + specializedClasses: + - {fileID: 11400000, guid: 7de533e914c78ac448f60caddde5804e, type: 2} + specializedClassesCount: 1 diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset.meta b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset.meta new file mode 100644 index 0000000..bdb2a23 --- /dev/null +++ b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: feaf72e7d5baa91418684d6f974ad5fc +timeCreated: 1528988520 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Database.asset b/Assets/TRPGMaker/Database/Database.asset index 13d3a64..f04c040 100644 --- a/Assets/TRPGMaker/Database/Database.asset +++ b/Assets/TRPGMaker/Database/Database.asset @@ -11,20 +11,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9ac61a1063e08024ab3d5b8eb07b7b40, type: 3} m_Name: Database m_EditorClassIdentifier: - attributes: [] + attributes: + - {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + - {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} tags: [] slotTypes: [] items: [] - specializedClasses: [] - characters: [] - teams: [] - skills: [] + specializedClasses: + - {fileID: 11400000, guid: 7de533e914c78ac448f60caddde5804e, type: 2} + characters: + - {fileID: 11400000, guid: feaf72e7d5baa91418684d6f974ad5fc, type: 2} + - {fileID: 11400000, guid: 09e864a14e864144286282d876a8d276, type: 2} + teams: + - {fileID: 11400000, guid: 385789b268b178944865bdcf9f75bb2c, type: 2} + - {fileID: 11400000, guid: ba200b6df757bec428c655443f61d03f, type: 2} + skills: + - {fileID: 11400000, guid: b2b7c597607144343b97b26451da3d88, type: 2} _TRPGOptions: _gameType: 0 _turnType: 0 - _healthAttribute: {fileID: 0} - _damageAttribute: {fileID: 0} - _moveRange: {fileID: 0} - _moveHeight: {fileID: 0} - _attackRange: {fileID: 0} - _attackHeight: {fileID: 0} + _healthAttribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + _damageAttribute: {fileID: 11400000, guid: 2afeffe0fceb67d4eb950e27c55adcf0, type: 2} + _moveRange: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + _moveHeight: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + _attackRange: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} + _attackHeight: {fileID: 11400000, guid: 00b32d973bd8ccd48ab8d7e4700c3020, type: 2} diff --git a/Assets/TRPGMaker/Database/Skills/NewSkill.asset b/Assets/TRPGMaker/Database/Skills/NewSkill.asset new file mode 100644 index 0000000..e979ef6 --- /dev/null +++ b/Assets/TRPGMaker/Database/Skills/NewSkill.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fcfda68e797b224485786ca9e52d4b9, type: 3} + m_Name: NewSkill + m_EditorClassIdentifier: + name: NewSkill + description: + skillType: 0 + areaRange: 0 + formulas: [] + animationName: {fileID: 11400000, guid: fd93e3770e82ad14790220e225fb2de3, type: 2} diff --git a/Assets/TRPGMaker/Database/Skills/NewSkill.asset.meta b/Assets/TRPGMaker/Database/Skills/NewSkill.asset.meta new file mode 100644 index 0000000..54cdc59 --- /dev/null +++ b/Assets/TRPGMaker/Database/Skills/NewSkill.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b2b7c597607144343b97b26451da3d88 +timeCreated: 1528988677 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset b/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset new file mode 100644 index 0000000..3af7ea0 --- /dev/null +++ b/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4cfe1e2b18c9494b8e22325c9a32ff7, type: 3} + m_Name: NewSpecializedClass + m_EditorClassIdentifier: + name: New Specialized Class + tags: [] + slots: [] + attributes: [] + formula: {fileID: 0} + skills: + - {fileID: 11400000, guid: b2b7c597607144343b97b26451da3d88, type: 2} diff --git a/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset.meta b/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset.meta new file mode 100644 index 0000000..983a959 --- /dev/null +++ b/Assets/TRPGMaker/Database/SpecializedClasses/NewSpecializedClass.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7de533e914c78ac448f60caddde5804e +timeCreated: 1528988854 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset b/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset new file mode 100644 index 0000000..bcd97a7 --- /dev/null +++ b/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7b1fcdece9778478b2575993f98a72, type: 3} + m_Name: NewTeam(1) + m_EditorClassIdentifier: + name: NewTeam(1) + id: 1 + characters: + - {fileID: 11400000, guid: 09e864a14e864144286282d876a8d276, type: 2} + playable: 1 diff --git a/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset.meta b/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset.meta new file mode 100644 index 0000000..a719034 --- /dev/null +++ b/Assets/TRPGMaker/Database/Teams/NewTeam(1).asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ba200b6df757bec428c655443f61d03f +timeCreated: 1528988545 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Database/Teams/NewTeam.asset b/Assets/TRPGMaker/Database/Teams/NewTeam.asset new file mode 100644 index 0000000..c820888 --- /dev/null +++ b/Assets/TRPGMaker/Database/Teams/NewTeam.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a7b1fcdece9778478b2575993f98a72, type: 3} + m_Name: NewTeam + m_EditorClassIdentifier: + name: NewTeam + id: 0 + characters: + - {fileID: 11400000, guid: feaf72e7d5baa91418684d6f974ad5fc, type: 2} + playable: 1 diff --git a/Assets/TRPGMaker/Database/Teams/NewTeam.asset.meta b/Assets/TRPGMaker/Database/Teams/NewTeam.asset.meta new file mode 100644 index 0000000..6c4f3ae --- /dev/null +++ b/Assets/TRPGMaker/Database/Teams/NewTeam.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 385789b268b178944865bdcf9f75bb2c +timeCreated: 1528988545 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Resources/Archer_attack.png b/Assets/TRPGMaker/Resources/Archer_attack.png new file mode 100644 index 0000000..3b68286 Binary files /dev/null and b/Assets/TRPGMaker/Resources/Archer_attack.png differ diff --git a/Assets/TRPGMaker/Resources/Archer_attack.png.meta b/Assets/TRPGMaker/Resources/Archer_attack.png.meta new file mode 100644 index 0000000..ff09360 --- /dev/null +++ b/Assets/TRPGMaker/Resources/Archer_attack.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: edc61df66f9caca449c12b9ffb897707 +timeCreated: 1528989047 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - 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: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Resources/Archer_idle.png b/Assets/TRPGMaker/Resources/Archer_idle.png index da62281..aee5001 100644 Binary files a/Assets/TRPGMaker/Resources/Archer_idle.png and b/Assets/TRPGMaker/Resources/Archer_idle.png differ diff --git a/Assets/TRPGMaker/Resources/Archer_idle.png.meta b/Assets/TRPGMaker/Resources/Archer_idle.png.meta index 4af57ab..b53d831 100644 --- a/Assets/TRPGMaker/Resources/Archer_idle.png.meta +++ b/Assets/TRPGMaker/Resources/Archer_idle.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 05d8753502f69a44fb23e25771465cef -timeCreated: 1527794532 +guid: 95333656a1c17d146b07a53ca23e1fb4 +timeCreated: 1528989013 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -22,7 +22,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -66,46 +66,6 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - 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/TRPGMaker/Resources/Archer_run.png b/Assets/TRPGMaker/Resources/Archer_run.png index 177236d..73db5e3 100644 Binary files a/Assets/TRPGMaker/Resources/Archer_run.png and b/Assets/TRPGMaker/Resources/Archer_run.png differ diff --git a/Assets/TRPGMaker/Resources/Archer_run.png.meta b/Assets/TRPGMaker/Resources/Archer_run.png.meta index bbf0a14..df137bf 100644 --- a/Assets/TRPGMaker/Resources/Archer_run.png.meta +++ b/Assets/TRPGMaker/Resources/Archer_run.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 4541f7ce5c3091841a3643ab9e639a1d -timeCreated: 1527794538 +guid: 3cc4c0a72b33dcf4d852518d9e0ec748 +timeCreated: 1528989013 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -22,7 +22,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -66,46 +66,6 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - 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/TRPGMaker/Resources/Crusader_hit.png b/Assets/TRPGMaker/Resources/Crusader_hit.png new file mode 100644 index 0000000..3f1326f Binary files /dev/null and b/Assets/TRPGMaker/Resources/Crusader_hit.png differ diff --git a/Assets/TRPGMaker/Resources/Crusader_hit.png.meta b/Assets/TRPGMaker/Resources/Crusader_hit.png.meta new file mode 100644 index 0000000..7531acf --- /dev/null +++ b/Assets/TRPGMaker/Resources/Crusader_hit.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 7f078f9b62cdc344687bce10fbd5fda1 +timeCreated: 1528989043 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - 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: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Resources/Crusader_idle.png b/Assets/TRPGMaker/Resources/Crusader_idle.png index 10729b7..f2f402c 100644 Binary files a/Assets/TRPGMaker/Resources/Crusader_idle.png and b/Assets/TRPGMaker/Resources/Crusader_idle.png differ diff --git a/Assets/TRPGMaker/Resources/Crusader_idle.png.meta b/Assets/TRPGMaker/Resources/Crusader_idle.png.meta index f349c00..012cbc8 100644 --- a/Assets/TRPGMaker/Resources/Crusader_idle.png.meta +++ b/Assets/TRPGMaker/Resources/Crusader_idle.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 4ea7a452502fb1b44907d3804caa6e61 -timeCreated: 1527777819 +guid: b49e444cb4d20aa42bc8b8ed2a224db6 +timeCreated: 1528989109 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -22,7 +22,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -66,46 +66,6 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - buildTarget: WebGL - 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/TRPGMaker/Resources/Crusader_run.png b/Assets/TRPGMaker/Resources/Crusader_run.png new file mode 100644 index 0000000..db20e5b Binary files /dev/null and b/Assets/TRPGMaker/Resources/Crusader_run.png differ diff --git a/Assets/TRPGMaker/Resources/Crusader_run.png.meta b/Assets/TRPGMaker/Resources/Crusader_run.png.meta new file mode 100644 index 0000000..f6dfd62 --- /dev/null +++ b/Assets/TRPGMaker/Resources/Crusader_run.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 769a13eb107462c4db65a26800154e8e +timeCreated: 1528989085 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - 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: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Resources/crusader_attack.png b/Assets/TRPGMaker/Resources/crusader_attack.png new file mode 100644 index 0000000..b17e579 Binary files /dev/null and b/Assets/TRPGMaker/Resources/crusader_attack.png differ diff --git a/Assets/TRPGMaker/Resources/crusader_attack.png.meta b/Assets/TRPGMaker/Resources/crusader_attack.png.meta new file mode 100644 index 0000000..4efa63f --- /dev/null +++ b/Assets/TRPGMaker/Resources/crusader_attack.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: c74c67d6620ea9d4ca2642908eaee6cc +timeCreated: 1528989615 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - 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: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TRPGMaker/Resources/fire.png b/Assets/TRPGMaker/Resources/fire.png new file mode 100644 index 0000000..1b2149d Binary files /dev/null and b/Assets/TRPGMaker/Resources/fire.png differ diff --git a/Assets/TRPGMaker/Resources/soldier.png.meta b/Assets/TRPGMaker/Resources/fire.png.meta similarity index 97% rename from Assets/TRPGMaker/Resources/soldier.png.meta rename to Assets/TRPGMaker/Resources/fire.png.meta index d36db8c..54dd002 100644 --- a/Assets/TRPGMaker/Resources/soldier.png.meta +++ b/Assets/TRPGMaker/Resources/fire.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 9b30d6f97a0696b4e8e605b97d99b1dc -timeCreated: 1523371400 +guid: 3f734e9b67a34aa4696d945cfb81862c +timeCreated: 1528990530 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/TRPGMaker/Resources/soldier.png b/Assets/TRPGMaker/Resources/soldier.png deleted file mode 100644 index edcfd13..0000000 Binary files a/Assets/TRPGMaker/Resources/soldier.png and /dev/null differ diff --git a/Assets/TRPGMaker/Scripts/Connectors/IsoUnityConnector.cs b/Assets/TRPGMaker/Scripts/Connectors/IsoUnityConnector.cs index 39ae22e..2cb88b3 100644 --- a/Assets/TRPGMaker/Scripts/Connectors/IsoUnityConnector.cs +++ b/Assets/TRPGMaker/Scripts/Connectors/IsoUnityConnector.cs @@ -216,6 +216,17 @@ private IEnumerator SkillsAsync(CharacterScript character, EventTypes eventType, targets.Add(selectedCell.transform.GetComponentInChildren()); } + var showDecoration = new GameEvent("show decoration animation", new Dictionary() + { + { "objective", targets[0].gameObject }, + { "animation", skill.animationName }, + { "synchronous", true } + }); + + Game.main.enqueueEvent(showDecoration); + + yield return new WaitForEventFinished(showDecoration); + callback(returnCell, true, targets); } diff --git a/Assets/TRPGMaker/Scripts/Database/Skills.cs b/Assets/TRPGMaker/Scripts/Database/Skills.cs index cbdbbef..dbcc827 100644 --- a/Assets/TRPGMaker/Scripts/Database/Skills.cs +++ b/Assets/TRPGMaker/Scripts/Database/Skills.cs @@ -10,7 +10,7 @@ public class Skills : ScriptableObject, ICloneable { public SkillTypes skillType; public int areaRange; public List formulas; - public string animationName; + public IsoUnity.IsoDecoration animationName; public object Clone() { diff --git a/Assets/TRPGMaker/Scripts/Database/SpecializedClass.cs b/Assets/TRPGMaker/Scripts/Database/SpecializedClass.cs index 51d6168..22d2d7d 100644 --- a/Assets/TRPGMaker/Scripts/Database/SpecializedClass.cs +++ b/Assets/TRPGMaker/Scripts/Database/SpecializedClass.cs @@ -23,6 +23,7 @@ public void Init() slots = new List(); formula = ScriptableObject.CreateInstance(); attributes = new List(); + skills = new List(); } public void refreshAttributes()