From d7db442a4655baa0c0f282aa415fd12da4edc40a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 27 Oct 2020 09:46:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

---
 Assets/Scripts/Net/NetExtends/Table.cs |  142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 142 insertions(+), 0 deletions(-)

diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 7380e41..5ba628d 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -42,6 +42,8 @@
             "endless_buff.json",
             "endless_enemy.json",
             "endless_port.json",
+            "endless_teachport.json",
+            "donaterule.json",
             "scoreshop.json",
             "donateshop.json",
             "gemcost.json",
@@ -197,6 +199,28 @@
                     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);
+                    break;
+               
+            
+                case "donaterule":
+                    //allData.Clear();
+                    foreach (JsonData item in data)
+                    {
+                        donaterule tmp = donaterule.CreateFromJson(item);
                         allData.Add(tmp as tabledata);
                     }
                     JsonDataCenter.allData.Add(tablename, allData);
@@ -1000,6 +1024,124 @@
 
     }
 
+    //! 生成文件 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;
+        }
+
+    }
+
+    //! 生成文件 G_donaterule(公会捐赠卡规则).xlsx
+    public class donaterule : tabledata {
+        public int getid(){
+            return id;
+        }
+        
+        // 标识符
+        public int id;
+        
+        // 竞技场等级
+        public List<int> ranklevle;
+        
+        // 发起请求后可获得的卡牌数
+        public List<string> canreward;
+        
+        // 可捐赠给他人的卡牌数
+        public List<string> candonate;
+        
+
+
+        public static donaterule CreateFromJson(JsonData item)
+        {
+            donaterule _donaterule = new donaterule();
+
+            int index = 0;
+            _donaterule.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
+            _donaterule.ranklevle = GameUtils.GetIntList(item[index++]); 
+            _donaterule.canreward = GameUtils.GetStringList(item[index++]); 
+            _donaterule.candonate = GameUtils.GetStringList(item[index++]); 
+            
+            return _donaterule;
+        }
+
+    }
+
     //! 生成文件 G_公会积分商店.xlsx
     public class scoreshop : tabledata {
         public int getid(){

--
Gitblit v1.9.1