From 7e668d421d77874733dba9794d10017cf56beffa Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 03 九月 2018 21:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs | 75 +++++++++++++++++++------------------
System/Treasure/TreasureSoulWin.cs | 7 +++
Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs.meta | 2
3 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
index e1880ae..9381ccb 100644
--- a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
@@ -1,16 +1,16 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, August 16, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
- public partial class TreasurePrivilegeConfig : ConfigBase {
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, September 03, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
+ public partial class TreasurePrivilegeConfig : ConfigBase {
+
public int PrivilegeID { get ; private set ; }
public string Description { get ; private set; }
public string EffectValue { get ; private set; }
@@ -23,15 +23,16 @@
public string Icon { get ; private set; }
public string Name { get ; private set; }
public string targetDescription { get ; private set; }
-
- public override string getKey()
- {
- return PrivilegeID.ToString();
- }
-
- public override void Parse() {
- try
- {
+ public int effectId { get ; private set ; }
+
+ public override string getKey()
+ {
+ return PrivilegeID.ToString();
+ }
+
+ public override void Parse() {
+ try
+ {
PrivilegeID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
Description = rawContents[1].Trim();
@@ -60,17 +61,19 @@
Name = rawContents[10].Trim();
targetDescription = rawContents[11].Trim();
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+
+ effectId=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs.meta b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs.meta
index d557769..4395922 100644
--- a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 761a8477b6259554ab927daec347dba7
-timeCreated: 1534424449
+timeCreated: 1535981375
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/Treasure/TreasureSoulWin.cs b/System/Treasure/TreasureSoulWin.cs
index 1bd9b3d..8858064 100644
--- a/System/Treasure/TreasureSoulWin.cs
+++ b/System/Treasure/TreasureSoulWin.cs
@@ -23,6 +23,7 @@
[SerializeField] Text m_SoulName;
[SerializeField] Text m_SoulDescription;
[SerializeField] Image m_SoulTarget;
+ [SerializeField] UIEffect m_SoulEffect;
[SerializeField] Button m_Active;
[SerializeField] Text m_ActiveText;
[SerializeField] Button m_GotoRealm;
@@ -272,10 +273,16 @@
}
}
m_ContainerPreview.gameObject.SetActive(!special.active);
+ m_SoulEffect.StopImediatly();
if (!special.active)
{
DisplayPreview(model.selectSoul);
}
+ else
+ {
+ m_SoulEffect.effect = config.effectId;
+ m_SoulEffect.Play();
+ }
}
}
}
--
Gitblit v1.8.0