From a2acd8beb3484c2f6116ed8cc255bdec2e1d4a1f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 五月 2019 11:51:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/FairyTreasureCollectPanelPattern3.cs | 7 +++++++
System/Treasure/TreasureModel.cs | 5 +++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern3.cs b/System/Treasure/FairyTreasureCollectPanelPattern3.cs
index 0a0b4eb..f4f7d72 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern3.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern3.cs
@@ -72,6 +72,10 @@
}
break;
case 305:
+ m_GotoBtnText.text = Language.Get("FairyTreasureGot");
+ m_ContainerLocked.gameObject.SetActive(false);
+ m_AddedEffect.text = Language.Get("FairyTreasure_12", model.treasureAddReikiPoint.y);
+ break;
case 306:
case 307:
case 308:
@@ -94,6 +98,9 @@
case 18:
m_AddedEffect.text = Language.Get("FairyTreasure_9", _property.Value / 100);
break;
+ case 37:
+ m_AddedEffect.text = Language.Get("FairyTreasure_11", _property.Value / 100);
+ break;
}
}
break;
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index d15d30e..fab73f3 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -148,6 +148,8 @@
public int displayInductionId { get; private set; }
+ public Int2 treasureAddReikiPoint { get; private set; }
+
TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
VIPKillNPCTreasure m_VIPKillNPCTreasure;
@@ -306,6 +308,9 @@
funcConfig = FuncConfigConfig.Get("OpenFabao");
entranceOpenCondition = int.Parse(funcConfig.Numerical1);
+ funcConfig = FuncConfigConfig.Get("FabaoAddPoint");
+ treasureAddReikiPoint = new Int2(int.Parse(funcConfig.Numerical1), int.Parse(funcConfig.Numerical2));
+
var treasureDungeonConfigs = TreasureDungeonConfig.GetValues();
foreach (var config in treasureDungeonConfigs)
{
--
Gitblit v1.8.0