summaryrefslogtreecommitdiff
path: root/WorldlineKeepers/Assets/Scripts/Unit
diff options
context:
space:
mode:
Diffstat (limited to 'WorldlineKeepers/Assets/Scripts/Unit')
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs (renamed from WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs)0
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs.meta (renamed from WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs.meta)0
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs23
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs.meta11
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/PlayerController.cs6
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Characters/Ronin/RoninBehaviour.cs3
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/Enemies/SpiritScript.cs4
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs15
-rw-r--r--WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs.meta11
9 files changed, 70 insertions, 3 deletions
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs
index 7674523..7674523 100644
--- a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs.meta b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs.meta
index 330a2d3..330a2d3 100644
--- a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterController.cs.meta
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterBehaviour.cs.meta
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs
new file mode 100644
index 0000000..81b80c0
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace WK.Data
+{
+
+ public class CharacterMetadata
+ {
+
+ public string uid;
+
+ public string name_key;
+
+ public Dictionary<string, string> stats;
+
+ public string behaviour;
+
+ public string extra_data;
+ }
+
+}
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs.meta b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs.meta
new file mode 100644
index 0000000..f39e3ec
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/CharacterMetadata.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ecafd17226029e748994c5814d59cc03
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/PlayerController.cs b/WorldlineKeepers/Assets/Scripts/Unit/Characters/PlayerController.cs
index 66bf6df..2f19fb3 100644
--- a/WorldlineKeepers/Assets/Scripts/Unit/Characters/PlayerController.cs
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/PlayerController.cs
@@ -7,9 +7,15 @@ namespace WK
public class PlayerController
{
+ /// <summary>
+ /// 角色所有当前数值
+ /// </summary>
private CharacterInfo m_CharacterInfo;
public CharacterInfo info { get { return m_CharacterInfo; } }
+ /// <summary>
+ /// 角色行为逻辑
+ /// </summary>
private CharacterBehaviour m_CharacterBehaviour;
public CharacterBehaviour behaviour { get { return m_CharacterBehaviour; } }
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/Ronin/RoninBehaviour.cs b/WorldlineKeepers/Assets/Scripts/Unit/Characters/Ronin/RoninBehaviour.cs
index 4a348eb..1964323 100644
--- a/WorldlineKeepers/Assets/Scripts/Unit/Characters/Ronin/RoninBehaviour.cs
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/Ronin/RoninBehaviour.cs
@@ -13,7 +13,8 @@ public class RoninBehaviour : CharacterBehaviour
if (info.stats["max_health"] != null)
{
- int health = info.stats["max_health"].value.i;
+ int health = info.stats["max_health"].intValue;
+
}
}
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Enemies/SpiritScript.cs b/WorldlineKeepers/Assets/Scripts/Unit/Enemies/SpiritScript.cs
index 7ebae9c..dbcab58 100644
--- a/WorldlineKeepers/Assets/Scripts/Unit/Enemies/SpiritScript.cs
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Enemies/SpiritScript.cs
@@ -17,7 +17,7 @@ public class SpiritScript : UnitBase
private static List<IQuadTreeObject> collisions = new List<IQuadTreeObject>();
- private SpriteRenderer m_SpriteRenderer;
+ //private SpriteRenderer m_SpriteRenderer;
private int m_CollisionCheckerCount = 0;
@@ -32,7 +32,7 @@ public class SpiritScript : UnitBase
speed = 2;
TestSpirits.spirits.Add(this);
}
-
+
protected override void Update()
{
base.Update();
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs b/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs
new file mode 100644
index 0000000..9ec97f3
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace WK
+{
+
+ public class UnitManager
+ {
+
+
+
+ }
+
+}
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs.meta b/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs.meta
new file mode 100644
index 0000000..a1d3faf
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Unit/UnitManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6c5e1e3ffbd73844aa887ef5d5a829f0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: