From 2a1cd4fda8a4a8e649910d16b4dfa1ce7ae63543 Mon Sep 17 00:00:00 2001
From: chai <215380520@qq.com>
Date: Fri, 12 May 2023 09:24:40 +0800
Subject: *misc

---
 .../Assets/Scripts/Stats/CharacterStatsBase.cs     | 54 +++++++++++++++++++---
 marching/Assets/Scripts/Stats/CharacterStatsDef.cs | 13 ------
 .../Assets/Scripts/Stats/CharacterStatsDef.cs.meta | 11 -----
 .../Assets/Scripts/Stats/CharacterStatsMetadata.cs | 23 +++++++++
 .../Scripts/Stats/CharacterStatsMetadata.cs.meta   | 11 +++++
 5 files changed, 82 insertions(+), 30 deletions(-)
 delete mode 100644 marching/Assets/Scripts/Stats/CharacterStatsDef.cs
 delete mode 100644 marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta
 create mode 100644 marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs
 create mode 100644 marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs.meta

(limited to 'marching/Assets/Scripts/Stats')

diff --git a/marching/Assets/Scripts/Stats/CharacterStatsBase.cs b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs
index a2e5fe2..b4869cb 100644
--- a/marching/Assets/Scripts/Stats/CharacterStatsBase.cs
+++ b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs
@@ -1,16 +1,58 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using UnityEngine;
+using WK.Data;
 
-/// <summary>
-/// 角色基础属性
-/// </summary>
-public abstract class CharacterStatsBase
+namespace WK
 {
+
+    [System.Runtime.InteropServices.StructLayout(LayoutKind.Explicit)]
+    public struct CharacterStatsValue
+    {
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public int i;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public float f;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public bool boolean;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public char c;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public Vector2 v2;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public Vector3 v3;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public Vector4 v4;
+        [System.Runtime.InteropServices.FieldOffset(0)]
+        public Color color;
+    }
+
+
     /// <summary>
-    /// 属性唯一标识
+    /// 运行时角色基础属性
     /// </summary>
-    public string UID; 
+    public abstract class CharacterStats
+    {
+
+        /// <summary>
+        /// 表格数据
+        /// </summary>
+        public CharacterStatsMetadata metadata;
+
+        /// <summary>
+        /// 当前属性值
+        /// </summary>
+        public CharacterStatsValue value;
+        
+        public string uid
+        {
+            get
+            {
+                return metadata.uid;
+            }
+        }
 
+    }
 
 }
diff --git a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs
deleted file mode 100644
index 87eeecd..0000000
--- a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class CharacterStatsDef
-{
-    public string uid;
-
-    public string name_key;
-
-    public int type;
-
-}
diff --git a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta
deleted file mode 100644
index a8d9a08..0000000
--- a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 63006c2b6a413714bb852f46b214df90
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs b/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs
new file mode 100644
index 0000000..3b0b13b
--- /dev/null
+++ b/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace WK.Data
+{
+
+    /// <summary>
+    /// 角色基础属性元数据
+    /// </summary>
+    public class CharacterStatsMetadata
+    {
+        public string uid;
+
+        public string name_key;
+
+        public int type;
+
+        // 暂留数据
+        public string extra_data;
+    }
+
+}
diff --git a/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs.meta b/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs.meta
new file mode 100644
index 0000000..a8d9a08
--- /dev/null
+++ b/marching/Assets/Scripts/Stats/CharacterStatsMetadata.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 63006c2b6a413714bb852f46b214df90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0