From 2e5e5a258101f7928ac83e2f0cc3e52675d35632 Mon Sep 17 00:00:00 2001
From: Iced-lemon <wsb6151i@gmail.com>
Date: Fri, 27 Jan 2023 23:31:21 +0800
Subject: [PATCH] merge branch

---
 Assets/Art.meta                             | 8 ++++++++
 Assets/Art/GameFinalArt.meta                | 8 ++++++++
 Assets/Art/GenericArtAssets.meta            | 8 ++++++++
 Assets/Art/Placeholders.meta                | 8 ++++++++
 Assets/ScriptableObjects.meta               | 8 ++++++++
 Assets/Scripts/EntityScripts.meta           | 8 ++++++++
 Assets/Scripts/GameManagerScripts.meta      | 8 ++++++++
 Assets/Scripts/ScriptableObjectScripts.meta | 8 ++++++++
 Assets/Scripts/UiScripts.meta               | 8 ++++++++
 9 files changed, 72 insertions(+)
 create mode 100644 Assets/Art.meta
 create mode 100644 Assets/Art/GameFinalArt.meta
 create mode 100644 Assets/Art/GenericArtAssets.meta
 create mode 100644 Assets/Art/Placeholders.meta
 create mode 100644 Assets/ScriptableObjects.meta
 create mode 100644 Assets/Scripts/EntityScripts.meta
 create mode 100644 Assets/Scripts/GameManagerScripts.meta
 create mode 100644 Assets/Scripts/ScriptableObjectScripts.meta
 create mode 100644 Assets/Scripts/UiScripts.meta

diff --git a/Assets/Art.meta b/Assets/Art.meta
new file mode 100644
index 0000000..2289970
--- /dev/null
+++ b/Assets/Art.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c3256d7fa85ac9488ad5926ec428a45
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/GameFinalArt.meta b/Assets/Art/GameFinalArt.meta
new file mode 100644
index 0000000..5c9e03b
--- /dev/null
+++ b/Assets/Art/GameFinalArt.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c107a4659f9e88f4aa1410e6cd208835
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/GenericArtAssets.meta b/Assets/Art/GenericArtAssets.meta
new file mode 100644
index 0000000..5470da1
--- /dev/null
+++ b/Assets/Art/GenericArtAssets.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5a1671f2bf6f9341b8ec7fc994dcc9e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Placeholders.meta b/Assets/Art/Placeholders.meta
new file mode 100644
index 0000000..b6058fc
--- /dev/null
+++ b/Assets/Art/Placeholders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a9e670155cf9e07458e22d2649a8e75e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ScriptableObjects.meta b/Assets/ScriptableObjects.meta
new file mode 100644
index 0000000..42c8dcd
--- /dev/null
+++ b/Assets/ScriptableObjects.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 295ac802c88cd48448df9ecb56c7fb04
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/EntityScripts.meta b/Assets/Scripts/EntityScripts.meta
new file mode 100644
index 0000000..f410147
--- /dev/null
+++ b/Assets/Scripts/EntityScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb26112da6fce9c4ca2610cb953c66e6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/GameManagerScripts.meta b/Assets/Scripts/GameManagerScripts.meta
new file mode 100644
index 0000000..94c2b87
--- /dev/null
+++ b/Assets/Scripts/GameManagerScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7bdec22f29afa8245899160b77f09c8f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/ScriptableObjectScripts.meta b/Assets/Scripts/ScriptableObjectScripts.meta
new file mode 100644
index 0000000..d95b53f
--- /dev/null
+++ b/Assets/Scripts/ScriptableObjectScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e8e3cbd1de7025044a7a92113d6e88f0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/UiScripts.meta b/Assets/Scripts/UiScripts.meta
new file mode 100644
index 0000000..33e0776
--- /dev/null
+++ b/Assets/Scripts/UiScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bf45ed03d77ae9144849c5d0c914a13d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: