From 8d091973c54984aee1917ef9d436f05abfe5ef77 Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期二, 07 八月 2018 14:18:22 +0800
Subject: [PATCH] 初始化版本库
---
Assets/Resources/ScriptableObject/Curves/Grade2.asset | 2 +-
Assets/Scripts | 2 +-
/dev/null | 9 ---------
Assets/Resources/ScriptableObject/Curves/Linear1.asset | 2 +-
Assets/ResourcesOut | 2 +-
Assets/Resources/ScriptableObject/Curves/Grade1.asset | 2 +-
6 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Curves/Grade1.asset b/Assets/Resources/ScriptableObject/Curves/Grade1.asset
index 4d3efa4..163f0db 100644
--- a/Assets/Resources/ScriptableObject/Curves/Grade1.asset
+++ b/Assets/Resources/ScriptableObject/Curves/Grade1.asset
@@ -9,7 +9,7 @@
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e8751910f36c154898b3bca27c09d8b, type: 3}
- m_Name: EaseInOut 1
+ m_Name: Grade1
m_EditorClassIdentifier:
curve:
serializedVersion: 2
diff --git a/Assets/Resources/ScriptableObject/Curves/Grade2.asset b/Assets/Resources/ScriptableObject/Curves/Grade2.asset
index 4d3efa4..9f3848f 100644
--- a/Assets/Resources/ScriptableObject/Curves/Grade2.asset
+++ b/Assets/Resources/ScriptableObject/Curves/Grade2.asset
@@ -9,7 +9,7 @@
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e8751910f36c154898b3bca27c09d8b, type: 3}
- m_Name: EaseInOut 1
+ m_Name: Grade2
m_EditorClassIdentifier:
curve:
serializedVersion: 2
diff --git a/Assets/Resources/ScriptableObject/Curves/Linear1.asset b/Assets/Resources/ScriptableObject/Curves/Linear1.asset
index f581661..84f881b 100644
--- a/Assets/Resources/ScriptableObject/Curves/Linear1.asset
+++ b/Assets/Resources/ScriptableObject/Curves/Linear1.asset
@@ -9,7 +9,7 @@
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e8751910f36c154898b3bca27c09d8b, type: 3}
- m_Name: Linear 1
+ m_Name: Linear1
m_EditorClassIdentifier:
curve:
serializedVersion: 2
diff --git a/Assets/ResourcesOut b/Assets/ResourcesOut
index d62827f..ebbd070 160000
--- a/Assets/ResourcesOut
+++ b/Assets/ResourcesOut
@@ -1 +1 @@
-Subproject commit d62827f4bf1f1ce610c90fc5601745bf2da4333d
+Subproject commit ebbd070cd3d5896f254f5a698ea019465222caa1
diff --git a/Assets/Scripts b/Assets/Scripts
index 28a16bc..ce711bb 160000
--- a/Assets/Scripts
+++ b/Assets/Scripts
@@ -1 +1 @@
-Subproject commit 28a16bc08b937f12031c1f4af0da4ac924fbc212
+Subproject commit ce711bb116513c4aea2520cc160296353bfc1e6a
diff --git a/Assets/XLua.meta b/Assets/XLua.meta
deleted file mode 100644
index 42a39ad..0000000
--- a/Assets/XLua.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6d2d240998b7a9a44b7402136c946623
-folderAsset: yes
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/XLua/Resources.meta b/Assets/XLua/Resources.meta
deleted file mode 100644
index 855af1a..0000000
--- a/Assets/XLua/Resources.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: fa4f7e825d6ae9742bd6f88af5865c13
-folderAsset: yes
-timeCreated: 1458812833
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0