diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn index f4661b566..64e4f9288 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn @@ -15,8 +15,8 @@ tags: colorID: 8 position: 0,200 --- -<> -<> +// <> +// <> <> <> <> @@ -58,7 +58,7 @@ colorID: 8 position: 0,400 --- -<> +// <> yingli_novoice: 我不希望就因为你的这个怪病，而让我们部门的评价受到影响。 peipei_novoice: 我没病，组长…我只是自己没发现……
…我会注意的。我会完成得很好的…相信我。 diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn index c08954026..50c08ac1d 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -187,7 +187,7 @@ LiverModule: 处理机体的冷却液循环与净化，保障各模块运行状 title: 刻录 position: 728,79 --- - +<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn index f1b4101fc..0e71f77d4 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -3,7 +3,7 @@ tags: position: 210,-342 --- <> -<> +// <> <> <> === @@ -91,7 +91,7 @@ group:插线检查 position: -47,-3242 --- <> -<> +<> Linking: 正在建立连接… <> EmoModule: 已与情绪模块建立连接！ @@ -130,7 +130,7 @@ group:插线检查 position: 194,-2880 --- <> -<> +<> Linking: 正在建立连接… <> SpeakerModule: 已与表达模块建立连接！ @@ -168,7 +168,7 @@ group:插线检查 position: 428,-3246 --- <> -<> +<> Linking: 正在建立连接… <> LogicModule: 已与逻辑处理模块建立连接！ @@ -215,7 +215,7 @@ group:插线检查 position: 195,-3243 --- <> -<> +<> Linking: 正在建立连接… <> MemModule: 已与记忆模块建立连接！ @@ -294,7 +294,7 @@ group:插线检查 position: 435,-3043 --- <> -<> +<> Linking: 正在建立连接… <> EyeModule: 已与视觉模块建立连接！ diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs index cf8e58308..32d08b89f 100644 --- a/Assets/Scripts/Dialog System/BaseYarnCommand.cs +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using AibisDream.Framework; +using UnityEngine; using Yarn.Unity; namespace AibisDream @@ -27,16 +28,18 @@ namespace AibisDream EndMenu.Instance.OpenEndMenu(); } + [Obsolete] [YarnCommand("switch_tv")] public static void SwitchTV(string picName) { - MainUIController.Instance.SwitchTV(picName); + Debug.Log("switch_tv 已废弃"); } + [Obsolete] [YarnCommand("show_tv_scene")] public static void ShowTVScene(float duration) { - MainUIController.Instance.TVFadeIn(duration); + Debug.Log("show_tv_scene 已废弃"); } [YarnCommand("load_scene")] diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index 7313481ab..76dd8118f 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -63,14 +63,6 @@ namespace AibisDream characterGroup.SetActive(data.shown); } - public IEnumerator Indoor(float duration) - { - // 加载诊所场景 - gameObject.SetActive(true); - // 开始界面淡出 - yield return MainUIController.Instance.TVFadeOutSync(duration); - } - public IEnumerator Quit(float duration) { // 黑屏出现 diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs index 68fb65520..973e387ef 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs @@ -1,5 +1,5 @@ -using System.Collections; -using System.Collections.Generic; +using System; +using System.Collections; using AibisDream.FixSystem; using UnityEngine; using Yarn.Unity; @@ -9,12 +9,13 @@ namespace AibisDream public static class ClinicYarnCommand { private static ClinicSystem ClinicSystem => FixSystemCenter.SystemDic.Get(); - private static CharacterViewer Character => ClinicSystem.character; + [Obsolete] [YarnCommand("indoor_new")] public static IEnumerator Indoor(float duration) { - return ClinicSystem.Indoor(duration); + Debug.Log("indoor 已废除"); + yield break; } [YarnCommand("quit_clinic_new")] @@ -59,25 +60,33 @@ namespace AibisDream [YarnCommand("character_init_new")] public static IEnumerator CharacterInit(string characterName) { - return Character.CharacterInit(characterName); + // return Character.CharacterInit(characterName); + Debug.Log("旧表情系统已废弃，请停止使用"); + yield break; } [YarnCommand("character_fade_in_new")] public static IEnumerator CharacterFadeIn() { - return Character.CharacterFadeIn(); + // return Character.CharacterFadeIn(); + Debug.Log("旧表情系统已废弃，请停止使用"); + yield break; } [YarnCommand("character_fade_out_new")] public static IEnumerator CharacterFadeOut() { - return Character.CharacterFadeOut(); + // return Character.CharacterFadeOut(); + Debug.Log("旧表情系统已废弃，请停止使用"); + yield break; } + [YarnCommand("character_show_new")] public static void CharacterShow(string characterName) { - Character.CharacterShow(characterName); + // Character.CharacterShow(characterName); + Debug.Log("旧表情系统已废弃，请停止使用"); } #endregion @@ -87,7 +96,8 @@ namespace AibisDream [YarnCommand("character_face_new")] public static void CharacterFace(string state) { - Character.SwitchFace(state); + // Character.SwitchFace(state); + Debug.Log("旧表情系统已废弃，请停止使用"); } [YarnCommand("character_eye_new")] @@ -107,31 +117,36 @@ namespace AibisDream [YarnCommand("character_pos")] public static void SwitchPos(string poseName) { - Character.SwitchPose(poseName); + // Character.SwitchPose(poseName); + Debug.Log("旧表情系统已废弃，请停止使用"); } [YarnCommand("character_auto_blink")] public static void AutoBlink() { - Character.AutoBlink(); + // Character.AutoBlink(); + Debug.Log("旧表情系统已废弃，请停止使用"); } [YarnCommand("character_stop_auto_blink")] public static void StopAutoBlink() { - Character.StopAutoBlink(); + // Character.StopAutoBlink(); + Debug.Log("旧表情系统已废弃，请停止使用"); } [YarnCommand("character_add_device")] public static void AddLinkDevice() { - Character.AddLinkDevice(); + // Character.AddLinkDevice(); + Debug.Log("旧表情系统已废弃，请停止使用"); } [YarnCommand("character_remove_device")] public static void RemoveLinkDevice() { - Character.RemoveLinkDevice(); + // Character.RemoveLinkDevice(); + Debug.Log("旧表情系统已废弃，请停止使用"); } #endregion diff --git a/Assets/Scripts/Game Loop/GameLoopManager.cs b/Assets/Scripts/Game Loop/GameLoopManager.cs index 8f41882ee..c64d0f91f 100644 --- a/Assets/Scripts/Game Loop/GameLoopManager.cs +++ b/Assets/Scripts/Game Loop/GameLoopManager.cs @@ -122,7 +122,6 @@ namespace AibisDream { yield return SceneLoader.Instance.UnloadSceneAsync(); yield return MainUIController.Instance.FadeInSync(1); - // yield return MainUIController.Instance.TVFadeInSync(1); yield return LoadClinicOut(); MainUIController.Instance.ShowMainUI(); StartMenu.Instance.showStartMenu(); diff --git a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json index 8187fa37b..22802d56a 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json @@ -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/变速箱齿轮/唱片齿轮"},{"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/变速箱齿轮/普通齿轮B"},{"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/变速箱齿轮/普通齿轮C"},{"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/变速箱齿轮/普通齿轮A"}],"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/变速箱齿轮/唱片齿轮"},{"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/变速箱齿轮/镍铬齿轮B"},{"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.392,"z":0.0},"gearPicPath":"Art/Fix/变速箱齿轮/镍铬齿轮C"},{"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/变速箱齿轮/镍铬齿轮B"}]} \ No newline at end of file +{"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/变速箱齿轮/唱片齿轮"},{"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/变速箱齿轮/普通齿轮B"},{"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/变速箱齿轮/普通齿轮C"},{"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/变速箱齿轮/普通齿轮A"}],"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/变速箱齿轮/刻录齿轮"},{"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/变速箱齿轮/镍铬齿轮B"},{"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.392,"z":0.0},"gearPicPath":"Art/Fix/变速箱齿轮/镍铬齿轮C"},{"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/变速箱齿轮/镍铬齿轮B"}]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json index 8187fa37b..25f38f562 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/temp.json @@ -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/变速箱齿轮/唱片齿轮"},{"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/变速箱齿轮/普通齿轮B"},{"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/变速箱齿轮/普通齿轮C"},{"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/变速箱齿轮/普通齿轮A"}],"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/变速箱齿轮/唱片齿轮"},{"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/变速箱齿轮/镍铬齿轮B"},{"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.392,"z":0.0},"gearPicPath":"Art/Fix/变速箱齿轮/镍铬齿轮C"},{"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/变速箱齿轮/镍铬齿轮B"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"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/变速箱齿轮/刻录齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":3,"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/变速箱齿轮/镍铬齿轮B"},{"shaftName":"Pluggable Shaft1","shaftType":3,"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/变速箱齿轮/镍铬齿轮C"},{"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/变速箱齿轮/镍铬齿轮A"}],"panelShaftArray":[]} \ No newline at end of file