Merge commit 'f2f4e1e45981bb294a5221ade7b4646cc3e29d35' into master

chenxin

2020-11-11 515d6439e79793dc903b249cfeb8fc2f217f2e4e

 Assets/Scripts/Net/NetExtends/Table.cs

@@ -30,6 +30,7 @@
        {
            string[] allPath = new string[]{
            
            "boss_skill.json",
            "boss.json",
            "geminfo.json",
            "levelup.json",
@@ -39,9 +40,11 @@
            "boxsequence.json",
            "box.json",
            "resource.json",
            "endless_boss.json",
            "endless_buff.json",
            "endless_enemy.json",
            "endless_port.json",
            "donaterule.json",
            "scoreshop.json",
            "donateshop.json",
            "gemcost.json",
@@ -70,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();
@@ -170,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)
@@ -197,6 +222,17 @@
                    foreach (JsonData item in data)
                    {
                        endless_port tmp = endless_port.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);
@@ -408,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(){
@@ -811,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(){
@@ -897,6 +1027,9 @@
        // 资源id
        public int resource;
        
        // 击杀得分
        public int point;
        


        public static endless_enemy CreateFromJson(JsonData item)
@@ -911,6 +1044,7 @@
            _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())); 
            
            return _endless_enemy;
        }
@@ -928,6 +1062,9 @@
        
        // 关卡等级
        public int level;
        
        // Boss名称
        public string boss_name;
        
        // Boss资源id
        public int resource;
@@ -959,11 +1096,17 @@
        // 波次间隔
        public int cooldown;
        
        // 怪物掉落
        // box:2:1
        public List<reward> drop;
        
        // 掉落概率
        public List<int> drop_rate;
        
        // 法阵图片
        public int tunel_bg;
        
        // 过关得分
        public int bonus;
        


@@ -974,6 +1117,7 @@
            int index = 0;
            _endless_port.id = int.Parse(GameUtils.GetString(item[index++].ToString())); 
            _endless_port.level = int.Parse(GameUtils.GetString(item[index++].ToString())); 
            _endless_port.boss_name = GameUtils.GetString(item[index++].ToString()); 
            _endless_port.resource = int.Parse(GameUtils.GetString(item[index++].ToString())); 
            _endless_port.wave = int.Parse(GameUtils.GetString(item[index++].ToString())); 
            _endless_port.tunel = int.Parse(GameUtils.GetString(item[index++].ToString())); 
@@ -986,8 +1130,45 @@
            _endless_port.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString())); 
            _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;
        }

    }

    //! 生成文件 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;
        }

    }
@@ -1025,6 +1206,9 @@
        // 限购次数
        public int purchaselimit;
        
        // 图片资源编号
        public string img;
        


        public static scoreshop CreateFromJson(JsonData item)
@@ -1041,6 +1225,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;
        }
@@ -1068,6 +1253,9 @@
        // 限购次数
        public int purchaselimit;
        
        // 商品描述
        public string info;
        


        public static donateshop CreateFromJson(JsonData item)
@@ -1080,6 +1268,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;
        }