tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'feature/Yarn_0219'

Browse Source 
Develop

See merge request aibis-dream/aibis-dream!260
This commit is contained in:
chenziqin
2025-02-21 06:13:42 +00:00
parent ba88ee5c1a bfe7db351c
commit d6a3eb6997
16 changed files with 1981 additions and 6033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Materials/Rotation.mat
+1 -1
View File
@@ -460,7 +460,7 @@ Material:
- _ToggleUnscaledTime: 0
- _UVDistortFade: 1
- _UVDistortMaskToggle: 0
- _UVRotateSpeed: 0.1
- _UVRotateSpeed: 1
- _VertexTintFirst: 0
- _VibrateFade: 1
- _VibrateFrequency: 100
Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
+1 -1
View File
@@ -476,7 +476,7 @@ shitou: 该播放音乐了吗？医生！
// <<wait 2>>
me: 音乐？
<<move_needle>>
<<move_needle 1>>
<<wait 1>>
<<play_loop_audio disc>>
<<wait 2>>
Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
+1 -1
View File
@@ -199,7 +199,7 @@ shitou: 我好紧张，感觉~像演唱会一样！
<<hide_dialog>>
<<fade_out 1>>
<<wait 1>>
<<move_needle>>
<<move_needle 1>>
me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录下来。
<<hide_dialog>>
<<step_on_gas 0.5 3>>
Assets/Scenes/ClinicScene.unity
+1100 -5228
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/ExpressFixScene.unity
+794 -794
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/Dialog System/LineView.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace AibisDream
if (DialogController.Instance.quickRunMode)
{
onDialogueLineFinished.Invoke();
DialogCanvasManager.Instance.NextStep();
}
}
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+2
View File
@@ -18,6 +18,8 @@ namespace AibisDream.FixSystem
public IEnumerator SwitchState(FixState nextState, string args = "")
{
if (CurState == nextState) yield break;
_curArgs = args;
yield return _curState?.Exit();
Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+4 -1
View File
@@ -121,7 +121,10 @@ namespace AibisDream.FixSystem
// 先清除文字
ClearTextScreen();
// 旋转隐藏
_textScreen.DORotate(new Vector3(0, 0, -90), rotateDuration, RotateMode.FastBeyond360);
if (transform.eulerAngles.z >= -80f)
{
_textScreen.DORotate(new Vector3(0, 0, -90), rotateDuration, RotateMode.FastBeyond360);
}
}
#endregion
Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs
+2 -2
View File
@@ -9,9 +9,9 @@ namespace AibisDream.FixSystem
private static ScreenSystem ScreenSystem => FixSystemCenter.SystemDic.Get<ScreenSystem>();
[YarnCommand("open_screen")]
public static IEnumerator OpenScreen()
public static IEnumerator OpenScreen(string picName = "gear")
{
Sprite sprite = Resources.Load<Sprite>("Art/Obj/gear");
Sprite sprite = Resources.Load<Sprite>($"Art/Obj/{picName}");
return ScreenSystem.OnLink(sprite);
}
Assets/Scripts/Framework/OtherKit/SpriteGroupKit.cs
+40
View File
@@ -0,0 +1,40 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace AibisDream.Framework
{
public class SpriteGroupKit : MonoBehaviour
{
#region Sprite索引
private readonly Dictionary<string, SpriteRenderer> _spriteDict = new();
private Dictionary<string, List<string>> _stateDict;
#endregion
[SerializeField] private string state;
private void Awake()
{
}
public void SaveAsState()
{
var spriteRenderers = GetComponentsInChildren<SpriteRenderer>();
var activeList = (from render in spriteRenderers
where render.gameObject.activeSelf
select render.gameObject.name).ToList();
_stateDict[state] = activeList;
}
public void LoadState()
{
}
}
}
Assets/Scripts/Framework/OtherKit/SpriteGroupKit.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 146b2fdfd6d201b409f26225a774f295
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs
+2 -3
View File
@@ -9,10 +9,9 @@ namespace AibisDream
private static GearSystem GearSystem => FixSystemCenter.SystemDic.Get<GearSystem>();
[YarnCommand("move_needle")]
public static IEnumerator MoveNeedle()
public static IEnumerator MoveNeedle(int discIdx)
{
DialogController.Instance.TryGetVariable<float>("$discIdx", out var discIdx);
return FixSystemCenter.SystemDic.Get<GearSystem>().MoveNeedle((int) discIdx);
return FixSystemCenter.SystemDic.Get<GearSystem>().MoveNeedle(discIdx);
}
[YarnCommand("open_gear_panel")]
Assets/StreamingAssets/LevelData/GearSystem/temp.json
+1 -1
View File
@@ -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.392,"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":"","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"}]}