From 6ced055129fdd2b31a676494df8752e71fb5b60a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 19:27:05 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Net/NetExtends/Table.cs | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 107 insertions(+), 0 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 9e2c9f0..eb4a053 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -41,6 +41,7 @@
"box.json",
"resource.json",
"elf_info.json",
+ "elf_skill.json",
"elf_upgrade.json",
"endless_boss.json",
"endless_buff.json",
@@ -191,6 +192,17 @@
foreach (JsonData item in data)
{
elf_info tmp = elf_info.CreateFromJson(item);
+ allData.Add(tmp as tabledata);
+ }
+ JsonDataCenter.allData.Add(tablename, allData);
+ break;
+
+
+ case "elf_skill":
+ //allData.Clear();
+ foreach (JsonData item in data)
+ {
+ elf_skill tmp = elf_skill.CreateFromJson(item);
allData.Add(tmp as tabledata);
}
JsonDataCenter.allData.Add(tablename, allData);
@@ -985,6 +997,97 @@
}
+ //! 生成文件 elf_skill（精灵技能表）.xlsx
+ public class elf_skill : tabledata {
+ public int getid(){
+ return id;
+ }
+
+ // id
+ public int id;
+
+ // 技能名称
+ public string name;
+
+ // 伤害千分比
+ public int dmg_ratio;
+
+ // 技能附加伤害
+ public int ex_dmg;
+
+ // 附加暴击率
+ public int ex_crit;
+
+ // 附加效果
+ public List<int> ex_func;
+
+ // 技能范围
+ public string scope;
+
+ // 技能射程
+ public int range;
+
+ // 连击
+ public int hit;
+
+ // 持续时间
+ public int last;
+
+ // 计算间隔
+ public int count;
+
+ // 前摇时间
+ public int p_time;
+
+ // 附加buff
+ public List<int> buff;
+
+ // 动画类型
+ public string ani_tpye;
+
+ // 子弹特效
+ public string e_bullet;
+
+ // 动画特效
+ public string e_line;
+
+ // 命中特效
+ public string e_hit;
+
+ // 前摇特效
+ public string e_pre_act;
+
+
+
+ public static elf_skill CreateFromJson(JsonData item)
+ {
+ elf_skill _elf_skill = new elf_skill();
+
+ int index = 0;
+ _elf_skill.id = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.name = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.dmg_ratio = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.ex_dmg = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.ex_crit = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.ex_func = GameUtils.GetIntList(item[index++]);
+ _elf_skill.scope = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.range = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.hit = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.last = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.count = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.p_time = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_skill.buff = GameUtils.GetIntList(item[index++]);
+ _elf_skill.ani_tpye = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.e_bullet = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.e_line = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.e_hit = GameUtils.GetString(item[index++].ToString());
+ _elf_skill.e_pre_act = GameUtils.GetString(item[index++].ToString());
+
+ return _elf_skill;
+ }
+
+ }
+
//! 生成文件 elf_upgrade（场内升级表）.xlsx
public class elf_upgrade : tabledata {
public int getid(){
@@ -997,6 +1100,9 @@
// 攻击比率
public int ratio;
+ // 等级底框
+ public int rank_img;
+
public static elf_upgrade CreateFromJson(JsonData item)
@@ -1006,6 +1112,7 @@
int index = 0;
_elf_upgrade.id = int.Parse(GameUtils.GetString(item[index++].ToString()));
_elf_upgrade.ratio = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _elf_upgrade.rank_img = int.Parse(GameUtils.GetString(item[index++].ToString()));
return _elf_upgrade;
}
--
Gitblit v1.9.1