From cdc87413b30e6aff4a9aaa1bbc8fc778ad073bb4 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 13 八月 2018 16:05:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/DailyQuest/ResourcesBackModel.cs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/System/DailyQuest/ResourcesBackModel.cs b/System/DailyQuest/ResourcesBackModel.cs
index 66ee135..125ced3 100644
--- a/System/DailyQuest/ResourcesBackModel.cs
+++ b/System/DailyQuest/ResourcesBackModel.cs
@@ -25,6 +25,7 @@
         public int CostCopper; //閾滈挶鎵惧洖閾滈挶娑堣��
         public RewardRecovery CopperReward;//閾滈挶鎵惧洖濂栧姳
         public int ExtraData;//棰濆鍙傛暟
+        public int ExtraData2;//棰濆鍙傛暟2
         public string[] RewardList;//濂栧姳鍒楄〃
         public ulong TjgExp;//缁忛獙(鑴辨満鎸�)
         public int Times;//鍙壘鍥炴椂闂�
@@ -236,6 +237,7 @@
                     resourcesBackDic.RecoverCnt = vNetData.NumInfo[i].RecoverCnt;
                     resourcesBackDic.ExtraCnt = vNetData.NumInfo[i].ExtraCnt;
                     resourcesBackDic.ExtraData = vNetData.NumInfo[i].ExtraData;
+                    resourcesBackDic.ExtraData2 = vNetData.NumInfo[i].ExtraData2;
 
                 }
                 else
@@ -247,6 +249,7 @@
                     resourcesBackClass.RecoverCnt = vNetData.NumInfo[i].RecoverCnt;
                     resourcesBackClass.ExtraCnt = vNetData.NumInfo[i].ExtraCnt;
                     resourcesBackClass.ExtraData = vNetData.NumInfo[i].ExtraData;
+                    resourcesBackClass.ExtraData2 = vNetData.NumInfo[i].ExtraData2;
                     resourcesBackClass.RelatedID = configRB.RelatedID;
                     var configDQC = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(configRB.RelatedID);//鏃ュ父浠诲姟琛�
                     resourcesBackClass.NameOfActivity = configDQC.Title;

--
Gitblit v1.8.0