Merge branch '2.21.17.51优化' into 'develop'
各种修改 See merge request aibis-dream/aibis-dream!266
This commit is contained in:
@@ -250,7 +250,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
rotateDuration: 0.5
|
||||
typeSpeed: 0.01
|
||||
typeSpeed: 0.015
|
||||
title: {fileID: 3563212816421902004}
|
||||
text: {fileID: 4278472285296606170}
|
||||
screenImage: {fileID: 107892122242889724}
|
||||
|
||||
@@ -1053,15 +1053,19 @@ MonoBehaviour:
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
_filter:
|
||||
- 0.007228916
|
||||
- 0.043749984
|
||||
- 0.12409639
|
||||
- 0.20444278
|
||||
- 0.24096388
|
||||
- 0.20444278
|
||||
- 0.12409639
|
||||
- 0.043749984
|
||||
- 0.007228916
|
||||
- 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
|
||||
--- !u!114 &-6086986437317696584
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
|
||||
@@ -165,7 +165,7 @@ Material:
|
||||
- _DirectionalAlphaFadeNoiseFactor: 0.2
|
||||
- _DirectionalAlphaFadeRotation: 0
|
||||
- _DirectionalAlphaFadeWidth: 0.2
|
||||
- _DirectionalDistortionFade: -15
|
||||
- _DirectionalDistortionFade: 0
|
||||
- _DirectionalDistortionInvert: 1
|
||||
- _DirectionalDistortionNoiseFactor: 0.2
|
||||
- _DirectionalDistortionRandomDirection: 0.1
|
||||
|
||||
@@ -460,7 +460,7 @@ Material:
|
||||
- _ToggleUnscaledTime: 0
|
||||
- _UVDistortFade: 1
|
||||
- _UVDistortMaskToggle: 0
|
||||
- _UVRotateSpeed: 1
|
||||
- _UVRotateSpeed: 2
|
||||
- _VertexTintFirst: 0
|
||||
- _VibrateFade: 1
|
||||
- _VibrateFrequency: 100
|
||||
|
||||
@@ -194,7 +194,7 @@ Transform:
|
||||
m_GameObject: {fileID: 555303476111083303}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -3.73, y: 1.36, z: 0}
|
||||
m_LocalPosition: {x: -3.505, y: 1.36, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
||||
@@ -392,7 +392,7 @@ AnimationClip:
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: {x: -17.8645, y: 0, z: 0}
|
||||
value: {x: -18.930002, y: 0, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
@@ -582,7 +582,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: -17.8645
|
||||
value: -18.930002
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1096,7 +1096,7 @@ AnimationClip:
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: {x: -17.8645, y: 0, z: 0}
|
||||
value: {x: -18.930002, y: 0, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
@@ -1277,7 +1277,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: -17.8645
|
||||
value: -18.930002
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2880,7 +2880,7 @@ AnimationClip:
|
||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: {x: -17.8645, y: 0, z: 0}
|
||||
value: {x: -18.93, y: 0, z: 0}
|
||||
inSlope: {x: 0, y: 0, z: 0}
|
||||
outSlope: {x: 0, y: 0, z: 0}
|
||||
tangentMode: 0
|
||||
@@ -3061,7 +3061,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 6.5
|
||||
value: -17.8645
|
||||
value: -18.93
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
|
||||
@@ -28,9 +28,9 @@ me: 时候不早了…
|
||||
你看向窗外，窗外是密密麻麻的高楼大厦。
|
||||
你知道那里面住着数不尽的机体，像一座巨大的蜂巢。
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
<<NextYarn>>
|
||||
->结束一天
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
<<NextYarn>>
|
||||
|
||||
===
|
||||
@@ -4,7 +4,7 @@ colorID: 8
|
||||
position: 205,-53
|
||||
---
|
||||
<<hide_dialog>>
|
||||
<<set_time_of_day EnvironmentManager "night">>
|
||||
<<set_time_of_day EnvironmentManager "Midnight">>
|
||||
<<fade_in_actor ActorManager "佩佩" 0.1>>
|
||||
<<fade_out 1>>
|
||||
<<wait 1>>
|
||||
@@ -69,7 +69,7 @@ peipei: 一会…一会见。
|
||||
你目视她离开，吸完最后一口烟，长舒一口气。
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
->去地铁
|
||||
->回诊室
|
||||
<<hide_dialog>>
|
||||
<<fade_out_actor ActorManager "医生" 1>>
|
||||
<<wait 1>>
|
||||
|
||||
@@ -3,6 +3,7 @@ tags:
|
||||
color: 888888
|
||||
position: 0,0
|
||||
---
|
||||
<<play_clinic_cut>>
|
||||
<<fade_in 1>>
|
||||
<<switch_fix_system_to "BodyModule">>
|
||||
<<fade_out 1>>
|
||||
|
||||
@@ -8,8 +8,8 @@ position: 272,-1156
|
||||
<<set $eyeTargetTriggerCount=0>>
|
||||
<<set $isFinishedEyeCheck=false>>
|
||||
me: 还没结束…保险起见，我们进视觉复查一下吧。
|
||||
<<add_task TaskManager "检查视觉模块">>
|
||||
<<clear_tasks TaskManager>>
|
||||
<<add_task TaskManager "检查视觉模块">>
|
||||
<<task_moveIn TaskManager>>
|
||||
<<ModuleHightLight Eye true>>
|
||||
===
|
||||
@@ -35,6 +35,7 @@ me:这里应该已经彻底检查过了。
|
||||
<<wait 2>>
|
||||
peipei: 没了吗？..<br>没了吗……？
|
||||
me: 看起来没有……
|
||||
me: 我们再试一次吧。
|
||||
<<Set_MouseMovementLockState EyeManager false>>
|
||||
<<elseif $eyeTargetTriggerCount == 2>>
|
||||
<<hide_dialog>>
|
||||
|
||||
@@ -3,7 +3,8 @@ tags:
|
||||
colorID: 3
|
||||
position: 251,-1150
|
||||
---
|
||||
|
||||
<<switch_fix_system_to BodyModule>>
|
||||
<<fade_in 1>>
|
||||
<<switch_fix_system_to Clinic>>
|
||||
<<character_auto_blink>>
|
||||
<<character_fade_in_new>>
|
||||
|
||||
@@ -38,7 +38,7 @@ peipei: 啊！……这头痛…怎么也停不下来……
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 2>>
|
||||
<<character_pos 直立>>
|
||||
<<character_pos 佩佩背后别手>>
|
||||
<<character_face_new 闭眼>>
|
||||
<<wait 1>>
|
||||
|
||||
@@ -59,7 +59,7 @@ peipei: …你看这个。
|
||||
<<character_pos 画画动作>>
|
||||
<<character_face_new 闭眼>>
|
||||
<<wait 2>>
|
||||
<<character_pos 直立>>
|
||||
<<character_pos 佩佩背后别手>>
|
||||
<<character_face_new 不开心>>
|
||||
<<show_obj "佩佩day2UF之一">>
|
||||
<<wait 1>>
|
||||
@@ -80,7 +80,7 @@ peipei: 好痛…好痛……#auto_next
|
||||
<<character_pos 画画动作>>
|
||||
<<character_face_new 闭眼>>
|
||||
<<wait 2>>
|
||||
<<character_pos 直立>>
|
||||
<<character_pos 佩佩背后别手>>
|
||||
<<character_face_new 不开心>>
|
||||
<<show_obj "佩佩day2UF之二">>
|
||||
<<wait 1>>
|
||||
@@ -101,8 +101,8 @@ peipei: 这真是…痛得快睁不开眼睛了…#auto_next
|
||||
<<character_pos 画画动作>>
|
||||
<<character_face_new 闭眼>>
|
||||
<<wait 2>>
|
||||
<<character_pos 直立>>
|
||||
<<character_face_new 闭眼>>
|
||||
<<character_pos 佩佩背后别手>>
|
||||
<<character_face_new 不开心>>
|
||||
<<show_obj "佩佩day2UF之三">>
|
||||
<<wait 1>>
|
||||
|
||||
@@ -122,6 +122,7 @@ peipei: 医生…求求你，我不能没有UF……我必须修好它。
|
||||
me: 好吧…无论如何，先到治疗室来吧。
|
||||
|
||||
<<hide_dialog>>
|
||||
<<character_pos 佩佩背后别手>>
|
||||
|
||||
<<jump 结束引入对话>>
|
||||
===
|
||||
|
||||
@@ -3,9 +3,12 @@ tags:
|
||||
colorID: 3
|
||||
position: 322,-1030
|
||||
---
|
||||
<<play_clinic_cut>>
|
||||
<<fade_in 1>>
|
||||
<<switch_fix_system_to "BodyModule">>
|
||||
<<SetHeat 1>>
|
||||
<<add_task TaskManager "检查UF模块">>
|
||||
<<fade_out 1>>
|
||||
<<task_moveIn TaskManager>>
|
||||
===
|
||||
|
||||
|
||||
@@ -17,6 +17,21 @@ position: 251,-1150
|
||||
title: 结束BE结束谈话
|
||||
position: 275,-222
|
||||
---
|
||||
<<set $gameStage = "流程结束">>
|
||||
<<jump Center>>
|
||||
===
|
||||
<<jump BE外出>>
|
||||
// <<set $gameStage = "流程结束">>
|
||||
// <<jump Center>>
|
||||
===
|
||||
|
||||
|
||||
|
||||
title: BE外出
|
||||
tags:
|
||||
colorID: 8
|
||||
position: 205,-53
|
||||
---
|
||||
占位
|
||||
|
||||
===
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -64,6 +64,7 @@ me: 喂！
|
||||
title: 结束HE结束谈话
|
||||
position: 275,-222
|
||||
---
|
||||
<<set $gameStage = "流程结束">>
|
||||
<<jump Center>>
|
||||
<<NextYarn>>
|
||||
// <<set $gameStage = "流程结束">>
|
||||
// <<jump Center>>
|
||||
===
|
||||
@@ -4,7 +4,6 @@ colorID: 8
|
||||
position: 272,-1156
|
||||
---
|
||||
<<fade_in 1>>
|
||||
<<delete_line LineManager MemoryEye>>
|
||||
<<indoor_new 1>>
|
||||
<<switch_fix_system_to "Clinic">>
|
||||
//佩佩离开后的很长一段时间，我都没有再看到她。
|
||||
|
||||
@@ -3,6 +3,7 @@ tags:
|
||||
colorID: 8
|
||||
position: -449,-3574
|
||||
---
|
||||
<<play_clinic_cut>>
|
||||
<<fade_in 1>>
|
||||
<<switch_fix_system_to "BodyModule">>
|
||||
<<delete_line LineManager MemoryEye>>
|
||||
|
||||
@@ -40,6 +40,7 @@ me: ......
|
||||
me: ............
|
||||
<<hide_dialog>>
|
||||
<<wait 2>>
|
||||
<<hide_obj>>
|
||||
<<show_full_screen 3眼睛特写a>>
|
||||
<<wait 2>>
|
||||
me: 我…也有……眼睛。
|
||||
|
||||
@@ -16,7 +16,7 @@ peipei: 医生……
|
||||
<<switch_fix_system_to Clinic>>
|
||||
<<delete_line LineManager MemoryEye>>
|
||||
<<fade_out 1>>
|
||||
<<if $peipeiBE == false>>
|
||||
<<if $isPeipeiBE == false>>
|
||||
【占位】:佩佩惊喜地发现自己的色觉恢复
|
||||
【占位】:佩佩离开
|
||||
me: 等等…你还很虚弱。
|
||||
|
||||
@@ -112,97 +112,11 @@ colorID: 1
|
||||
<<jump 进入HE结束谈话>>
|
||||
<<endif>>
|
||||
<<if $gameStage == "流程结束">>
|
||||
//<<NextYarn>>
|
||||
<<jump 外出>>
|
||||
// //<<NextYarn>>
|
||||
// <<jump 外出>>
|
||||
<<endif>>
|
||||
===
|
||||
title: 外出
|
||||
tags:
|
||||
colorID: 8
|
||||
position: 205,-53
|
||||
---
|
||||
<<fade_in 1>>
|
||||
<<load_scene ClinicOut duration>>
|
||||
<<hide_dialog>>
|
||||
<<fade_out 1>>
|
||||
场景黑屏占位
|
||||
<<wait 1>>
|
||||
me: 佩佩...
|
||||
peipei: 下雪了！
|
||||
me: 居然跑到了天桥上
|
||||
->上天桥
|
||||
<<fade_in 1>>
|
||||
<<load_scene SkyBridge 1>>
|
||||
<<fade_out 1>>
|
||||
//你抬头看去，灰白色的天空中，除了树叶外，还飘落着一种细细的粉末，洒在你的手上。
|
||||
|
||||
peipei: 你看见了吗？医生！
|
||||
|
||||
她背对着你喊着你，头也不回地抬头看着天空。
|
||||
|
||||
你再次摸了摸自己的眼睛。尽管你明白这个结果，但你还没有习惯这种视觉。
|
||||
|
||||
me: 你不是要回去工作吗？
|
||||
|
||||
佩佩依然没有回头，还是痴痴地抬头到处看，树叶和雪花一同从她的面前飘落，洋洋洒洒。
|
||||
|
||||
你靠着墙坐了下来，掏出烟，点上火，深深吸了一口，吐出白色的烟雾。
|
||||
|
||||
peipei: 这个城市…好美啊。
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
me: 是啊。好美啊。
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
树叶从她的面前飘落。
|
||||
她接住了一片，举了起来，仔细端详着。
|
||||
|
||||
peipei: 医生…这片树叶是什么颜色的？
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
me: 你不是要回去工作吗？
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
她忽然回过头看着你，露出了一个久违的笑容。
|
||||
|
||||
她伸出手，把树叶交给你。
|
||||
|
||||
peipei: 谢谢你，医生。
|
||||
|
||||
peipei: 我会有很多机会给你画画的。
|
||||
|
||||
->接过
|
||||
|
||||
她依然看着你，直直的眼神和你对视。她的嘴微张着，许多种表情从她的脸上闪过。
|
||||
|
||||
peipei: 我会有很多机会给你画画的。
|
||||
|
||||
说完，她再次给了你一个笑容，转身离开。
|
||||
|
||||
<<hide_dialog>>
|
||||
<<wait 1>>
|
||||
|
||||
吸完最后一口烟，你长舒一口气。
|
||||
|
||||
->回到诊室
|
||||
|
||||
//感觉可以把之前写的day1mid改到这里的BE，只是树叶其实是绿的，但你说是黄的
|
||||
|
||||
<<fade_in 1>>
|
||||
|
||||
感谢游玩艾比斯之梦，本次demo的体验流程已结束
|
||||
|
||||
//<<NextYarn>>
|
||||
|
||||
===
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ position: 378,-540
|
||||
title: 检查初始化
|
||||
position: 380,-239
|
||||
---
|
||||
<<play_clinic_cut>>
|
||||
<<fade_in 0.5>>
|
||||
|
||||
<<wait 1>>
|
||||
|
||||
@@ -12,6 +12,7 @@ position: 378,-540
|
||||
title: 检查初始化
|
||||
position: 380,-239
|
||||
---
|
||||
<<play_clinic_cut>>
|
||||
<<fade_in 0.5>>
|
||||
|
||||
<<wait 1>>
|
||||
|
||||
@@ -11,6 +11,7 @@ position: 210,-342
|
||||
title: 被忘掉的烦恼
|
||||
position: 210,-129
|
||||
---
|
||||
<<switch_fix_system_to "BodyModule">>
|
||||
<<fade_in 1>>
|
||||
<<switch_fix_system_to "Clinic">>
|
||||
<<indoor_new 1>>
|
||||
|
||||
@@ -11827,6 +11827,67 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 542992025}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &550777282
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8653719598885068355, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u4F69\u4F69-4K"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8653719598885068355, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -14.97
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7552582706839291426, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 4843985084834002234, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3}
|
||||
--- !u!21 &572653911
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -34871,10 +34932,6 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Screen System
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4555452611439640309, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3}
|
||||
propertyPath: typeSpeed
|
||||
value: 0.015
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@@ -38852,3 +38909,4 @@ SceneRoots:
|
||||
- {fileID: 183765382}
|
||||
- {fileID: 851958693}
|
||||
- {fileID: 267394791}
|
||||
- {fileID: 550777282}
|
||||
|
||||
@@ -6343,7 +6343,7 @@ Transform:
|
||||
m_GameObject: {fileID: 519420028}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -8254,9 +8254,9 @@ MonoBehaviour:
|
||||
- {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
|
||||
- {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
|
||||
- {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
|
||||
runMode: 2
|
||||
runMode: 1
|
||||
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
|
||||
testTalkSo: {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
|
||||
testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
|
||||
saveFileName: "PeipeiDay3_\u6E05\u9664\u8BB0\u5FC6\u8272\u5F69"
|
||||
--- !u!4 &719228339
|
||||
Transform:
|
||||
@@ -8299,7 +8299,7 @@ Transform:
|
||||
m_GameObject: {fileID: 719273460}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 5.16, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
||||
@@ -79,11 +79,34 @@ public class TimelineManager : MonoBehaviour
|
||||
}
|
||||
|
||||
Debug.Log($"Timeline {name} finished.");
|
||||
director.Stop();
|
||||
|
||||
// 重置PlayableDirector的状态
|
||||
// 启动重置时间的协程，但不等待其完成
|
||||
StartCoroutine(ResetDirectorTimeCoroutine(name));
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError($"PlayableDirector for {name} not found.");
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerator ResetDirectorTimeCoroutine(string name)
|
||||
{
|
||||
yield return new WaitForSeconds(2f);
|
||||
ResetDirectorTime(name);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重置PlayableDirector的时间
|
||||
/// </summary>
|
||||
/// <param name="name">Timeline的名称</param>
|
||||
public void ResetDirectorTime(string name)
|
||||
{
|
||||
if (directors.TryGetValue(name, out var director))
|
||||
{
|
||||
director.time = 0;
|
||||
director.Evaluate(); // 评估以应用时间重置
|
||||
director.Stop();
|
||||
Debug.Log($"Timeline {name} time reset.");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.001,"y":1.123,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.006,"y":0.362,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"NewGear","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.002,"y":-0.452,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft4","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.006,"y":-1.273,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"}]}
|
||||
{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]}
|
||||
Reference in New Issue
Block a user