Merge branch 'develop' into feature/yingli
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
%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: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
|
||||
m_Name: ClinicOut Bottom Style
|
||||
m_EditorClassIdentifier:
|
||||
imageColor: {r: 1, g: 1, b: 1, a: 0.8235294}
|
||||
bubblePadding: {x: 20, y: 30, z: 20, w: 20}
|
||||
linePadding: {x: 30, y: 10, z: 20, w: 10}
|
||||
lineFontSize: 30
|
||||
actorPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
actorFontSize: 32
|
||||
hasActorName: 1
|
||||
bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846"
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d1ba582ada403b949afb9e15ee58d39a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: Day1_night
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 29ebe788cfe2c084e88ffdd8e2f93378, type: 3}
|
||||
nextScene: {fileID: 11400000, guid: f9314e7bc5b932c41b8cd00507d7ac19, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: f8eb0bd7a298df84bb70093f3136bbce, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u4E00\u5929\u665A\u4E0A\u4F11\u606F"
|
||||
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: Day2_mid
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 25f49957c68bca34bb1aeafec7feca8b, type: 3}
|
||||
nextScene: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 7732315fc677ee84a8738148b84736a4, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u7B2C\u4E8C\u5929\u4E2D\u5348\u4F11\u606F"
|
||||
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: Day2_night
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: ec06c945cb99fb544b1dd9a2a6ea9a7b, type: 3}
|
||||
nextScene: {fileID: 11400000, guid: 88a36517b0171bb4a9e511d04b5ab8e8, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 7049c34e0c6d91c4480d6f95ed62cfcd, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u4E8C\u5929\u665A\u4E0A\u4F11\u606F"
|
||||
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: Day3_mid
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 0}
|
||||
nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 640f90d7758f6524f8735352da531604, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u56DB\u5929\u4E2D\u5348\u4F11\u606F"
|
||||
nameToPlayer: "\u7B2C\u4E09\u5929\u4E2D\u5348\u4F11\u606F"
|
||||
|
||||
@@ -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: Day3_night
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 640f90d7758f6524f8735352da531604, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u4E09\u5929\u4E2D\u5348\u4F11\u606F"
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fcab4f6d924eb53499baa9b741004cc5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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: Day4_mid
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: 362a7dfb573114247a33c0e290b698eb, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: fceb65c69f946c740992b742bc01a6a2, type: 3}
|
||||
firstSceneName: ClinicOut
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u7B2C\u56DB\u5929\u4E2D\u5348\u4F11\u606F"
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bcac8c33c2fba50439fd0b0275a94e83
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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: GeneralEnd
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 0}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: e6bac2644a8a04b4899ce2fe8ae1f4fc, type: 3}
|
||||
firstSceneName: SubWay
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u6D4B\u8BD5\u7ED3\u5C3E"
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 362a7dfb573114247a33c0e290b698eb
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -16,4 +16,4 @@ MonoBehaviour:
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 5b30d815fe3ef1d4aa1af835b6801fd4, type: 3}
|
||||
firstSceneName: HuoShanFixScene
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u7B2C\u4E8C\u5929\u4E0A\u5348\u706B\u5C71"
|
||||
nameToPlayer: "\u706B\u5C71\u521D\u8BCA"
|
||||
|
||||
@@ -16,4 +16,4 @@ MonoBehaviour:
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 26fc6619bbcda734a81361b8bb615f04, type: 3}
|
||||
firstSceneName: PeipeiFixScene
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u4E00\u5929\u4E0A\u5348\u4F69\u4F69"
|
||||
nameToPlayer: "\u4F69\u4F69\u521D\u8BCA"
|
||||
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: PeipeiDay2
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
|
||||
nextScene: {fileID: 11400000, guid: bcac8c33c2fba50439fd0b0275a94e83, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 247e2ccd847942843bb87841bb9888c5, type: 3}
|
||||
firstSceneName: PeipeiFixScene
|
||||
isEndOfDay: 1
|
||||
nameToPlayer: "\u7B2C\u4E8C\u5929\u4E0B\u5348\u4F69\u4F69"
|
||||
nameToPlayer: "\u4F69\u4F69\u590D\u8BCA"
|
||||
|
||||
@@ -16,4 +16,4 @@ MonoBehaviour:
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 9c6e0818864e6964d83f946e81e32916, type: 3}
|
||||
firstSceneName: ExpressFixScene
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u7B2C\u4E00\u5929\u4E0B\u5348\u77F3\u5934"
|
||||
nameToPlayer: "\u77F3\u5934\u521D\u8BCA"
|
||||
|
||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
|
||||
m_Name: StoneDay2
|
||||
m_EditorClassIdentifier:
|
||||
nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
|
||||
nextScene: {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: fa8082420f7bb5b4a8ab33a59c70bcc9, type: 3}
|
||||
firstSceneName: ExpressFixScene
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u7B2C\u4E8C\u5929\u4E0A\u5348\u77F3\u5934"
|
||||
nameToPlayer: "\u77F3\u5934\u590D\u8BCA"
|
||||
|
||||
@@ -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: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
|
||||
yarnProject: {fileID: 7545569452688597077, guid: 3bb399faf6caadd4c89f85b7aa83c388, type: 3}
|
||||
firstSceneName: YingliFixScene
|
||||
isEndOfDay: 0
|
||||
nameToPlayer: "\u82F1\u7406\u521D\u8BCA"
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 88a36517b0171bb4a9e511d04b5ab8e8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user