Merge branch 'develop' into feature/yingli1fic

2025-07-24 16:34:14 +08:00
parent 93eef68beb 7eda71e153
commit 9bd67dfa86
54 changed files with 15999 additions and 3647 deletions
@@ -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: