Bugfix/master

2025-07-24 09:38:08 +00:00
parent 6937a2d6e8
commit 14affc5c6e
322 changed files with 61050 additions and 14851 deletions
@@ -0,0 +1,29 @@
+%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}
+<<<<<<<< HEAD:Assets/ScriptableObjects/SceneSO/Prologue.asset
+  m_Name: Prologue
+  m_EditorClassIdentifier: 
+  nextScene: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
+  yarnProject: {fileID: 7545569452688597077, guid: 7943305f9752fa74eb451f477f323e21, type: 3}
+  firstSceneName: OpenFixScene
+  isEndOfDay: 0
+  nameToPlayer: "\u5E8F\u7AE0"
+========
+  m_Name: HuoshanDay1
+  m_EditorClassIdentifier: 
+  nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
+  yarnProject: {fileID: 7545569452688597077, guid: 5b30d815fe3ef1d4aa1af835b6801fd4, type: 3}
+  firstSceneName: HuoShanFixScene
+  isEndOfDay: 0
+  nameToPlayer: "\u7B2C\u4E8C\u5929\u4E0A\u5348\u706B\u5C71"
+>>>>>>>> develop:Assets/ScriptableObjects/SceneSO/HuoshanDay1.asset
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9314e7bc5b932c41b8cd00507d7ac19
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -10,6 +10,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
+<<<<<<<< HEAD:Assets/ScriptableObjects/SceneSO/Prologue.asset
  m_Name: Prologue
  m_EditorClassIdentifier: 
  nextScene: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
@@ -17,3 +18,12 @@ MonoBehaviour:
  firstSceneName: OpenFixScene
  isEndOfDay: 0
  nameToPlayer: "\u5E8F\u7AE0"
+========
+  m_Name: HuoshanDay1
+  m_EditorClassIdentifier: 
+  nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
+  yarnProject: {fileID: 7545569452688597077, guid: 5b30d815fe3ef1d4aa1af835b6801fd4, type: 3}
+  firstSceneName: HuoShanFixScene
+  isEndOfDay: 0
+  nameToPlayer: "\u7B2C\u4E8C\u5929\u4E0A\u5348\u706B\u5C71"
+>>>>>>>> develop:Assets/ScriptableObjects/SceneSO/HuoshanDay1.asset
@@ -10,10 +10,17 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
+<<<<<<<< HEAD:Assets/ScriptableObjects/SceneSO/Prologue_begin.asset
  m_Name: Prologue_begin
  m_EditorClassIdentifier: 
  nextScene: {fileID: 11400000, guid: 2f763a2c04ecafb4981379b7363f9791, type: 2}
  yarnProject: {fileID: 7545569452688597077, guid: ab71ff7b298372f48a262ad5b949c395, type: 3}
+========
+  m_Name: Prologue
+  m_EditorClassIdentifier: 
+  nextScene: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
+  yarnProject: {fileID: 7545569452688597077, guid: 7943305f9752fa74eb451f477f323e21, type: 3}
+>>>>>>>> develop:Assets/ScriptableObjects/SceneSO/Prologue.asset
  firstSceneName: OpenFixScene
  isEndOfDay: 0
  nameToPlayer: "\u5E8F\u7AE0"
@@ -13,7 +13,7 @@ MonoBehaviour:
  m_Name: TestSO
  m_EditorClassIdentifier: 
  nextScene: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
-  yarnProject: {fileID: 7545569452688597077, guid: 9c6e0818864e6964d83f946e81e32916, type: 3}
-  firstSceneName: ExpressFixScene
+  yarnProject: {fileID: 7545569452688597077, guid: b81ce7d02242fc74daf531067098286f, type: 3}
+  firstSceneName: YingliFixScene
  isEndOfDay: 1
  nameToPlayer: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c3b3523474fe2e548907d3985509ee01
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,31 @@
+%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: 75a50c7f91b54e07857c2b21e2e843c9, type: 3}
+  m_Name: LevelTest
+  m_EditorClassIdentifier: 
+  nodes:
+  - command: 0
+    moduleName: Memory
+    flickerTime: 3
+    lightOnTime: 5
+  - command: 0
+    moduleName: Eye
+    flickerTime: 3
+    lightOnTime: 5
+  - command: 0
+    moduleName: Logic
+    flickerTime: 3
+    lightOnTime: 5
+  - command: 0
+    moduleName: Speak
+    flickerTime: 3
+    lightOnTime: 5
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4d0ebc436e03019448bb94173f1ebc8e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: