From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Net/NetExtends/Table.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 8f15510..485f741 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -1027,6 +1027,9 @@
// 资源id
public int resource;
+ // 击杀得分
+ public int point;
+
public static endless_enemy CreateFromJson(JsonData item)
@@ -1041,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;
}
@@ -1101,6 +1105,9 @@
// 法阵图片
public int tunel_bg;
+ // 过关得分
+ public int bonus;
+
public static endless_port CreateFromJson(JsonData item)
@@ -1124,6 +1131,7 @@
_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;
}
@@ -1198,6 +1206,9 @@
// 限购次数
public int purchaselimit;
+ // 图片资源编号
+ public string img;
+
public static scoreshop CreateFromJson(JsonData item)
@@ -1214,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;
}
@@ -1241,6 +1253,9 @@
// 限购次数
public int purchaselimit;
+ // 商品描述
+ public string info;
+
public static donateshop CreateFromJson(JsonData item)
@@ -1253,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;
}
--
Gitblit v1.9.1