From efa5f8d07fc3321f6ac5f5d97fb422db28d0886f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 05 三月 2019 10:55:31 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs b/Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs
index 0eee7dd..4a573e3 100644
--- a/Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs
+++ b/Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs
@@ -71,7 +71,23 @@
int _count = br.ReadInt32();
for (int i = 0; i < _count; ++i)
{
- var _go = new GameObject();
+ var _resName = br.ReadString();
+ GameObject _go = null;
+
+ if (!string.IsNullOrEmpty(_resName.Trim()))
+ {
+ string _path = "Assets/ResourcesOut/Mob/Prefab_Race_" + _resName + ".prefab";
+ _go = AssetDatabase.LoadAssetAtPath<GameObject>(_path);
+ if (_go)
+ {
+ _go = Instantiate(_go);
+ }
+ }
+ else
+ {
+ _go = GameObject.CreatePrimitive(PrimitiveType.Capsule);
+ }
+
_go.transform.SetParent(transform);
_go.transform.localPosition = Vector3.zero;
_go.transform.eulerAngles = Vector3.zero;
@@ -171,10 +187,10 @@
for (int i = monsterList.Count - 1; i >= 0; --i)
{
EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
- EditorGUILayout.LabelField("NPCID", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(50));
- EditorGUILayout.LabelField(monsterList[i].npcID.ToString(), guiSkin.textField, GUILayout.Height(20));
- EditorGUILayout.LabelField("妯″瀷鍚�", guiSkin.customStyles[0], GUILayout.Height(22), GUILayout.Width(50));
- EditorGUILayout.LabelField(monsterList[i].resName, guiSkin.textField, GUILayout.Height(22), GUILayout.Width(70));
+ EditorGUILayout.LabelField("NPCID", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(50));
+ EditorGUILayout.LabelField(monsterList[i].npcID.ToString(), guiSkin.textField, GUILayout.Height(20), GUILayout.Width(70));
+ EditorGUILayout.LabelField("妯″瀷鍚�", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(50));
+ EditorGUILayout.LabelField(monsterList[i].resName, guiSkin.textField, GUILayout.Height(20), GUILayout.Width(70));
if (GUILayout.Button("瀹氶珮", guiSkin.button, GUILayout.Width(60), GUILayout.Height(20)))
{
Vector3 _pos = monsterList[i].transform.position;
--
Gitblit v1.8.0