From 5b4f4fdfb98bbae6116b5879a63f6ca6bba07326 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 07 一月 2019 17:20:54 +0800
Subject: [PATCH] Merge branch 'master' into FashionDress
---
Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
index e29cc41..76fcfdf 100644
--- a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, December 11, 2018
+// [ Date ]: Monday, January 07, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -16,7 +16,12 @@
public int level { get ; private set ; }
public string effect { get ; private set; }
public int fightPower { get ; private set ; }
- public string attr { get ; private set; }
+ public string attr { get ; private set; }
+ public string icon { get ; private set; }
+ public string skillName { get ; private set; }
+ public Vector3 effectPosition { get ; private set; }
+ public Vector3 effectAngles { get ; private set; }
+ public Vector3 effectScale { get ; private set; }
public override string getKey()
{
@@ -36,7 +41,17 @@
fightPower=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
- attr = rawContents[5].Trim();
+ attr = rawContents[5].Trim();
+
+ icon = rawContents[6].Trim();
+
+ skillName = rawContents[7].Trim();
+
+ effectPosition=rawContents[8].Vector3Parse();
+
+ effectAngles=rawContents[9].Vector3Parse();
+
+ effectScale=rawContents[10].Vector3Parse();
}
catch (Exception ex)
{
--
Gitblit v1.8.0