CleanSelectableCells (IsoUnityConnector) and little fix in CameraMana…

…ger (IsoUnity) - Clean cells marked as selectable when one is selected (set again previous IsoTexture). - Calling method Start of EventedEventManager in CameraManager (IsoUnity) - More tests
narratech · Mar 20, 2018 · 49932d2 · 49932d2
1 parent e1712dc
commit 49932d2
Show file tree

Hide file tree

Showing 8 changed files with 267 additions and 116 deletions.
diff --git a/Assets/Floor.asset b/Assets/Floor.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: 3c453d041690ab642b6e517807c4ef31, type: 3}
+  m_Name: IsoTexture
+  m_EditorClassIdentifier: 
+  realTexture: {fileID: 2800000, guid: a2f241151e0e7c848aba3d6c6d0b7abd, type: 3}
+  xCorner: 16
+  yCorner: 8
+  isXSimetric: 0
+  isYSimetric: 0
+  rotation: 0
diff --git a/Assets/Floor.asset.meta b/Assets/Floor.asset.meta
diff --git a/Assets/IsoUnity/Source/Camera/CameraManager.cs b/Assets/IsoUnity/Source/Camera/CameraManager.cs
@@ -57,6 +57,8 @@ public Vector3 cameraPosition
 
         void Start()
         {
+            base.Start();
+
             if (Camera.main == null)
             {
                 GameObject camera = new GameObject();

diff --git a/Assets/Scenes/test.unity b/Assets/Scenes/test.unity
@@ -5941,6 +5941,18 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, type: 2}
   m_IsPrefabParent: 0
+--- !u!114 &170796655
+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!1 &175549495
 GameObject:
   m_ObjectHideFlags: 0
@@ -6047,7 +6059,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 0}
+  character: {fileID: 11400000, guid: 36a63a88f336fee4fbee3ca4e3812861, type: 2}
 --- !u!114 &175549501
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9418,6 +9430,29 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 1814751361}
   m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3}
+--- !u!114 &292703959
+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: 1212169137}
+  secuence: {fileID: 1132879991}
+  position:
+    serializedVersion: 2
+    x: 420
+    y: 77
+    width: 300
+    height: 107
+  collapsed: 0
 --- !u!114 &294690403 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14,
@@ -20282,23 +20317,6 @@ Mesh:
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
   m_MeshOptimized: 0
---- !u!114 &644564707
-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: 1554496082}
-  localVariables: {fileID: 1999083187}
-  nodes:
-  - {fileID: 1554496082}
-  ids:
-  - -415612
 --- !u!114 &645766537 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14,
@@ -31133,7 +31151,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 92422f40b341aa548b3a84dfebcd6386, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cameraMode: 0
+  cameraMode: 1
   initializeCameraOnStart: 1
   look: {fileID: 930472388}
 --- !u!114 &770915875
@@ -35152,7 +35170,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 0}
+  character: {fileID: 11400000, guid: 36a63a88f336fee4fbee3ca4e3812861, type: 2}
 --- !u!114 &930472394
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -35195,7 +35213,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aa0e7214bd7b75b42b431db2b4524132, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  sequence: {fileID: 644564707}
+  sequence: {fileID: 1132879991}
 --- !u!114 &930472397
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -37332,6 +37350,28 @@ Material:
     - _Cutoff: 0.5
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+--- !u!114 &1019784222
+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!4 &1021182431 stripped
 Transform:
   m_PrefabParentObject: {fileID: 400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14, type: 2}
@@ -40594,6 +40634,23 @@ Texture2D:
     offset: 0
     size: 0
     path: 
+--- !u!114 &1132879991
+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: 292703959}
+  localVariables: {fileID: 170796655}
+  nodes:
+  - {fileID: 292703959}
+  ids:
+  - -66662
 --- !u!114 &1133938363 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14,
@@ -43137,6 +43194,28 @@ Mesh:
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
   m_MeshOptimized: 0
+--- !u!114 &1199372174
+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
@@ -43313,6 +43392,25 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 19435174}
   m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3}
+--- !u!114 &1212169137
+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: look to
+  m_EditorClassIdentifier: 
+  keys:
+  - synchronous
+  - gameobject
+  - instant
+  values:
+  - {fileID: 1199372174}
+  - {fileID: 930472388}
+  - {fileID: 1019784222}
 --- !u!114 &1212706662 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11400000, guid: 8a1da15bc40e9ac4897e6f088f39ae14,
@@ -55128,29 +55226,6 @@ Material:
     - _Cutoff: 0.5
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
---- !u!114 &1554496082
-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: 2055154388}
-  secuence: {fileID: 644564707}
-  position:
-    serializedVersion: 2
-    x: 550
-    y: 141
-    width: 474
-    height: 71
-  collapsed: 0
 --- !u!1001 &1554510924
 Prefab:
   m_ObjectHideFlags: 0
@@ -68472,18 +68547,6 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 170375268}
   m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3}
---- !u!114 &1999083187
-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!28 &2000172508
 Texture2D:
   m_ObjectHideFlags: 0
@@ -69658,25 +69721,6 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 1742273737}
   m_Script: {fileID: 11500000, guid: 80728dc979fcf5046adbbf7fdd0111de, type: 3}
---- !u!114 &2055154388
-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: selected cell
-  m_EditorClassIdentifier: 
-  keys:
-  - synchronous
-  - isounityconnector
-  - characterscript
-  values:
-  - {fileID: 2115287822}
-  - {fileID: 0}
-  - {fileID: 930472393}
 --- !u!21 &2056399549
 Material:
   serializedVersion: 6
@@ -70999,28 +71043,6 @@ Mesh:
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
   m_MeshOptimized: 0
---- !u!114 &2115287822
-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!28 &2116211514
 Texture2D:
   m_ObjectHideFlags: 0

diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset
@@ -14,7 +14,14 @@ MonoBehaviour:
   name: NewCharacter
   inventory: {fileID: 0}
   Slots: []
-  attributes: []
+  attributes:
+  - name: Experience
+    id: Exp
+    description: Health points
+    maxValue: 0
+    minValue: 0
+    value: 0
+    isCore: 1
   specializedClass: []
-  height: 0
-  distance: 0
+  height: 2
+  distance: 4