From 08659f0a079d05a83d0827fd57a6bdb525c67217 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 08 一月 2019 15:05:32 +0800
Subject: [PATCH] Merge branch 'master' into FashionDress
---
Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
index 76fcfdf..6ec9ccb 100644
--- a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
@@ -19,9 +19,9 @@
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 Vector3[] effectPosition;
+ public Vector3[] effectAngles;
+ public Vector3[] effectScale;
public override string getKey()
{
@@ -47,11 +47,26 @@
skillName = rawContents[7].Trim();
- effectPosition=rawContents[8].Vector3Parse();
+ string[] effectPositionStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectPosition = new Vector3[effectPositionStringArray.Length];
+ for (int i=0;i<effectPositionStringArray.Length;i++)
+ {
+ effectPosition[i]=effectPositionStringArray[i].Vector3Parse();
+ }
- effectAngles=rawContents[9].Vector3Parse();
+ string[] effectAnglesStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectAngles = new Vector3[effectAnglesStringArray.Length];
+ for (int i=0;i<effectAnglesStringArray.Length;i++)
+ {
+ effectAngles[i]=effectAnglesStringArray[i].Vector3Parse();
+ }
- effectScale=rawContents[10].Vector3Parse();
+ string[] effectScaleStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ effectScale = new Vector3[effectScaleStringArray.Length];
+ for (int i=0;i<effectScaleStringArray.Length;i++)
+ {
+ effectScale[i]=effectScaleStringArray[i].Vector3Parse();
+ }
}
catch (Exception ex)
{
--
Gitblit v1.8.0