解决冲突

chenxin

2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb

 Assets/Scripts/Net/NetExtends/Table.cs

@@ -42,7 +42,6 @@
            "endless_buff.json",
            "endless_enemy.json",
            "endless_port.json",
            "endless_teachport.json",
            "donaterule.json",
            "scoreshop.json",
            "donateshop.json",
@@ -199,17 +198,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);
@@ -986,7 +974,7 @@
        // 波次间隔
        public int cooldown;
        
        // 怪物掉落
        // box:2:1
        public List<reward> drop;
        
        // 掉落概率
@@ -1020,89 +1008,6 @@
            _endless_port.tunel_bg = 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;
        }

    }