diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 55746beab..1eab44ea8 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -477,19 +477,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.0048309183 - - 0.016401261 - - 0.04532712 - - 0.08293076 - - 0.12053438 - - 0.14946026 - - 0.1610306 - - 0.14946026 - - 0.12053438 - - 0.08293076 - - 0.04532712 - - 0.016401261 - - 0.0048309183 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6101378415725230565 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Yarn/Fiction_Yingli1.meta b/Assets/Resources/Yarn/Fiction_Yingli1.meta new file mode 100644 index 000000000..6728fd03e --- /dev/null +++ b/Assets/Resources/Yarn/Fiction_Yingli1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa2a6ae298113f14dafcfbdf8c32f019 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/EventNode.yarn.meta b/Assets/Resources/Yarn/Fiction_Yingli1/EventNode.yarn.meta index 2daf096fd..3ffdfb0a1 100644 --- a/Assets/Resources/Yarn/Fiction_Yingli1/EventNode.yarn.meta +++ b/Assets/Resources/Yarn/Fiction_Yingli1/EventNode.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ead6babfee84f7e4e92e2f034f611e9a +guid: b64ec76b944edab4b8e27e891e233681 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.meta rename to Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarn.meta index eeebbb2ca..b1d72a2cf 100644 --- a/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.meta +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a03dedbf18b82f488f239baeb2abc18 +guid: 43ecf3029082f7046a90480a7e8f6abd ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarnproject.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarnproject.meta index 6a8ed2eb2..96c279601 100644 --- a/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarnproject.meta +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Fiction_Yingli1.yarnproject.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b30d815fe3ef1d4aa1af835b6801fd4 +guid: 3bb399faf6caadd4c89f85b7aa83c388 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Stage1_开头对话.yarn.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Stage1_开头对话.yarn.meta new file mode 100644 index 000000000..aafc19c6e --- /dev/null +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Stage1_开头对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbfa59c93c38e914598abc03588310f1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn b/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn index f8db110f5..cac5989bb 100644 --- a/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn @@ -273,6 +273,6 @@ me: 好了…除了你说不要动的模块,都检查过了。 me: 总的来说,你没有什么关键的症状,但是小问题不少。尤其是…… yl: 知道了。这些都不需要你处理。 me: …那你让我检查是几个意思? -yl: 这只是对你基本能力的一个考验罢了。 +yl: 我需要对你的基本能力做一个检验罢了。 yl: 只有确认你有基本的能力,我才能接下来要做的事情才是真正的 === \ No newline at end of file diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn.meta index 84ad034f7..63d398006 100644 --- a/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn.meta +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Stage2_检查.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64d6a56f2dfa1bd49b160f47dac4da3d +guid: 960e5b41ca1da1b498a9e8e6d18df9e8 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Stage3_中间对话.yarn.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Stage3_中间对话.yarn.meta new file mode 100644 index 000000000..48a2f3135 --- /dev/null +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Stage3_中间对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5b4a9e58b69b86d4986ac646f93c0383 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Fiction_Yingli1/Stage5_结束对话.yarn.meta b/Assets/Resources/Yarn/Fiction_Yingli1/Stage5_结束对话.yarn.meta new file mode 100644 index 000000000..1320406da --- /dev/null +++ b/Assets/Resources/Yarn/Fiction_Yingli1/Stage5_结束对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8bb28e1d17ce8a74194379fb2f7dc64a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/ScriptableObjects/SceneSO/YingliDay1.asset b/Assets/ScriptableObjects/SceneSO/YingliDay1.asset new file mode 100644 index 000000000..a879335c2 --- /dev/null +++ b/Assets/ScriptableObjects/SceneSO/YingliDay1.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3} + m_Name: YingliDay1 + m_EditorClassIdentifier: + nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} + yarnProject: {fileID: 7545569452688597077, guid: 3bb399faf6caadd4c89f85b7aa83c388, type: 3} + firstSceneName: YingliFixScene + isEndOfDay: 0 + nameToPlayer: diff --git a/Assets/ScriptableObjects/SceneSO/YingliDay1.asset.meta b/Assets/ScriptableObjects/SceneSO/YingliDay1.asset.meta new file mode 100644 index 000000000..143f15b1d --- /dev/null +++ b/Assets/ScriptableObjects/SceneSO/YingliDay1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88a36517b0171bb4a9e511d04b5ab8e8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: