From 85a92b4fc459b46a8f780ac31a9425f87f48821f Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 18 Nov 2020 13:54:12 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Net/NetExtends/Table.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 485f741..da4917e 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -957,7 +957,7 @@
public List<int> target_type;
// buff效果
- public List<int> buff_effect;
+ public List<float> buff_effect;
// 生命周期
public int scope;
@@ -977,6 +977,9 @@
// 品质
public int rare;
+ // 是否重复出现
+ public int is_repeated;
+
public static endless_buff CreateFromJson(JsonData item)
@@ -987,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.is_repeated = int.Parse(GameUtils.GetString(item[index++].ToString()));
return _endless_buff;
}
--
Gitblit v1.9.1