From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Net/NetExtends/Table.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index af0c944..3f32f38 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -1105,7 +1105,7 @@
public int cooldown;
// box:2:1
- public List<reward> drop;
+ public reward drop;
// 掉落概率
public List<int> drop_rate;
@@ -1136,7 +1136,7 @@
_endless_port.b_speed = float.Parse(GameUtils.GetString(item[index++].ToString()));
_endless_port.b_coin = int.Parse(GameUtils.GetString(item[index++].ToString()));
_endless_port.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_port.drop = GameUtils.GetRewardList(item[index++]);
+ _endless_port.drop = GameUtils.GetReward(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()));
--
Gitblit v1.9.1