From 97e922d74b3b016f63cb436fb82f8139718b9deb Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 29 七月 2025 20:55:23 +0800
Subject: [PATCH] 0312 同步表格
---
Main/Config/Configs/TreeLVConfig.cs | 5 +----
Main/System/Hero/UIHeroController.cs | 2 +-
Main/Component/UI/Effect/UIEffectPlayer.cs | 2 +-
Main/Component/UI/Effect/EffectPlayer.cs | 14 +++++++-------
Main/Config/Configs/HeroConfig.cs | 33 ++++++++++++++++++---------------
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Main/Component/UI/Effect/EffectPlayer.cs b/Main/Component/UI/Effect/EffectPlayer.cs
index afd31a9..0246021 100644
--- a/Main/Component/UI/Effect/EffectPlayer.cs
+++ b/Main/Component/UI/Effect/EffectPlayer.cs
@@ -7,7 +7,7 @@
using UnityEngine.UI;
// 鐗规晥鎾斁鍣紝瀵硅薄姹犵鐞嗭細unity鐗规晥鍜宻pine鐗规晥閮芥槸鍋氬ソ鐨勯鍒朵綋
-// unity鐗规晥棰勫埗浣撴槸鐗规晥甯堝湪鍒朵綔鐨勬椂鍊欑敓鎴愮殑锛寀nity鐗规晥绾﹀畾鎸傝浇璁剧疆鎾斁鏃堕暱鑴氭湰
+// unity鐗规晥棰勫埗浣撴槸鐗规晥甯堝湪鍒朵綔鐨勬椂鍊欑敓鎴愮殑锛寀nity鐗规晥蹇呴』鎸傝浇璁剧疆鎾斁鏃堕暱鑴氭湰 EffectTime
// spine鐗规晥鏄壒鏁堝笀鍒朵綔鐨勫姩鐢绘枃浠跺彲鐩存帴鍔犺浇鐢紝鍒朵綔鎴愰鍒朵綋鍙鍔燘oneFollower涔嬬被鐨勮繘琛岄�昏緫澶勭悊
// 闈濽I鐗规晥浣跨敤锛孶I鐗规晥UIEffectPlayer缁ф壙EffectPlayer锛屽悗缁鏋滈�昏緫鍐茬獊澶у垯涓嶇敤缁ф壙
public class EffectPlayer : MonoBehaviour
@@ -38,7 +38,7 @@
-
+
[Header("鎾斁瀹屾瘯绔嬪嵆鍥炴敹")]
public bool isReleaseImmediately = true; //鐣岄潰鐗规晥涓�鑸笉闇�瑕佽嚜鎴戦攢姣侊紝璺熼殢鐣岄潰鎴栬�呯埗瀵硅薄閿�姣佸氨琛�
@@ -81,7 +81,7 @@
effectConfig = null;
#if UNITY_EDITOR
if (showLog)
- {
+ {
Debug.LogError("EffectPlayer effectId is not set");
UnityEditor.Selection.activeGameObject = gameObject;
UnityEditor.EditorGUIUtility.PingObject(gameObject);
@@ -189,7 +189,7 @@
}
protected virtual void PlayerEffect(bool playSpine)
- {
+ {
var effectPrefab = ResManager.Instance.LoadAsset<GameObject>("UIEffect/" + effectConfig.packageName, effectConfig.fxName);
if (effectPrefab == null)
{
@@ -268,8 +268,8 @@
protected virtual void OnSpineAnimationComplete(Spine.TrackEntry trackEntry)
{
if (isReleaseImmediately)
- {
- spineComp.enabled = false;
+ {
+ spineComp.enabled = false;
Stop();
}
}
@@ -423,6 +423,6 @@
return;
}
}
-
+
}
diff --git a/Main/Component/UI/Effect/UIEffectPlayer.cs b/Main/Component/UI/Effect/UIEffectPlayer.cs
index 2ac83c0..3de63e7 100644
--- a/Main/Component/UI/Effect/UIEffectPlayer.cs
+++ b/Main/Component/UI/Effect/UIEffectPlayer.cs
@@ -82,7 +82,7 @@
if (spineComp.skeletonDataAsset == null)
{
//LoadAsset 宸茬粡鏈夌紦瀛楽keletonDataAsset
- spineComp.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/" + effectConfig.packageName, effectConfig.fxName + "_SkeletonData");
+ spineComp.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/" + effectConfig.packageName, effectConfig.fxName);
spineComp.raycastTarget = false;
spineComp.Initialize(true);
spineAnimationState = spineComp.AnimationState;
diff --git a/Main/Config/Configs/HeroConfig.cs b/Main/Config/Configs/HeroConfig.cs
index 9a6d2f6..15f6b50 100644
--- a/Main/Config/Configs/HeroConfig.cs
+++ b/Main/Config/Configs/HeroConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�7鏈�26鏃�
+// [ Date ]: 2025骞�7鏈�29鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -15,6 +15,7 @@
public string Name;
public int Country;
public int Quality;
+ public int AtkDistType;
public int Class;
public int[] SkinIDList;
public int AtkSkillID;
@@ -44,15 +45,17 @@
int.TryParse(tables[3],out Quality);
- int.TryParse(tables[4],out Class);
+ int.TryParse(tables[4],out AtkDistType);
- if (tables[5].Contains("["))
+ int.TryParse(tables[5],out Class);
+
+ if (tables[6].Contains("["))
{
- SkinIDList = JsonMapper.ToObject<int[]>(tables[5]);
+ SkinIDList = JsonMapper.ToObject<int[]>(tables[6]);
}
else
{
- string[] SkinIDListStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] SkinIDListStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
SkinIDList = new int[SkinIDListStringArray.Length];
for (int i=0;i<SkinIDListStringArray.Length;i++)
{
@@ -60,25 +63,25 @@
}
}
- int.TryParse(tables[6],out AtkSkillID);
+ int.TryParse(tables[7],out AtkSkillID);
- int.TryParse(tables[7],out AngerSkillID);
+ int.TryParse(tables[8],out AngerSkillID);
- int.TryParse(tables[8],out AtkInheritPer);
+ int.TryParse(tables[9],out AtkInheritPer);
- int.TryParse(tables[9],out DefInheritPer);
+ int.TryParse(tables[10],out DefInheritPer);
- int.TryParse(tables[10],out HPInheritPer);
+ int.TryParse(tables[11],out HPInheritPer);
- BatAttrDict = tables[11];
+ BatAttrDict = tables[12];
- if (tables[12].Contains("["))
+ if (tables[13].Contains("["))
{
- FetterIDList = JsonMapper.ToObject<int[]>(tables[12]);
+ FetterIDList = JsonMapper.ToObject<int[]>(tables[13]);
}
else
{
- string[] FetterIDListStringArray = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] FetterIDListStringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
FetterIDList = new int[FetterIDListStringArray.Length];
for (int i=0;i<FetterIDListStringArray.Length;i++)
{
@@ -86,7 +89,7 @@
}
}
- float.TryParse(tables[13],out UIScale);
+ float.TryParse(tables[14],out UIScale);
}
catch (Exception exception)
{
diff --git a/Main/Config/Configs/TreeLVConfig.cs b/Main/Config/Configs/TreeLVConfig.cs
index b0b246c..75d7faf 100644
--- a/Main/Config/Configs/TreeLVConfig.cs
+++ b/Main/Config/Configs/TreeLVConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�7鏈�26鏃�
+// [ Date ]: 2025骞�7鏈�29鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -15,7 +15,6 @@
public int LVUPNeedMoney;
public int LVUPNeedTime;
public int[] EquipColorRateList;
- public string ExAwardItemRateList;
public override int LoadKey(string _key)
{
@@ -46,8 +45,6 @@
int.TryParse(EquipColorRateListStringArray[i],out EquipColorRateList[i]);
}
}
-
- ExAwardItemRateList = tables[4];
}
catch (Exception exception)
{
diff --git a/Main/System/Hero/UIHeroController.cs b/Main/System/Hero/UIHeroController.cs
index 1b25862..0ed25fe 100644
--- a/Main/System/Hero/UIHeroController.cs
+++ b/Main/System/Hero/UIHeroController.cs
@@ -44,7 +44,7 @@
skeletonGraphic = instanceGO.GetComponentInChildren<SkeletonGraphic>(true);
var skinConfig = HeroSkinConfig.Get(skinID);
- skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("Hero/SpineRes/", skinConfig.SpineRes + "_SkeletonData");
+ skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("Hero/SpineRes/", skinConfig.SpineRes);
skeletonGraphic.Initialize(true);
this.transform.localScale = Vector3.one * scale;
spineAnimationState = skeletonGraphic.AnimationState;
--
Gitblit v1.8.0