From 3e9751f63a8e2dc1cd007bf186ab080aadb849c5 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 19 十二月 2018 17:35:54 +0800
Subject: [PATCH] 5427 子 【开发】【1.4】资源找回新增封魔坛找回规则 / 【前端】【1.4】资源找回新增封魔坛找回规则
---
Core/GameEngine/Model/Config/ResourcesBackConfig.cs | 55 ++++++++++++++-------------
System/DailyQuest/ResourcesBackModel.cs | 19 +++++++++
System/DailyQuest/ResourcesBackBoxBack.cs | 15 +++++++
Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta | 2
4 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
index e8ad383..dbd2e2c 100644
--- a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
+++ b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, January 17, 2018
+// [ Date ]: Wednesday, December 19, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -11,14 +11,15 @@
public partial class ResourcesBackConfig : ConfigBase {
- public int ID { get ; private set ; }
- public int RelatedID { get ; private set ; }
- public int CanBackTimes { get ; private set ; }
- public int NormalCostJade { get ; private set ; }
- public int VipCostJade { get ; private set ; }
- public string JadeReward { get ; private set; }
- public int CostCopper { get ; private set ; }
- public string CopperReward { get ; private set; }
+ public int ID { get ; private set ; }
+ public int RelatedID { get ; private set ; }
+ public int CanBackTimes { get ; private set ; }
+ public int NormalCostJade { get ; private set ; }
+ public int VipCostJade { get ; private set ; }
+ public string JadeReward { get ; private set; }
+ public int CostCopper { get ; private set ; }
+ public string CopperReward { get ; private set; }
+ public string JobItem { get ; private set; }
public string RewardList { get ; private set; }
public override string getKey()
@@ -29,23 +30,25 @@
public override void Parse() {
try
{
- ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
-
- RelatedID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
-
- CanBackTimes=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
-
- NormalCostJade=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
-
- VipCostJade=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
-
- JadeReward = rawContents[5].Trim();
-
- CostCopper=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
-
- CopperReward = rawContents[7].Trim();
-
- RewardList = rawContents[8].Trim();
+ ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ RelatedID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+
+ CanBackTimes=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
+ NormalCostJade=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
+
+ VipCostJade=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
+
+ JadeReward = rawContents[5].Trim();
+
+ CostCopper=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+
+ CopperReward = rawContents[7].Trim();
+
+ JobItem = rawContents[8].Trim();
+
+ RewardList = rawContents[9].Trim();
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
index 8707e12..0f5a7d3 100644
--- a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 2fdee2899ae3d5d469aabc2daa6c744a
-timeCreated: 1516157851
+timeCreated: 1545210998
licenseType: Free
MonoImporter:
serializedVersion: 2
diff --git a/System/DailyQuest/ResourcesBackBoxBack.cs b/System/DailyQuest/ResourcesBackBoxBack.cs
index 109299b..04ea737 100644
--- a/System/DailyQuest/ResourcesBackBoxBack.cs
+++ b/System/DailyQuest/ResourcesBackBoxBack.cs
@@ -213,6 +213,7 @@
Button Btn1 = m_Coent.GetChild(type).Find("Image").GetComponent<Button>();
Image Image_2 = m_Coent.GetChild(type).Find("Image").GetComponent<Image>();
int ItemId = resourcesBackClass.JadeReward.item[j].ItemID;
+ ItemId = ReplaceItemID(ItemId, resourcesBackClass);//鏍规嵁鑱屼笟鏇挎崲鐗╁搧ID
string itemIcon = Config.Instance.Get<ItemConfig>(ItemId).IconKey;
Icon1.SetSprite(itemIcon);
Number1.text = packModelInterface.OnChangeCoinsUnit((ulong)ItemCount);
@@ -354,6 +355,7 @@
Button Btn1 = m_Coent.GetChild(type).Find("Image").GetComponent<Button>();
Image Image_2 = m_Coent.GetChild(type).Find("Image").GetComponent<Image>();
int ItemId = resourcesBackClass.CopperReward.item[j].ItemID;
+ ItemId = ReplaceItemID(ItemId, resourcesBackClass);//鏍规嵁鑱屼笟鏇挎崲鐗╁搧ID
string itemIcon = Config.Instance.Get<ItemConfig>(ItemId).IconKey;
var Item_2 = Config.Instance.Get<ItemConfig>(ItemId);
Image_2.SetItemBackGround(Item_2.ItemColor);
@@ -448,6 +450,19 @@
WindowCenter.Instance.Open<RechargeTipWin>();
}
}
+ private int ReplaceItemID(int itemID, ResourcesBackClass resourcesBackClass)
+ {
+ int ItemID = itemID;
+ if (resourcesBackClass.ReplaceItemID.Contains(itemID))
+ {
+ int job = PlayerDatas.Instance.baseData.Job;
+ if (job <= resourcesBackClass.ReplaceItemID.Count)
+ {
+ ItemID = resourcesBackClass.ReplaceItemID[(job - 1)];
+ }
+ }
+ return ItemID;
+ }
}
}
diff --git a/System/DailyQuest/ResourcesBackModel.cs b/System/DailyQuest/ResourcesBackModel.cs
index f5e4d2b..2a2c0eb 100644
--- a/System/DailyQuest/ResourcesBackModel.cs
+++ b/System/DailyQuest/ResourcesBackModel.cs
@@ -30,6 +30,7 @@
public ulong TjgExp;//缁忛獙(鑴辨満鎸�)
public int Times;//鍙壘鍥炴椂闂�
public string DeadTime;//姝讳骸鏃堕棿
+ public List<int> ReplaceItemID;//鏇挎崲鐨勭墿鍝両D
}
public class RewardRecovery
{
@@ -159,6 +160,7 @@
resourcesBackClass.DeadTime = BeKilledTime(TimeUtility.GetTime(vNetData.DeadTime));
resourcesBackClass.TjgExp = Experience(vNetData.Exp, vNetData.Exp1);
resourcesBackClass.RewardList = ConfigParse.GetMultipleStr(configRB.RewardList);
+ resourcesBackClass.ReplaceItemID = ReplaceItemID(configRB.JobItem);
ResourcesBackDic.Add(id, resourcesBackClass);
}
ResourcesBackRedPoint();
@@ -261,6 +263,7 @@
resourcesBackClass.CostCopper = configRB.CostCopper;
resourcesBackClass.CopperReward = LitJson.JsonMapper.ToObject<RewardRecovery>(configRB.CopperReward);
resourcesBackClass.RewardList = ConfigParse.GetMultipleStr(configRB.RewardList);
+ resourcesBackClass.ReplaceItemID = ReplaceItemID(configRB.JobItem);
ResourcesBackDic.Add(id, resourcesBackClass);
}
}
@@ -271,7 +274,21 @@
}
}
-
+ private List<int> ReplaceItemID(string str)
+ {
+ List<int> list = new List<int>();
+ if (str == string.Empty)
+ {
+ return list;
+ }
+ var _jsonData = LitJson.JsonMapper.ToObject(str);
+ for (int i = 0; i < _jsonData.Count; i++)
+ {
+ list.Add(int.Parse(_jsonData[i][0].ToString()));
+ list.Add(int.Parse(_jsonData[i][1].ToString()));
+ }
+ return list;
+ }
}
}
--
Gitblit v1.8.0