From 54fad068f41ba7b0d2f16699a3f774be2a0d84e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 二月 2019 12:02:50 +0800
Subject: [PATCH] 3335 配置表读取重构。
---
Assets/Editor/Actor/ModelResourcesBuilder.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Assets/Editor/Actor/ModelResourcesBuilder.cs b/Assets/Editor/Actor/ModelResourcesBuilder.cs
index a88ca8a..00ea869 100644
--- a/Assets/Editor/Actor/ModelResourcesBuilder.cs
+++ b/Assets/Editor/Actor/ModelResourcesBuilder.cs
@@ -1,4 +1,4 @@
-锘縰sing TableConfig;
+锘�
using UnityEngine;
using UnityEditor;
@@ -6,7 +6,7 @@
{
public void BuildModelRes(int id, bool isHighMesh = false)
{
- ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
+ ModelResConfig _modelRes = ModelResConfig.Get(id);
if (_modelRes == null)
{
Debug.LogWarningFormat("瑕佺敓鎴愮殑ModelRes璧勬簮id: {0} 骞朵笉瀛樺湪浜庨厤缃〃涓�, 璇风‘璁ゆ槸鍚﹀～鍐欐湁閿�.", id);
@@ -78,7 +78,7 @@
return;
}
- ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
+ ModelResConfig _modelRes = ModelResConfig.Get(id);
string _path = _modelRes.ResourcesName;
string _resName = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
@@ -87,10 +87,13 @@
_path = _path.Substring(0, _modelRes.ResourcesName.IndexOf('/'));
}
- HandleMaterial(_path, _resName, _modelRes.Material_Fight_Normal);
- HandleMaterial(_path, _resName, _modelRes.Material_UI_Normal);
- HandleMaterial(_path, _resName, _modelRes.Material_Fight_Suit);
- HandleMaterial(_path, _resName, _modelRes.Material_UI_Suit);
+ if (suffix.Equals(InstanceResourcesLoader.raceSuffix))
+ {
+ HandleMaterial(_path, _resName, _modelRes.Material_Fight_Normal);
+ HandleMaterial(_path, _resName, _modelRes.Material_UI_Normal);
+ HandleMaterial(_path, _resName, _modelRes.Material_Fight_Suit);
+ HandleMaterial(_path, _resName, _modelRes.Material_UI_Suit);
+ }
BuildPrefab(_path, _resName, suffix, null, isHighMesh);
}
@@ -120,7 +123,7 @@
return;
}
- ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
+ ModelResConfig _modelRes = ModelResConfig.Get(id);
string _path = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
{
@@ -137,7 +140,7 @@
return;
}
- ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
+ ModelResConfig _modelRes = ModelResConfig.Get(id);
string _path = _modelRes.ResourcesName;
if (_path.IndexOf('/') != -1)
{
@@ -154,6 +157,8 @@
protected override void OnSetupRenderer(string path, string resName, ref Renderer renderer)
{//Assets/ART/Role/A_Zs_Sb/Materials/A_Zs05_Sb.mat
+ string _originalPath = path;
+
if (path.EndsWith("_Sb"))
{
path = path.Replace("_Sb", "");
@@ -169,7 +174,7 @@
// 璁剧疆涓轰笉鎺ュ彈闃村奖
renderer.receiveShadows = false;
- if (resName.Contains("A_Zs") || resName.Contains("A_Fs"))
+ if (_originalPath.Equals("A_Zs") || _originalPath.Equals("A_Fs"))
{
renderer.material = renderer.sharedMaterial = null;
renderer.materials = renderer.sharedMaterials = new Material[0];
--
Gitblit v1.8.0