From e70a047e1d3a3b476212d49714264cf6871cd9fc Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Mon, 23 Nov 2020 16:22:04 +0800
Subject: [PATCH] 修改表格

---
 Assets/Scripts/Net/NetExtends/Table.cs |  126 ++++++++++++++++++++++-------------------
 1 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index d151adf..af0c944 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -49,10 +49,10 @@
             "donateshop.json",
             "gemcost.json",
             "buffinfo.json",
-            "skilllevelinfo.json",
             "arena.json",
             "fuckword.json",
             "notice.json",
+            "skilllevelinfo.json",
             "storearea.json",
             "store.json",
             "goldInfo.json",
@@ -283,17 +283,6 @@
                     break;
                
             
-                case "skilllevelinfo":
-                    //allData.Clear();
-                    foreach (JsonData item in data)
-                    {
-                        skilllevelinfo tmp = skilllevelinfo.CreateFromJson(item);
-                        allData.Add(tmp as tabledata);
-                    }
-                    JsonDataCenter.allData.Add(tablename, allData);
-                    break;
-               
-            
                 case "arena":
                     //allData.Clear();
                     foreach (JsonData item in data)
@@ -321,6 +310,17 @@
                     foreach (JsonData item in data)
                     {
                         notice tmp = notice.CreateFromJson(item);
+                        allData.Add(tmp as tabledata);
+                    }
+                    JsonDataCenter.allData.Add(tablename, allData);
+                    break;
+               
+            
+                case "skilllevelinfo":
+                    //allData.Clear();
+                    foreach (JsonData item in data)
+                    {
+                        skilllevelinfo tmp = skilllevelinfo.CreateFromJson(item);
                         allData.Add(tmp as tabledata);
                     }
                     JsonDataCenter.allData.Add(tablename, allData);
@@ -1034,6 +1034,9 @@
         // 击杀得分
         public int point;
         
+        // 击杀能量
+        public int energy;
+        
 
 
         public static endless_enemy CreateFromJson(JsonData item)
@@ -1049,6 +1052,7 @@
             _endless_enemy.coin_rate = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_enemy.resource = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_enemy.point = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_enemy.energy = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             
             return _endless_enemy;
         }
@@ -1353,53 +1357,6 @@
 
     }
 
-    //! 生成文件 J_技能养成表.xlsx
-    public class skilllevelinfo : tabledata {
-        public int getid(){
-            return id;
-        }
-        
-        // id
-        public int id;
-        
-        // 技能id
-        public int skill;
-        
-        // 技能等级
-        public int level;
-        
-        // 攻击类型
-        public List<int> atcmod;
-        
-        // 冷却时间
-        public int cooldown;
-        
-        // 技能效果
-        public List<int> skilleffect;
-        
-        // buff队列
-        public List<int> buff;
-        
-
-
-        public static skilllevelinfo CreateFromJson(JsonData item)
-        {
-            skilllevelinfo _skilllevelinfo = new skilllevelinfo();
-
-            int index = 0;
-            _skilllevelinfo.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _skilllevelinfo.skill = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _skilllevelinfo.level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _skilllevelinfo.atcmod = GameUtils.GetIntList(item[index++]); 
-            _skilllevelinfo.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _skilllevelinfo.skilleffect = GameUtils.GetIntList(item[index++]); 
-            _skilllevelinfo.buff = GameUtils.GetIntList(item[index++]); 
-            
-            return _skilllevelinfo;
-        }
-
-    }
-
     //! 生成文件 J_竞技场等级对应分数表.xlsx
     public class arena : tabledata {
         public int getid(){
@@ -1489,6 +1446,57 @@
 
     }
 
+    //! 生成文件 skilllevelinfo(技能养成表).xlsx
+    public class skilllevelinfo : tabledata {
+        public int getid(){
+            return id;
+        }
+        
+        // id
+        public int id;
+        
+        // 技能id
+        public int skill;
+        
+        // 技能等级
+        public int level;
+        
+        // 攻击类型
+        public List<int> atcmod;
+        
+        // 冷却时间
+        public int cooldown;
+        
+        // 技能效果
+        public List<int> skilleffect;
+        
+        // buff队列
+        public List<int> buff;
+        
+        // 能量消耗
+        public int cost;
+        
+
+
+        public static skilllevelinfo CreateFromJson(JsonData item)
+        {
+            skilllevelinfo _skilllevelinfo = new skilllevelinfo();
+
+            int index = 0;
+            _skilllevelinfo.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _skilllevelinfo.skill = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _skilllevelinfo.level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _skilllevelinfo.atcmod = GameUtils.GetIntList(item[index++]); 
+            _skilllevelinfo.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _skilllevelinfo.skilleffect = GameUtils.GetIntList(item[index++]); 
+            _skilllevelinfo.buff = GameUtils.GetIntList(item[index++]); 
+            _skilllevelinfo.cost = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            
+            return _skilllevelinfo;
+        }
+
+    }
+
     //! 生成文件 S_商店分区表 .xlsx
     public class storearea : tabledata {
         public int getid(){

--
Gitblit v1.9.1