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

Merge branch '石头修改' into 'develop'

Browse Source 
石头引擎合入，添加了抖动，进度条，速度显示

See merge request aibis-dream/aibis-dream!214
This commit is contained in:
bottlefish
2025-01-23 15:09:41 +00:00
parent f0a7b63f32 da77bb6023
commit fb56e83d0f
10 changed files with 2051 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Plugins/CleanFlatUI/Scripts/ProgressBar/ProgressBarGridCircular.cs
+15 -3
View File
@@ -140,6 +140,7 @@ namespace RainbowArt.CleanFlatUI
for(int i = 0; i < fgList.Count; i++)
{
RectTransform rectTrans = fgList[i];
Image image=rectTrans.transform.GetChild(0).GetComponent<Image>();
if(i < currentValue)
{
rectTrans.gameObject.SetActive(true);
@@ -147,10 +148,19 @@ namespace RainbowArt.CleanFlatUI
else
{
rectTrans.gameObject.SetActive(false);
}
}
if(i<16)
{
image.color=Color.Lerp(Color.green, Color.yellow, i/16f);
}
else
{
image.color = Color.Lerp(Color.yellow, Color.red, (i - 16) / 16f);
}
}
}
void UpdateText()
{
if (text != null && text.gameObject.activeSelf != hasText)
@@ -159,8 +169,10 @@ namespace RainbowArt.CleanFlatUI
}
if (hasText && (text != null))
{
float val = (float)currentValue / (float)maxValue;
text.text = Mathf.FloorToInt(val * 100) + "%";
//float val = (float)currentValue / (float)maxValue;
//text.text = Mathf.FloorToInt(val * 100) + "%";
text.text=currentValue*500+" 马力";
}
}
}
Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset
+330 -330
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6174243690473532038
--- !u!114 &-6421979802148699356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -9,10 +9,10 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3}
m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: e7a046c753c3c3d4aacc91f6597f310d
identifier: b7716510a1f36934c87976f3a81dbf3d
parentIdentifier: default
active: 0
Properties:
@@ -73,7 +73,153 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &-3974345589865759223
--- !u!114 &-2493609972237370556
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: 8f591a193113347409efedcc618e83d6, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: de700ef3f37a49b58a57ae3addf01ad9
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
--- !u!114 &-1580684736993228498
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: b87314b32fbe18943af496e4b47136c6, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: 46fbfdf3fc43db0458918377fd40293e
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
--- !u!114 &-785679389004310805
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -146,7 +292,7 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &-2057712728005687216
--- !u!114 &-712030531834803398
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -155,83 +301,10 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3}
m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: c88d16e5272a4e241b0ef0ac2e53b73d
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
--- !u!114 &-1479416721063755007
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: bc1f51bc35d549941904cf062bae93a3, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: 0f8eb3f400726694eb47beb1a9f94ce8
identifier: fd7c55dab0fce234b8c25f6ffca523c1
parentIdentifier: default
active: 0
Properties:
@@ -346,20 +419,20 @@ MonoBehaviour:
HideSetupWizard: 1
LastEventReferenceScanVersion: 131621
Platforms:
- {fileID: 4449505234930665929}
- {fileID: 6611559040954684553}
- {fileID: -1479416721063755007}
- {fileID: 1697475330856183958}
- {fileID: 119274062029799480}
- {fileID: -6174243690473532038}
- {fileID: -3974345589865759223}
- {fileID: 1182458898857209987}
- {fileID: 7988466420741846663}
- {fileID: -2057712728005687216}
- {fileID: 6428052061351901060}
- {fileID: 2121415354943079641}
- {fileID: -6421979802148699356}
- {fileID: -2493609972237370556}
- {fileID: -1580684736993228498}
- {fileID: -785679389004310805}
- {fileID: -712030531834803398}
- {fileID: 1100827045814593625}
- {fileID: 1132312529069990576}
- {fileID: 3979222738758991920}
- {fileID: 5613685733850034091}
- {fileID: 6330521338056678831}
- {fileID: 6477534247104662684}
- {fileID: 9010303474896345012}
MigratedPlatforms: 0500000000000000060000000a0000000800000009000000120000000c000000150000000b0000000200000001000000
--- !u!114 &119274062029799480
--- !u!114 &1100827045814593625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -432,7 +505,7 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &1182458898857209987
--- !u!114 &1132312529069990576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -505,7 +578,7 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &1697475330856183958
--- !u!114 &3979222738758991920
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -514,10 +587,10 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3}
m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: 46fbfdf3fc43db0458918377fd40293e
identifier: 0f8eb3f400726694eb47beb1a9f94ce8
parentIdentifier: default
active: 0
Properties:
@@ -578,7 +651,7 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &2121415354943079641
--- !u!114 &5613685733850034091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -587,10 +660,10 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3}
m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: fd7c55dab0fce234b8c25f6ffca523c1
identifier: c88d16e5272a4e241b0ef0ac2e53b73d
parentIdentifier: default
active: 0
Properties:
@@ -651,7 +724,163 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &4449505234930665929
--- !u!114 &6330521338056678831
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: 9587379c972e4a54da1949613f11e1c6, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: default
parentIdentifier:
active: 1
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 9264
HasValue: 1
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 1
StaticPlugins:
Value: []
HasValue: 1
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers:
- b7716510a1f36934c87976f3a81dbf3d
- de700ef3f37a49b58a57ae3addf01ad9
- 46fbfdf3fc43db0458918377fd40293e
- 52eb9df5db46521439908db3a29a1bbb
- fd7c55dab0fce234b8c25f6ffca523c1
- 2fea114e74ecf3c4f920e1d5cc1c4c40
- 2c5177b11d81d824dbb064f9ac8527da
- 0f8eb3f400726694eb47beb1a9f94ce8
- c88d16e5272a4e241b0ef0ac2e53b73d
- e7a046c753c3c3d4aacc91f6597f310d
codecChannels:
Value: []
HasValue: 0
--- !u!114 &6477534247104662684
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: 17eea195bdfbf014e91ba7620ee491f8, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: e7a046c753c3c3d4aacc91f6597f310d
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
--- !u!114 &9010303474896345012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -724,232 +953,3 @@ MonoBehaviour:
codecChannels:
Value: []
HasValue: 0
--- !u!114 &6428052061351901060
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: 8f591a193113347409efedcc618e83d6, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: de700ef3f37a49b58a57ae3addf01ad9
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
--- !u!114 &6611559040954684553
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: 9587379c972e4a54da1949613f11e1c6, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: default
parentIdentifier:
active: 1
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 9264
HasValue: 1
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 1
StaticPlugins:
Value: []
HasValue: 1
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers:
- 0f8eb3f400726694eb47beb1a9f94ce8
- 46fbfdf3fc43db0458918377fd40293e
- 2fea114e74ecf3c4f920e1d5cc1c4c40
- e7a046c753c3c3d4aacc91f6597f310d
- 52eb9df5db46521439908db3a29a1bbb
- 2c5177b11d81d824dbb064f9ac8527da
- b7716510a1f36934c87976f3a81dbf3d
- c88d16e5272a4e241b0ef0ac2e53b73d
- de700ef3f37a49b58a57ae3addf01ad9
- fd7c55dab0fce234b8c25f6ffca523c1
codecChannels:
Value: []
HasValue: 0
--- !u!114 &7988466420741846663
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: 73549a74f689f0849a8271d9e908c514, type: 3}
m_Name: FMODStudioSettingsPlatform
m_EditorClassIdentifier:
identifier: b7716510a1f36934c87976f3a81dbf3d
parentIdentifier: default
active: 0
Properties:
LiveUpdate:
Value: 0
HasValue: 0
LiveUpdatePort:
Value: 0
HasValue: 0
Overlay:
Value: 0
HasValue: 0
OverlayPosition:
Value: 0
HasValue: 0
OverlayFontSize:
Value: 0
HasValue: 0
Logging:
Value: 0
HasValue: 0
SampleRate:
Value: 0
HasValue: 0
BuildDirectory:
Value:
HasValue: 0
SpeakerMode:
Value: 0
HasValue: 0
VirtualChannelCount:
Value: 0
HasValue: 0
RealChannelCount:
Value: 0
HasValue: 0
DSPBufferLength:
Value: 0
HasValue: 0
DSPBufferCount:
Value: 0
HasValue: 0
Plugins:
Value: []
HasValue: 0
StaticPlugins:
Value: []
HasValue: 0
CallbackHandler:
Value: {fileID: 0}
HasValue: 0
OutputTypeName:
threadAffinities:
Value: []
HasValue: 0
displaySortOrder: 0
childIdentifiers: []
codecChannels:
Value: []
HasValue: 0
Assets/Resources/Art/Obj/变速箱唱片齿轮.asset
+212
View File
@@ -0,0 +1,212 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!213 &21300000
Sprite:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E"
m_Rect:
serializedVersion: 2
x: 3962
y: 5054
width: 130
height: 130
m_Offset: {x: 0, y: 0}
m_Border: {x: 0, y: 0, z: 0, w: 0}
m_PixelsToUnits: 215
m_Pivot: {x: 0.5, y: 0.5}
m_Extrude: 1
m_IsPolygon: 0
m_AtlasName:
m_PackingTag:
m_RenderDataKey:
149a798e8f987264f82beb4f4052eb5e: -611960561148999933
m_AtlasTags: []
m_SpriteAtlas: {fileID: 0}
m_RD:
serializedVersion: 3
texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
alphaTexture: {fileID: 0}
secondaryTextures: []
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 6
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 4
localAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_IndexBuffer: 000001000200020001000300
m_VertexData:
serializedVersion: 3
m_VertexCount: 4
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 1
offset: 0
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 1
offset: 8
format: 0
dimension: 4
- stream: 1
offset: 24
format: 10
dimension: 4
m_DataSize: 208
_typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000
m_Bindpose: []
textureRect:
serializedVersion: 2
x: 3962
y: 5054
width: 130
height: 130
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
uvTransform: {x: 215, y: 4027, z: 215, w: 5119}
downscaleMultiplier: 1
m_AtlasRD:
serializedVersion: 3
texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
alphaTexture: {fileID: 0}
secondaryTextures: []
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 6
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 4
localAABB:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_IndexBuffer: 000001000200020001000300
m_VertexData:
serializedVersion: 3
m_VertexCount: 4
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 1
offset: 0
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 1
offset: 8
format: 0
dimension: 4
- stream: 1
offset: 24
format: 10
dimension: 4
m_DataSize: 208
_typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000
m_Bindpose: []
textureRect:
serializedVersion: 2
x: 3962
y: 5054
width: 130
height: 130
textureRectOffset: {x: 0, y: 0}
atlasRectOffset: {x: -1, y: -1}
settingsRaw: 0
uvTransform: {x: 215, y: 4027, z: 215, w: 5119}
downscaleMultiplier: 1
m_PhysicsShape: []
m_Bones: []
m_SpriteID: db22083879843b843b69dc1550fe5bfc
Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f33b33323f3c1314dbd795a207653ce0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 21300000
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
+71 -88
View File
@@ -316,53 +316,79 @@ me: 那来吧。在调整之前…<br>让我看看，你现在能跑多快。
shitou: 收到~
shitou: 呜——！
石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next
<<wait 3>>
<<step_on_gas 0.6 4>>
//石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next
//<<wait 3>>
me: 9800转…好高啊。
shitou: 嘿嘿，医生，我要跑得双倍快才行哩！
me: 双倍快？
shitou: 对！我要比大家都快一倍！这样我才能跑双倍的货~
<<hide_dialog>>
<<wait 0.5>>
me: ……你是想跑到20000转吗？那样要赶上火车了。
shitou: 哈哈，我真能变成火车…那就……太酷啦！
shitou: 开玩笑~医生！这只是一种比喻~<br>我只要能跑到12000转就够啦！
<<hide_dialog>>
<<wait 0.5>>
me: 那么…加压应该是可以做到的。
me:拉动左边的拉绳，就可以提升涡轮部分的转速了
<<active_engine_pull>>
//【加压按钮可用】#auto_next
//<<wait 1.5>>
【加压按钮可用】#auto_next
<<wait 1.5>>
// ->加压
->加压
// <<complete_task TaskManager 为动力模块进行增压>>
<<complete_task TaskManager 为动力模块进行增压>>
// 你向气阀内压入气体，石头的速度变得更高了。#auto_next
// <<wait 1>>
你向气阀内压入气体，石头的速度变得更高了。#auto_next
<<wait 1>>
// <<task_moveOut TaskManager>>
<<task_moveOut TaskManager>>
// <<wait 1>>
<<wait 1>>
//<<wait 1.5>>
//me: 嗯…看起来一切正常？没有缺齿轮之类的报告……
//shitou: 正常？不可能，医生。我明显感觉它有问题。
//me: 虽然我不知道你说的会是什么问题…<br>但这确实是最有可能掉出齿轮的地方。
//<<wait 0.5>>
//me: 来都来了……<br>以防万一，最好让它跑一次；<br>确认它在运行状态下是没问题的。
//<<hide_dialog>>
//<<wait 0.5>>
//<<MessageBoxSetText 正在运行自检……>>
//<<wait 0.1>>
//<<MessageBoxSetText 请将转速提高至2500RPM以进行自检！>>
//<<wait 0.5>>
//me: ……
//me: 2500，哇哦。
//shitou: 怎么了，医生？找到问题了？
//me: 不是。正常机体的动力系统只能跑到500RPM…<br>而且还得是在劳累或者激动的情况下。
//me: 但你能跑到2500RPM。这是一般机体的…5倍。<br>通常转到这个速度，就意味着机体要接近报废了。
//me: 不过也不奇怪，毕竟你是需要跑货的。<br>……你简直就是一台人形货车了。
//shitou: 嗨！我要是能天天跑到2500就好了！<br>可惜城里的红绿灯实在是太多了。
//me: 你现在就有机会了。<br>我需要手动把你提到2500RPM，来完整测试引擎的运行能力。
//shitou: 要开跑了吗，医生？太好啦！我最喜欢跑货了！<br>…哎呀，可惜！要是我状态完美，能边跑边唱……
//me: 这是治疗，不是赛车。<br>让它跑起来是为了确认它到底有没有问题。
//shitou: 不过医生…如果里面缺一个齿轮，不会有问题吗？<br>比如把其他的齿轮也甩飞出来之类的……
//me: 按理来说不会…至少手册说不会。
===
title: 调速后测速
tags:
colorID: 8
group: 插入触发
position: -158,370
---
shitou: 哇~好快啊，从来没有过的感觉！
<<hide_dialog>>
<<wait 0.5>>
<<shake_camera 0.2 0.3 20>>
石头的速度忽然掉了下来，逐渐回到怠速。
<<wait 0.5>>
<<step_on_gas 0.2 0.3>>
shitou: 啊！
shitou: 医生…我怎么…动不了了！
<<hide_dialog>>
<<wait 0.5>>
@@ -372,30 +398,24 @@ me: 听起来像是变速箱里的声音……我这就看看。
<<task_moveIn TaskManager>>
->打开变速箱盖
<<switch_fix_system_to Gear>>
<<open_gear_cover>>
<<hide_dialog>>
<<wait 1>>
你打开引擎的变速箱盖…#auto_next
<<wait 1>>
<<shake_camera 0.2 0.3 20>>
me: 哎呀……有几个齿轮松脱了。
<<complete_task TaskManager 检查变速箱的异响>>
<<hide_dialog>>
<<wait 1>>
<<open_gear_panel>>
<<wait 0.5>>
->拿起齿轮
<<show_obj 变速箱唱片齿轮>>
me: 这些齿轮表面有一部分竟然是塑胶的…<br>…看起来强度很低啊。
【拿起齿轮端详(show obj)】
<<wait 0.5>>
<<hide_obj>>
<<hide_dialog>>
<<wait 0.5>>
me: 齿轮箱里看起来也有一些不属于这里的结构…这根杆子是什么？
shitou: 噢~？你说的是我的~唱片机吗？
me: 唱片机……？这里不应该是变速箱吗……
@@ -414,33 +434,27 @@ me: 无论如何，我先把这些脱落的齿轮装回去吧。
//shitou: 噢？你说的是*那些*齿轮吗？
//me: 什么是*那些*齿轮？
//shitou: 嘿嘿。快把它放回去，让我演示给你看！
->放回去
<<hide_dialog>>
<<wait 1>>
<<close_gear_panel>>
// <<close_gear_panel>>
<<complete_task TaskManager 恢复变速箱的齿轮>>
<<task_moveOut TaskManager>>
<<wait 0.5>>
me: 好了。石头，再试试吧，跑起来。
shitou: 该播放音乐了吗？医生！
// <<switch_fix_system_to Engine>>
<<step_on_gas 0.6 3>>
<<hide_dialog>>
<<wait 0.5>>
shitou: 该播放音乐了吗？医生！
// 石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next
// <<wait 2>>
石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next
<<wait 2>>
<<move_needle>>
<<wait 1>>
<<play_loop_audio disc>>
那根奇怪的杆子转了下来，搭在一张唱片上。#auto_next
<<wait 2>>
me: 原来如此……
shitou: 医生，这可是我的得意改装！我从小！就喜欢音乐！可惜我~五音不全。
shitou: 工作后一攒够钱！我就买了一直心念念的爱索~Walkman音乐！唱片机！
shitou: 我把它改装进了动力模块里！这样我就可以随时随地哼我最喜欢的旋律了——
@@ -452,24 +466,24 @@ me: 这倒是…很巧妙的改造。
<<hide_dialog>>
<<wait 1>>
me: 但是，有一个问题……
shitou: 好了，现在可以~马力全开！
me: 等等石头，那些齿轮...
<<hide_dialog>>
<<wait 0.2>>
<<step_on_gas 0.75 3>>
shitou: 哇，感觉充满力量！要来了！
<<step_on_gas 0.9 3>>
<<pause_loop_audio>>
<<random_play_interaction tv_in>>
<<shake_camera 0.4 0.3 20>>
石头的速度又掉了下来，逐渐回到怠速。#auto_next
<<step_on_gas 0.2 0.5>>
<<wait 1>>
shitou: 哎呀，医生！我又动不了了！
me: 这就是我说的问题。刚才已经发生过一次了……
me: 我先给你安回去吧…但你别再加速了。不然还得飞出来。
你将齿轮装了回去。（自动）#auto_next
<<close_gear_cover>>
<<wait 1>>
<<fade_in 1>>
<<switch_fix_system_to "Clinic">>
<<fade_out 1>>
@@ -524,21 +538,17 @@ me: 啊…那倒不贵。不过是一些铁块罢了。
shitou: 哈哈哈！那太好了，那还等什么？医生，我们来吧。
<<fade_in 1>>
<<switch_fix_system_to "Engine">>
<<switch_fix_system_to "Gear">>
<<fade_out 1>>
<<open_gear_cover>>
me: 让我找找…镍铬齿轮…
<<open_gear_panel>>
<<add_task TaskManager 更换镍铬齿轮>>
<<task_moveIn TaskManager>>
<<hide_dialog>>
<<wait 0.5>>
->将镍铬齿轮替换上去
<<hide_dialog>>
<<wait 1>>
<<close_gear_panel>>
@@ -555,32 +565,5 @@ me: 好了…再播…跑一次吧。
<<wait 2>>
shitou: 呜呼！医生~我感觉~我像在飞一样！
//<<wait 1.5>>
//me: 嗯…看起来一切正常？没有缺齿轮之类的报告……
//shitou: 正常？不可能，医生。我明显感觉它有问题。
//me: 虽然我不知道你说的会是什么问题…<br>但这确实是最有可能掉出齿轮的地方。
//<<wait 0.5>>
//me: 来都来了……<br>以防万一，最好让它跑一次；<br>确认它在运行状态下是没问题的。
//<<hide_dialog>>
//<<wait 0.5>>
//<<MessageBoxSetText 正在运行自检……>>
//<<wait 0.1>>
//<<MessageBoxSetText 请将转速提高至2500RPM以进行自检！>>
//<<wait 0.5>>
//me: ……
//me: 2500，哇哦。
//shitou: 怎么了，医生？找到问题了？
//me: 不是。正常机体的动力系统只能跑到500RPM…<br>而且还得是在劳累或者激动的情况下。
//me: 但你能跑到2500RPM。这是一般机体的…5倍。<br>通常转到这个速度，就意味着机体要接近报废了。
//me: 不过也不奇怪，毕竟你是需要跑货的。<br>……你简直就是一台人形货车了。
//shitou: 嗨！我要是能天天跑到2500就好了！<br>可惜城里的红绿灯实在是太多了。
//me: 你现在就有机会了。<br>我需要手动把你提到2500RPM，来完整测试引擎的运行能力。
//shitou: 要开跑了吗，医生？太好啦！我最喜欢跑货了！<br>…哎呀，可惜！要是我状态完美，能边跑边唱……
//me: 这是治疗，不是赛车。<br>让它跑起来是为了确认它到底有没有问题。
//shitou: 不过医生…如果里面缺一个齿轮，不会有问题吗？<br>比如把其他的齿轮也甩飞出来之类的……
//me: 按理来说不会…至少手册说不会。
<<jump 分析检查结果>>
===
===
Assets/Scenes/ExpressFixScene.unity
+1398 -898
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+4 -3
View File
@@ -6198,7 +6198,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: []
@@ -8111,8 +8111,8 @@ MonoBehaviour:
- {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
runMode: 2
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
saveFileName: "PeipeiDay3_\u770B\u753B"
testTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
saveFileName: StoneDay1_2
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -10155,6 +10155,7 @@ MonoBehaviour:
holding: {fileID: 21300000, guid: acc8d5eb5db1c184ba494e0142fa4d85, type: 3}
disable: {fileID: 21300000, guid: c79f612e713a64245b3c78d6ac145b52, type: 3}
eye: {fileID: 21300000, guid: 3bdd9ca7d32af494fb1a336b1258c780, type: 3}
isInMenu: 0
--- !u!114 &947129554
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+2 -1
View File
@@ -20,6 +20,7 @@ namespace AibisDream
private bool _isSuccess;
public float curSpeed;
public float targetSpeed=0.95f;
[HideInInspector] public UnityEvent<float, float> updateSpeedEvent = new();
[SerializeField] private float coverMoveDuration = 5f;
@@ -61,7 +62,7 @@ namespace AibisDream
private void Update()
{
updateSpeedEvent.Invoke(curSpeed, GetSpeedScale());
if (curSpeed >= 0.99f && !_isSuccess)
if (curSpeed >= targetSpeed && !_isSuccess)
{
_isSuccess = true;
isPullActive = false;
Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
+9 -3
View File
@@ -1,4 +1,5 @@
using UnityEngine;
using RainbowArt.CleanFlatUI;
namespace AibisDream
{
@@ -6,19 +7,24 @@ namespace AibisDream
{
private Material _material;
private EngineSystem _engineSystem;
private ProgressBarGridCircular progress;
private static readonly int Progress1 = Shader.PropertyToID("_Progress");
private void Awake()
{
_material = GetComponent<SpriteRenderer>().material;
{
_engineSystem = transform.parent.GetComponent<EngineSystem>();
_material = _engineSystem.transform.Find("心脏引擎").GetComponent<SpriteRenderer>().material;
progress=FindObjectOfType<ProgressBarGridCircular>();
_engineSystem.updateSpeedEvent.AddListener(OnSpeedChange);
}
private void OnSpeedChange(float originSpeed, float speedScale)
{
_material.SetFloat(Progress1, originSpeed);
_material.SetFloat("_VibrateFade", originSpeed);
progress.CurrentValue=Mathf.RoundToInt(originSpeed * 50);
//_material.SetFloat(Progress1, originSpeed);
}
}
}