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 |  365 +++++++++++++++++++++++++++++----------------------
 1 files changed, 208 insertions(+), 157 deletions(-)

diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 5ba628d..af0c944 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -30,6 +30,7 @@
         {
             string[] allPath = new string[]{
             
+            "boss_skill.json",
             "boss.json",
             "geminfo.json",
             "levelup.json",
@@ -39,19 +40,19 @@
             "boxsequence.json",
             "box.json",
             "resource.json",
+            "endless_boss.json",
             "endless_buff.json",
             "endless_enemy.json",
             "endless_port.json",
-            "endless_teachport.json",
             "donaterule.json",
             "scoreshop.json",
             "donateshop.json",
             "gemcost.json",
             "buffinfo.json",
-            "skilllevelinfo.json",
             "arena.json",
             "fuckword.json",
             "notice.json",
+            "skilllevelinfo.json",
             "storearea.json",
             "store.json",
             "goldInfo.json",
@@ -72,6 +73,17 @@
             tablename = tablename.Replace(".json", "");
             List<tabledata> allData = new List<tabledata>();
             switch (tablename) {
+            
+                case "boss_skill":
+                    //allData.Clear();
+                    foreach (JsonData item in data)
+                    {
+                        boss_skill tmp = boss_skill.CreateFromJson(item);
+                        allData.Add(tmp as tabledata);
+                    }
+                    JsonDataCenter.allData.Add(tablename, allData);
+                    break;
+               
             
                 case "boss":
                     //allData.Clear();
@@ -172,6 +184,17 @@
                     break;
                
             
+                case "endless_boss":
+                    //allData.Clear();
+                    foreach (JsonData item in data)
+                    {
+                        endless_boss tmp = endless_boss.CreateFromJson(item);
+                        allData.Add(tmp as tabledata);
+                    }
+                    JsonDataCenter.allData.Add(tablename, allData);
+                    break;
+               
+            
                 case "endless_buff":
                     //allData.Clear();
                     foreach (JsonData item in data)
@@ -199,17 +222,6 @@
                     foreach (JsonData item in data)
                     {
                         endless_port tmp = endless_port.CreateFromJson(item);
-                        allData.Add(tmp as tabledata);
-                    }
-                    JsonDataCenter.allData.Add(tablename, allData);
-                    break;
-               
-            
-                case "endless_teachport":
-                    //allData.Clear();
-                    foreach (JsonData item in data)
-                    {
-                        endless_teachport tmp = endless_teachport.CreateFromJson(item);
                         allData.Add(tmp as tabledata);
                     }
                     JsonDataCenter.allData.Add(tablename, allData);
@@ -271,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)
@@ -309,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);
@@ -432,6 +444,61 @@
 
 
     
+    //! 生成文件 boss_skill(boss技能表).xlsx
+    public class boss_skill : tabledata {
+        public int getid(){
+            return id;
+        }
+        
+        // id
+        public int id;
+        
+        // 技能名称
+        public string name;
+        
+        // 技能资源
+        public int image;
+        
+        // 技能冷却时间
+        public int cool_down;
+        
+        // 技能目标
+        public List<int> target;
+        
+        // 技能范围
+        public List<int> tunnel;
+        
+        // 技能动作
+        public int action;
+        
+        // 技能类型
+        public int skill_class;
+        
+        // 技能效果
+        public List<float> effect;
+        
+
+
+        public static boss_skill CreateFromJson(JsonData item)
+        {
+            boss_skill _boss_skill = new boss_skill();
+
+            int index = 0;
+            _boss_skill.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _boss_skill.name = GameUtils.GetString(item[index++].ToString()); 
+            _boss_skill.image = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _boss_skill.cool_down = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _boss_skill.target = GameUtils.GetIntList(item[index++]); 
+            _boss_skill.tunnel = GameUtils.GetIntList(item[index++]); 
+            _boss_skill.action = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _boss_skill.skill_class = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _boss_skill.effect = GameUtils.GetFloatList(item[index++]); 
+            
+            return _boss_skill;
+        }
+
+    }
+
     //! 生成文件 B_BOSS生成表.xlsx
     public class boss : tabledata {
         public int getid(){
@@ -835,6 +902,45 @@
 
     }
 
+    //! 生成文件 endless_boss(无尽模式boss).xlsx
+    public class endless_boss : tabledata {
+        public int getid(){
+            return id;
+        }
+        
+        // id
+        public int id;
+        
+        // Boss名称
+        public string name;
+        
+        // BossAI
+        public int boss_ai;
+        
+        // Boss资源图
+        public int image;
+        
+        // Boss技能组
+        public List<int> skill;
+        
+
+
+        public static endless_boss CreateFromJson(JsonData item)
+        {
+            endless_boss _endless_boss = new endless_boss();
+
+            int index = 0;
+            _endless_boss.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_boss.name = GameUtils.GetString(item[index++].ToString()); 
+            _endless_boss.boss_ai = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_boss.image = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_boss.skill = GameUtils.GetIntList(item[index++]); 
+            
+            return _endless_boss;
+        }
+
+    }
+
     //! 生成文件 endless_buff(无尽模式buff).xlsx
     public class endless_buff : tabledata {
         public int getid(){
@@ -851,7 +957,7 @@
         public List<int> target_type;
         
         // buff效果
-        public List<int> buff_effect;
+        public List<float> buff_effect;
         
         // 生命周期
         public int scope;
@@ -871,6 +977,9 @@
         // 品质
         public int rare;
         
+        // 可获得次数
+        public int get_times;
+        
 
 
         public static endless_buff CreateFromJson(JsonData item)
@@ -881,13 +990,14 @@
             _endless_buff.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_buff.name = GameUtils.GetString(item[index++].ToString()); 
             _endless_buff.target_type = GameUtils.GetIntList(item[index++]); 
-            _endless_buff.buff_effect = GameUtils.GetIntList(item[index++]); 
+            _endless_buff.buff_effect = GameUtils.GetFloatList(item[index++]); 
             _endless_buff.scope = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_buff.brief = GameUtils.GetString(item[index++].ToString()); 
             _endless_buff.down_level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_buff.upper_level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_buff.image = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _endless_buff.rare = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_buff.get_times = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             
             return _endless_buff;
         }
@@ -921,6 +1031,12 @@
         // 资源id
         public int resource;
         
+        // 击杀得分
+        public int point;
+        
+        // 击杀能量
+        public int energy;
+        
 
 
         public static endless_enemy CreateFromJson(JsonData item)
@@ -935,6 +1051,8 @@
             _endless_enemy.speed_rate = float.Parse(GameUtils.GetString(item[index++].ToString())); 
             _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;
         }
@@ -986,7 +1104,7 @@
         // 波次间隔
         public int cooldown;
         
-        // 怪物掉落
+        // box:2:1
         public List<reward> drop;
         
         // 掉落概率
@@ -994,6 +1112,9 @@
         
         // 法阵图片
         public int tunel_bg;
+        
+        // 过关得分
+        public int bonus;
         
 
 
@@ -1018,91 +1139,9 @@
             _endless_port.drop = GameUtils.GetRewardList(item[index++]); 
             _endless_port.drop_rate = GameUtils.GetIntList(item[index++]); 
             _endless_port.tunel_bg = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _endless_port.bonus = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             
             return _endless_port;
-        }
-
-    }
-
-    //! 生成文件 endless_teachport(无尽模式新手引导关卡).xlsx
-    public class endless_teachport : tabledata {
-        public int getid(){
-            return id;
-        }
-        
-        // id
-        public int id;
-        
-        // 关卡等级
-        public int level;
-        
-        // Boss名称
-        public string boss_name;
-        
-        // Boss资源id
-        public int resource;
-        
-        // 波次
-        public int wave;
-        
-        // 赛道
-        public int tunel;
-        
-        // 敌人id
-        public int enemy_id;
-        
-        // 本波次敌人数量
-        public int amount;
-        
-        // 本赛道出怪间隔
-        public int interval;
-        
-        // 怪物基础血量
-        public int b_hp;
-        
-        // 怪物基础速度
-        public float b_speed;
-        
-        // 掉落基础金币
-        public int b_coin;
-        
-        // 波次间隔
-        public int cooldown;
-        
-        // 怪物掉落
-        public List<reward> drop;
-        
-        // 掉落概率
-        public List<int> drop_rate;
-        
-        // 法阵图片
-        public int tunel_bg;
-        
-
-
-        public static endless_teachport CreateFromJson(JsonData item)
-        {
-            endless_teachport _endless_teachport = new endless_teachport();
-
-            int index = 0;
-            _endless_teachport.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.boss_name = GameUtils.GetString(item[index++].ToString()); 
-            _endless_teachport.resource = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.wave = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.tunel = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.enemy_id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.amount = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.interval = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.b_hp = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.b_speed = float.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.b_coin = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            _endless_teachport.drop = GameUtils.GetRewardList(item[index++]); 
-            _endless_teachport.drop_rate = GameUtils.GetIntList(item[index++]); 
-            _endless_teachport.tunel_bg = int.Parse(GameUtils.GetString(item[index++].ToString())); 
-            
-            return _endless_teachport;
         }
 
     }
@@ -1175,6 +1214,9 @@
         // 限购次数
         public int purchaselimit;
         
+        // 图片资源编号
+        public string img;
+        
 
 
         public static scoreshop CreateFromJson(JsonData item)
@@ -1191,6 +1233,7 @@
             _scoreshop.price = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _scoreshop.rewardlimit = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _scoreshop.purchaselimit = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _scoreshop.img = GameUtils.GetString(item[index++].ToString()); 
             
             return _scoreshop;
         }
@@ -1218,6 +1261,9 @@
         // 限购次数
         public int purchaselimit;
         
+        // 商品描述
+        public string info;
+        
 
 
         public static donateshop CreateFromJson(JsonData item)
@@ -1230,6 +1276,7 @@
             _donateshop.reward = GameUtils.GetRewardList(item[index++]); 
             _donateshop.price = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             _donateshop.purchaselimit = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _donateshop.info = GameUtils.GetString(item[index++].ToString()); 
             
             return _donateshop;
         }
@@ -1306,53 +1353,6 @@
             _buffinfo.tag = int.Parse(GameUtils.GetString(item[index++].ToString())); 
             
             return _buffinfo;
-        }
-
-    }
-
-    //! 生成文件 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;
         }
 
     }
@@ -1446,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