From 7eb9351d905ddf6316fd6b177fff967fbac6fc94 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 25 Apr 2022 10:19:09 +0800
Subject: * rename decoration to item

---
 .../Assets/Scripts/Managers/PlayerManager.cs       |  4 ++--
 .../Scripts/Managers/PlayerManager_Decorations.cs  | 26 ----------------------
 .../Managers/PlayerManager_Decorations.cs.meta     | 11 ---------
 .../Assets/Scripts/Managers/PlayerManager_Items.cs | 26 ++++++++++++++++++++++
 .../Scripts/Managers/PlayerManager_Items.cs.meta   | 11 +++++++++
 5 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
 delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta
 create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs
 create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta

(limited to 'SurvivalTest/Assets/Scripts/Managers')

diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
index ce27739..9bb3f87 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs
@@ -12,7 +12,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 	{
 		InitProps();
 		InitWeapons();
-		InitDecorations();
+		InitItems();
 	}
 
 	public void Update()
@@ -21,7 +21,7 @@ public partial class PlayerManager : Singleton<PlayerManager>
 
 		UpdateProps();
 		UpdateWeapons();
-		UpdateDecorations();
+		UpdateItems();
 	}
 
 	public void SetCrew(CrewScript crew)
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
deleted file mode 100644
index ea4ba78..0000000
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-public partial class PlayerManager : Singleton<PlayerManager>
-{
-	// 当前饰品
-	public List<DecorationBase> decorations { get { return m_Decorations; } }
-	private List<DecorationBase> m_Decorations = new List<DecorationBase>();
-
-
-	void InitDecorations()
-	{
-		m_Decorations.Add(new Decoration_MystreyMask());
-		m_Decorations.Add(new Decoration_PowerRing());
-		m_Decorations.Add(new Decoration_Horn());
-		m_Decorations.Add(new Decoration_Battery());
-		m_Decorations.Add(new Decoration_SwordSpectrum());
-	}
-
-	void UpdateDecorations()
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta
deleted file mode 100644
index 3cc2dc3..0000000
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6f2b538b1ec21a548b41fe478e5b3bd3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs
new file mode 100644
index 0000000..6ee4969
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public partial class PlayerManager : Singleton<PlayerManager>
+{
+	// 当前饰品
+	public List<ItemBase> items { get { return m_Items; } }
+	private List<ItemBase> m_Items = new List<ItemBase>();
+
+
+	void InitItems()
+	{
+		m_Items.Add(new Item_MystreyMask());
+		m_Items.Add(new Item_PowerRing());
+		m_Items.Add(new Item_Horn());
+		m_Items.Add(new Item_Battery());
+		m_Items.Add(new Item_SwordSpectrum());
+	}
+
+	void UpdateItems()
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta
new file mode 100644
index 0000000..c0307e5
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b31f1faa8e2c6a4085213ca15e56220
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0