From 64424067bd1fb1539503ee9a8e98673032f46e89 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 08 一月 2019 09:34:42 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss
---
Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
index e29cc41..6ec9ccb 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;
+ public Vector3[] effectAngles;
+ public Vector3[] effectScale;
public override string getKey()
{
@@ -36,7 +41,32 @@
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();
+
+ 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();
+ }
+
+ 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();
+ }
+
+ 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