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/Common/GameUtils.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/Common/GameUtils.cs b/Assets/Scripts/Common/GameUtils.cs
index 6c9cbb4..e9221eb 100644
--- a/Assets/Scripts/Common/GameUtils.cs
+++ b/Assets/Scripts/Common/GameUtils.cs
@@ -39,7 +39,7 @@
public static List<float> GetFloatList(JsonData jsData)
{
List<float> tmp = new List<float>();
- for (int i = 0; i <jsData.Count; i++)
+ for (int i = 0; i < jsData.Count; i++)
{
tmp.Add(float.Parse(jsData[i].ToString()));
}
@@ -98,6 +98,10 @@
rd.id = int.Parse(strlist[1]);
rd.count = int.Parse(strlist[2]);
break;
+ case "coin":
+ //rd.type = Protobuf.CURRENCY.Coin;
+ rd.count = int.Parse(strlist[1]);
+ break;
}
return rd;
--
Gitblit v1.9.1