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

修改波形动画，新增波形这里的空状态

Browse Source
This commit is contained in:
bottlefish
2026-03-02 17:22:57 +08:00
parent d9e9f64f46
commit c22162ce8b
12 changed files with 2991 additions and 2746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animation/HuoshanFix/透镜in.anim
+236 -22
View File
@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 10.16, y: 5.7, z: 0}
value: {x: 0.11, y: -0.02, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -45,7 +45,25 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1.7399998, y: -0.3100004, z: 0}
value: {x: -3.08, y: -0.3100004, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.8333333
value: {x: -3.08, y: -0.3100004, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 5.059998, y: -0.3100004, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -56,6 +74,40 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: "Device/\u955C\u7247"
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.11000061, y: -0.1999998, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.8333333
value: {x: 0.11, y: -0.19999981, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 0.11000061, y: -0.19999981, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: "Device/\u7535\u5B50\u6D41"
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
@@ -81,7 +133,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
@@ -110,15 +171,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -144,6 +196,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 3620668660
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1716763935
attribute: 304273561
@@ -154,7 +215,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 3620668660
path: 1716763935
attribute: 1
script: {fileID: 0}
typeID: 4
@@ -177,7 +238,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.5
m_StopTime: 2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -199,7 +260,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 10.16
value: 0.11
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -229,7 +290,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 5.7
value: -0.02
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -306,7 +367,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
@@ -328,7 +398,25 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.7399998
value: -3.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: -3.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 5.059998
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -356,6 +444,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: -0.3100004
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: -0.3100004
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -377,6 +483,24 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -398,9 +522,39 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: "Device/\u955C\u7247"
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.11000061
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: 0.11
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1
value: 0.11000061
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -410,9 +564,69 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: "Device/\u955C\u7247"
classID: 212
attribute: m_LocalPosition.x
path: "Device/\u7535\u5B50\u6D41"
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.1999998
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: -0.19999981
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: "Device/\u7535\u5B50\u6D41"
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: "Device/\u7535\u5B50\u6D41"
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
Assets/Animation/HuoshanFix/透镜in.playable
+1 -1
View File
@@ -68,7 +68,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -3915617022707980630}
m_Duration: 1.5
m_Duration: 2
m_TimeScale: 1
m_ParentTrack: {fileID: 7411755521170715630}
m_EaseInDuration: 0
Assets/Animation/HuoshanFix/透镜out.anim
+3 -3
View File
@@ -47,7 +47,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 10.16, y: 5.7, z: 0}
value: {x: 0.11, y: -0.07, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -226,7 +226,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 10.16
value: 0.11
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -274,7 +274,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 5.7
value: -0.07
inSlope: 0
outSlope: 0
tangentMode: 136
Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset
+1909 -1909
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset
+1 -1
View File
@@ -1945,7 +1945,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 669509362024537
m_Localized: "\u8FDB\u5165\u6B65\u8FDB\u67E5\u770B\u6A21\u5F0F"
m_Localized: "\u6DF1\u5165\u68C0\u67E5"
m_Metadata:
m_Items: []
- m_Id: 669509362024536
Assets/Resources/Yarn/Test_Huoshan/Stage2.yarn
+7 -3
View File
@@ -63,11 +63,13 @@ EmoModule: 已与情绪模块建立连接！ #line:0b19318
<<if $speakerChecked==true && $colorChecked==true>>
// Stage2: 检查完表达和滤波器后，对比预测波形与真实情绪波形
->查询情绪波形 #line:00f857c
<<switch_emotion_wave_config empty>>
<<show_emotion_wave 1>>
Analysing:正在查询... #line:0736427
<<wait 0.2>>
<<switch_emotion_wave_config "normal">>
<<set_emotion_wave 0>>
<<show_emotion_wave 1>>
// <<show_emotion_wave 1>>
me: 怎么和刚才预测的情绪波形不一样？ #line:017ee26
me: 难道问题不在情绪波形，而在销售语言处理模块本身？ #line:02afbcc
<<hide_emotion_wave 1>>
@@ -361,7 +363,8 @@ SaleModule: 已与销售模块建立连接！ #line:0448f12
me: 基础检查没问题，分析一下输出波形吧 #line:0169eea
->波形分析 #line:09a0a04
Analysing:正在接入波形显示... #line:0f488be
<<wait 0.2>>
<<switch_emotion_wave_config empty>>
<<wait 0.5>>
// <<show_waveform "filter_output">>
<<switch_emotion_wave_config "predicted">>
<<set_emotion_wave 1>>
@@ -379,6 +382,7 @@ SaleModule: 已与销售模块建立连接！ #line:0448f12
<<complete_task "line:03f59d6">>
<<ModuleHightLight sale false>>
<<ModuleHightLight Emo true>>
<<hide_emotion_wave 1>>
Task: 检查情绪模块 #line:0c51688
<<if $colorChecked == false>>
<<set $PlugCount=$PlugCount+1>>
@@ -386,7 +390,7 @@ SaleModule: 已与销售模块建立连接！ #line:0448f12
<<endif>>
<<elseif $gameStage==3>>
// Stage3: 滤波器深入检查 - 步进查看模式
->进入步进查看模式 #line:088d872
->深入检查 #line:088d872
<<jump 步进查看模式>>
<<elseif $gameStage==7>>
// Stage7: 最终检查
Assets/Scenes/HuoShanFixScene.unity
+808 -804
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/MiniGame/HuoShan/EmotionWave/EmotionWaveConfig.cs
+17
View File
@@ -211,6 +211,10 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
}
}
// 内置预设：empty 空状态，什么都不显示
if (presetId == "empty")
return GetEmptyParams();
// 内置预设：当 config 中未定义时使用程序化默认
if (presetId == "predicted" && (presets == null || !HasPreset("predicted")))
return GetBuiltInPredictedParams(value);
@@ -251,6 +255,19 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
return result;
}
/// <summary>空状态：什么都不显示，用于 switch_emotion_wave_config "empty"</summary>
static WaveParams GetEmptyParams()
{
var p = new WaveParams
{
glowIntensity = 0f,
lineWidth = 0f,
amplitude = 0.01f,
amplitudeY = 0.01f
};
return p;
}
/// <summary>内置 predicted 预设：红色、高噪声、毛刺</summary>
static WaveParams GetBuiltInPredictedParams(float value)
{
Assets/Scripts/MiniGame/HuoShan/EmotionWave/EmotionWaveController.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
[SerializeField] private EmotionWaveRenderer waveRenderer;
[Header("Preset")]
[Tooltip("当前波形预设：normal / predicted / modified_joke，可由 switch_emotion_wave_config 切换")]
[Tooltip("当前波形预设：normal / predicted / modified_joke / empty，可由 switch_emotion_wave_config 切换")]
[SerializeField] private string presetId = "normal";
[Header("Progress Control")]
Assets/Scripts/MiniGame/HuoShan/EmotionWave/EmotionWaveManager.cs
+2 -1
View File
@@ -59,7 +59,8 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
public string CurrentPresetId => _currentPresetId;
/// <summary>
/// 切换波形预设（normal / predicted / modified_joke）
/// 切换波形预设（normal / predicted / modified_joke / empty）
/// empty 为空状态，什么都不显示
/// </summary>
public void SetPreset(string presetId)
{
Assets/Scripts/MiniGame/HuoShan/EmotionWave/EmotionWaveRenderer.cs
+3
View File
@@ -126,6 +126,9 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
public override void DrawShapes(Camera cam)
{
if (waveScreen == null) return;
// 空状态：glowIntensity=0 表示什么都不显示
if (currentParams.glowIntensity <= 0f) return;
EnsureArrays();
var p = currentParams;
Assets/Scripts/MiniGame/HuoShan/EmotionWave/EmotionWaveYarnCommand.cs
+3 -1
View File
@@ -127,8 +127,10 @@ namespace AibisDream.MiniGame.HuoShan.EmotionWave
#region 预设切换
/// <summary>
/// 切换波形预设（normal / predicted / modified_joke）
/// 切换波形预设（normal / predicted / modified_joke / empty）
/// empty 为空状态，什么都不显示
/// 用法: <<switch_emotion_wave_config "predicted">>
/// <<switch_emotion_wave_config "empty">>
/// <<switch_emotion_wave_config "normal">>
/// </summary>
[YarnCommand("switch_emotion_wave_config")]