From 6baa5a654138a2e0a9871adaef311a74e132dd6e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 15:53:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/Net/NetExtends/Table.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index a1ab69f..a6e7a76 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -1201,6 +1201,9 @@
// 可获得次数
public int get_times;
+ // 播放获得BUFF特效
+ public int get_buff;
+
public static endless_buff CreateFromJson(JsonData item)
@@ -1208,18 +1211,19 @@
endless_buff _endless_buff = new endless_buff();
int index = 0;
- _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.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.get_times = int.Parse(GameUtils.GetString(item[index++].ToString()));
-
+ _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.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.get_times = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _endless_buff.get_buff = int.Parse(GameUtils.GetString(item[index++].ToString()));
+
return _endless_buff;
}
--
Gitblit v1.9.1