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

Merge branch 'develop' into feature/czq_0610

Browse Source
This commit is contained in:
Ovid
2025-06-10 22:34:53 +08:00
parent b7ef1b6ef6 96171407dc
commit c11b1f2252
25 changed files with 4411 additions and 4050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Language/Dialog/FP_Day1_begin/FP_Day1_begin Shared Data.asset
+888 -888
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset
+220 -220
View File
File diff suppressed because it is too large Load Diff
Assets/RawResources/Art/开盖动画.aseprite
BIN
View File
Binary file not shown.
Assets/RawResources/Art/开盖动画.aseprite.meta
+904 -512
View File
File diff suppressed because it is too large Load Diff
Assets/RawResources/Art/开盖动画.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 MiB

Assets/RawResources/Art/开盖动画.gif.meta
-153
View File
@@ -1,153 +0,0 @@
fileFormatVersion: 2
guid: b07d58f29a3e1d44f9c07929f2c92349
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/RawResources/Anima/Open Panel Timeline.playable → Assets/Resources/Art/TimeLineAsset/Open Panel Timeline.playable
+158 -154
View File
@@ -22,7 +22,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 20.316668
time: 0
value: 1.0145769
inSlope: 0
outSlope: 0
@@ -31,7 +31,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 22.366667
time: 2.0499992
value: 0.6442429
inSlope: -0.58079046
outSlope: -0.58079046
@@ -40,7 +40,7 @@ AnimationClip:
inWeight: 0.38408905
outWeight: 0.33333334
- serializedVersion: 3
time: 23.183332
time: 2.866665
value: 0.21451306
inSlope: -0.50100344
outSlope: -0.50100344
@@ -49,7 +49,7 @@ AnimationClip:
inWeight: 0.5260689
outWeight: 0.33333334
- serializedVersion: 3
time: 24.3
time: 3.9833317
value: -0.003827095
inSlope: 0
outSlope: 0
@@ -88,7 +88,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 24.3
m_StopTime: 3.9833317
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -109,7 +109,7 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 20.316668
time: 0
value: 1.0145769
inSlope: 0
outSlope: 0
@@ -118,7 +118,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 22.366667
time: 2.0499992
value: 0.6442429
inSlope: -0.58079046
outSlope: -0.58079046
@@ -127,7 +127,7 @@ AnimationClip:
inWeight: 0.38408905
outWeight: 0.33333334
- serializedVersion: 3
time: 23.183332
time: 2.866665
value: 0.21451306
inSlope: -0.50100344
outSlope: -0.50100344
@@ -136,7 +136,7 @@ AnimationClip:
inWeight: 0.5260689
outWeight: 0.33333334
- serializedVersion: 3
time: 24.3
time: 3.9833317
value: -0.003827095
inSlope: 0
outSlope: 0
@@ -176,76 +176,7 @@ MonoBehaviour:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 5.309999999999995
m_ClipIn: 0
m_Asset: {fileID: 829122587630962730}
m_Duration: 1.5
m_TimeScale: 1
m_ParentTrack: {fileID: -4781692477633661233}
m_EaseInDuration: 0.5
m_EaseOutDuration: 0.5
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ScreenAsset
m_Clips: []
m_Markers:
m_Objects: []
_renderMode: 0
@@ -265,10 +196,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 24.616666666666667
m_Time: 17.15
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: bbd3c1069564f5c44b59006cffa7f4f1, type: 2}
m_Asset: {fileID: 11400000, guid: 278bb9caee85c644a8586f035b22a04a, type: 2}
--- !u!114 &-4596241603796347056
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -281,14 +212,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset
m_EditorClassIdentifier:
m_Clip: {fileID: 7400000, guid: 013c5a06fc8ab96458ac2578c90c9421, type: 2}
m_Clip: {fileID: -4838107401899038334, guid: 57abdfa254b929a41ad47acc62723d29, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Loop: 2
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-3812519801109152584
@@ -303,7 +234,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset
m_EditorClassIdentifier:
m_Clip: {fileID: 7400000, guid: f83ee3a64514688418efed1c3d488a4a, type: 2}
m_Clip: {fileID: 2597825666896707667, guid: 57abdfa254b929a41ad47acc62723d29, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
@@ -325,14 +256,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset
m_EditorClassIdentifier:
m_Clip: {fileID: 7400000, guid: 81bfd4c84237e4549ae7208691558072, type: 2}
m_Clip: {fileID: 6754667872013485388, guid: 57abdfa254b929a41ad47acc62723d29, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Loop: 2
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-2913520546152221013
@@ -369,10 +300,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 9.233333333333338
m_Start: 5.919999999999999
m_ClipIn: 0
m_Asset: {fileID: -4596241603796347056}
m_Duration: 0.4666666666666668
m_Duration: 1.21
m_TimeScale: 1
m_ParentTrack: {fileID: -2356389098200647009}
m_EaseInDuration: 0
@@ -400,45 +331,12 @@ MonoBehaviour:
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: "\u5F00\u76D6\u4F4D\u7F6E1"
m_DisplayName: "\xE5\N\xB3\xE7\x81\xAF\xE6\x9A\x97\xE6\x8E\x89"
- m_Version: 1
m_Start: 5.816666666666659
m_Start: 5.309999999999999
m_ClipIn: 0
m_Asset: {fileID: -3122718981348184114}
m_Duration: 1.9833333333333334
m_TimeScale: 1
m_ParentTrack: {fileID: -2356389098200647009}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 1.4333333333333451
m_PreExtrapolationTime: 0
m_DisplayName: "\u5F00\u76D6\u4F4D\u7F6E2"
- m_Version: 1
m_Start: 9.700000000000006
m_ClipIn: 0
m_Asset: {fileID: 2825563466496015890}
m_Duration: 8.433333333333334
m_Duration: 0.6100000000000003
m_TimeScale: 1
m_ParentTrack: {fileID: -2356389098200647009}
m_EaseInDuration: 0
@@ -466,7 +364,40 @@ MonoBehaviour:
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: "\u5F00\u76D6\u4F4D\u7F6E3"
m_DisplayName: "\xE5\x8E\xBB\xE6\x8E\x89\xE5\xA4\xB4\xE5\x8F\x91"
- m_Version: 1
m_Start: 7.129999999999999
m_ClipIn: 0
m_Asset: {fileID: 2825563466496015890}
m_Duration: 8.546065599657588
m_TimeScale: 1
m_ParentTrack: {fileID: -2356389098200647009}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: "\xE5\xBC\x80\xE7\x9B\x96"
- m_Version: 1
m_Start: 1.7999999999999992
m_ClipIn: 0
@@ -497,11 +428,11 @@ MonoBehaviour:
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0.5066666666666606
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 1.7999999999999992
m_DisplayName: "\u5F00\u76D6\u5165\u573A"
m_DisplayName: "\xE6\x91\x84\xE5\x83\x8F\xE6\x9C\xBAMOVE"
- m_Version: 1
m_Start: 18.13333333333334
m_Start: 15.676065599657587
m_ClipIn: 0
m_Asset: {fileID: -3812519801109152584}
m_Duration: 2.21
@@ -550,7 +481,7 @@ MonoBehaviour:
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 0
m_DisplayName: "\u5F00\u76D6\u6DE1\u51FA"
m_DisplayName: fade out
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 0
@@ -583,14 +514,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset
m_EditorClassIdentifier:
m_Clip: {fileID: 7400000, guid: d9c424eb3ba15104eaa0e577e921dcc8, type: 2}
m_Clip: {fileID: 4287390306105134998, guid: 57abdfa254b929a41ad47acc62723d29, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Loop: 2
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-1213079535372054611
@@ -643,24 +574,6 @@ MonoBehaviour:
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 5065315139905125119}
--- !u!114 &829122587630962730
MonoBehaviour:
m_ObjectHideFlags: 1
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: f4829557bd9d9be4693187beb9832d89, type: 3}
m_Name: ScreenAsset
m_EditorClassIdentifier:
m_Template:
_scale: 1
_color: {r: 0, g: 0, b: 0, a: 1}
_image:
enabled: 0
value: {fileID: 0}
--- !u!114 &2825563466496015890
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -673,13 +586,35 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset
m_EditorClassIdentifier:
m_Clip: {fileID: 7400000, guid: dffcda368195f464da43eaec5967ce30, type: 2}
m_Clip: {fileID: -5251752014245115510, guid: 57abdfa254b929a41ad47acc62723d29, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 2
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &3546519445531982117
MonoBehaviour:
m_ObjectHideFlags: 1
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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: Recorded
m_EditorClassIdentifier:
m_Clip: {fileID: -8209498039781260208}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 0
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
@@ -741,7 +676,76 @@ MonoBehaviour:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Clips:
- m_Version: 1
m_Start: 17.886065599657588
m_ClipIn: 0
m_Asset: {fileID: 3546519445531982117}
m_Duration: 3.9833333333333334
m_TimeScale: 1
m_ParentTrack: {fileID: 6318702350593778149}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 1
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 17.886065599657588
m_DisplayName: Recorded
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
@@ -758,7 +762,7 @@ MonoBehaviour:
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: -8209498039781260208}
m_InfiniteClip: {fileID: 0}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
@@ -787,7 +791,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -2913520546152221013}
m_Duration: 24.616666666666667
m_Duration: 21.869398932990922
m_TimeScale: 1
m_ParentTrack: {fileID: 6540404704989717095}
m_EaseInDuration: 0
@@ -877,7 +881,7 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 20.34333333333334
m_Start: 17.52939893299093
m_ClipIn: 0
m_Asset: {fileID: 5679315672341742922}
m_Duration: 4.339999999999993
Assets/RawResources/Anima/Open Panel Timeline.playable.meta → Assets/Resources/Art/TimeLineAsset/Open Panel Timeline.playable.meta
View File
Assets/Resources/Prefabs/Basic Function/Clinic System.prefab
+4 -4
View File
@@ -50,7 +50,7 @@ MonoBehaviour:
idx: 0
maxWidth: 800
minWidth: 300
bubbleStyle: {fileID: 11400000, guid: d5f9b20222601bb448b699d56806e310, type: 2}
bubbleStyle: {fileID: 11400000, guid: e3f425b45fd35cc4caf1939eaea2f7bc, type: 2}
pivotType: 0
--- !u!1 &370965206930387002
GameObject:
@@ -512,13 +512,13 @@ MonoBehaviour:
spritePartAssets:
- time: 1
weather: 0
sprite: {fileID: 5712437488912585778, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 2539331036435114140, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 2
weather: 0
sprite: {fileID: 4938109799727607429, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 4326782275659865998, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 0
weather: 0
sprite: {fileID: 9002312518455049841, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -8709910151141876178, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &2615926060114227568
GameObject:
m_ObjectHideFlags: 0
Assets/Resources/Yarn/FP_Prologue/EventNode.yarn
+1 -1
View File
@@ -170,7 +170,7 @@ title: ShockEffect
// <<endif>>
===
title:开盖动画播放结束
title:Cut_End
---
<<set $gameStage=2>>
<<jump Center>>
Assets/Resources/Yarn/FP_Prologue/Stage1_开灯.yarn
+5 -5
View File
@@ -3,7 +3,7 @@ tags:
group: 入口
position: 250,-2611
---
//患者正在发生“原型排异溃解”，表现为患者持续听到一个不存在的声音在说话，同时伴随部分模块的“递归性坏死”——高热且核心完整度不断下降，影响机体的运行体征
//患者正在发生"原型排异溃解"，表现为患者持续听到一个不存在的声音在说话，同时伴随部分模块的"递归性坏死"——高热且核心完整度不断下降，影响机体的运行体征
//医生要处理这些坏死，防止机体整体溃解关机
////需要用两种跳字效果来区分两个人格
<<hide_dialog>>
@@ -27,7 +27,7 @@ jj?: 好了，现在你可以睁开眼睛了。 #line:01c1dfc
// 【画面逐渐变得清晰】
<<dream_fade_in 0.3 1>>
<<dream_fade_in 0.2 1>>
<<wait 1>>
我不敢看得太清楚，不然可能会被我的逻辑模块突然唤醒。 #line:08eb9ab
@@ -160,9 +160,9 @@ position: 250,200
---
// <<wait 0.5>>
// <<fade_out 1>>
<<play_open_timeline>>
<<Open_play_timeline_no_wait "Art/TimeLineAsset/Open Panel Timeline">>
<<fade_out 1>>
<<set $gameStage = 2>>
<<jump Center>>
// <<set $gameStage = 2>>
// <<jump Center>>
===
Assets/Scenes/OpenFixScene.unity
+1275 -1240
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/PeipeiFixScene.unity
+816 -804
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/SubWay.unity
+3 -3
View File
@@ -494,7 +494,7 @@ MonoBehaviour:
mobileObjectDatas:
- itemName: "\u5E7F\u544A\u724C"
direction: {x: -1, y: 0}
speed: {x: 60, y: 60}
speed: {x: 40, y: 40}
mobileType: 1
assetAddressArray:
- "Subway/\u767D\u5929\u7A97\u5916[\u5E7F\u544A\u724C]"
@@ -512,7 +512,7 @@ MonoBehaviour:
isDistanceMode: 1
existTime: 0
existDistance: 50
intervalRange: {x: 79, y: 81}
intervalRange: {x: 5, y: 10}
--- !u!114 &380972590
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1219,7 +1219,7 @@ MonoBehaviour:
isDistanceMode: 1
existTime: 0
existDistance: 50
intervalRange: {x: 3, y: 10}
intervalRange: {x: 1, y: 4}
--- !u!114 &1254024541
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/ScriptableObjects/BubbleStyle/Mini Left Style.asset
+4 -4
View File
@@ -12,10 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
m_Name: Mini Left Style
m_EditorClassIdentifier:
bubblePadding: {x: 20, y: 5, z: 15, w: 20}
bubblePadding: {x: 30, y: 5, z: 15, w: 20}
linePadding: {x: 10, y: 5, z: 10, w: 0}
lineFontSize: 18
lineFontSize: 24
actorPadding: {x: 0, y: 0, z: 0, w: 0}
actorFontSize: 20
actorFontSize: 26
hasActorName: 1
bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846 "
bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846"
Assets/Scripts/FixSystem/Memory/MemoryProcess.cs
-3
View File
@@ -9,10 +9,7 @@ using AibisDream.FixSystem;
using AibisDream.Framework;
using Cinemachine;
using UnityEngine.Rendering;
using System;
using AibisDream.Kit;
using FMODUnity;
public class MemoryProcess : MonoBehaviour
{
Assets/Scripts/FixSystemNew/Open/OpenSystem.cs
+32 -6
View File
@@ -149,12 +149,33 @@ namespace AibisDream
openPlayable.playableAsset = timelineAsset;
BindPlayToolPanel();
// BindDialogController();
openPlayable.Play();
while (openPlayable.state == PlayState.Playing)
{
yield return null;
}
}
public void PlayTimeline_noWait(string timelinePath)
{
// 加载Timeline资源
var timelineAsset = Resources.Load<TimelineAsset>(timelinePath);
if (timelineAsset == null)
{
Debug.LogError($"找不到Timeline资源: {timelinePath}");
return;
}
openPlayable.playableAsset = timelineAsset;
// BindPlayToolPanel();
// BindDialogController();
openPlayable.Play();
}
public void FinishCut()
{
DialogController.Instance.StartDialogNode("Cut_End");
}
}
public static class OpenYarnCommand
@@ -173,18 +194,23 @@ namespace AibisDream
OpenSystem.OpenLightRoom();
}
[YarnCommand("play_open_timeline")]
public static IEnumerator RunTimeline()
{
OpenSystem.PlayOpenTimeline();
yield return null;
}
// [YarnCommand("play__timeline")]
// public static IEnumerator RunTimeline()
// {
// OpenSystem.PlayOpenTimeline();
// yield return null;
// }
[YarnCommand("Open_play_timeline")]
public static IEnumerator PlayTimeline(string timelinePath)
{
yield return OpenSystem.PlayTimeline(timelinePath);
}
[YarnCommand("Open_play_timeline_no_wait")]
public static void PlayTimeline_noWait(string timelinePath)
{
OpenSystem.PlayTimeline_noWait(timelinePath);
}
[YarnCommand("play_timeline_with_bindings")]
public static IEnumerator PlayTimelineWithBindings(string timelinePath, string[] bindingNames)
Assets/Scripts/FixSystemNew/Open/ShockSystem.cs
+3 -3
View File
@@ -102,15 +102,15 @@ public class ShockSystem : MonoBehaviour
{
operationPanelStartPos = operationPanel.localPosition;
}
// 初始化杆的位置
if (lever != null)
{
lever.localRotation = Quaternion.Euler(0, 0, 0);
}
// 根据系统状态初始化灯光
SetSystemPower(isSystemOn);
// // 根据系统状态初始化灯光
// SetSystemPower(isSystemOn);
}
private void Update()
Assets/Scripts/Framework/Config/Character.cs
+2 -1
View File
@@ -1,5 +1,5 @@
using AibisDream.Framework;
using UnityEngine.Localization.Settings;
using UnityEngine;
namespace AibisDream.Kit
{
@@ -29,6 +29,7 @@ namespace AibisDream.Kit
vo.bubbleIdx = BubbleIdx;
vo.role = Role;
vo.dialogViewType = DialogViewType;
return vo;
}
}
Assets/Scripts/Framework/Config/ConfigUtil.cs
+14 -1
View File
@@ -4,6 +4,9 @@ using System.IO;
using System.Linq;
using AibisDream.Framework;
using AibisDream.Utility;
#if UNITY_EDITOR
using UnityEditor;
#endif
using UnityEngine;
namespace AibisDream.Kit
@@ -21,8 +24,18 @@ namespace AibisDream.Kit
/// </summary>
private ConfigUtil()
{
#if UNITY_EDITOR
EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
#endif
}
#if UNITY_EDITOR
private void OnPlayModeStateChanged(PlayModeStateChange state)
{
OnSingletonInit();
}
#endif
/// <summary>
/// 调用时初始化
/// </summary>
Assets/Scripts/Framework/OtherKit/CameraKit.cs
+1 -2
View File
@@ -232,8 +232,7 @@ namespace AibisDream.Framework
public static Vector3 GetMouseWorldPos(Vector3 mousePoint)
{
if (!_mainCam) _mainCam = Camera.main;
mousePoint.z = 0;
return _mainCam.ScreenToWorldPoint(mousePoint);
}
Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs
+8 -8
View File
@@ -30,14 +30,14 @@ namespace AibisDream
#endregion
public event Action<Bubble> OnDisposed;
public event Action<Bubble> OnDisposed;
public bool IsShowingText => _typewriter.isShowingText;
public void LoadConfig(BubbleSlotData data)
{
InitRefs();
role = data.actorRole;
idx = data.idx;
maxWidth = data.maxWidth;
@@ -57,7 +57,7 @@ namespace AibisDream
_actorName.fontSize = bubbleStyle.actorFontSize;
// 是否展示名称
_actorName.gameObject.SetActive(bubbleStyle.hasActorName);
// 锚点相关
_rect.pivot = CommonUtil.GetPivotByType(pivotType);
var spritePath = $"{bubbleStyle.bubbleSpriteAddress}[{pivotType.ToString()}]";
@@ -68,6 +68,7 @@ namespace AibisDream
{
_typewriter = GetComponentInChildren<TypewriterCore>();
_actorName = transform.Find("名称").GetComponent<TMP_Text>();
_typewriter.onTextShowed.RemoveAllListeners();
_typewriter.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown));
// 获取内容文字
_lineText = _typewriter.GetComponent<TMP_Text>();
@@ -128,13 +129,12 @@ namespace AibisDream
}
_layoutElement.minWidth = minWidth;
LayoutRebuilder.ForceRebuildLayoutImmediate(_rect);
}
#if UNITY_EDITOR
[Header("测试参数")]
public int testMinWidth;
[Header("测试参数")] public int testMinWidth;
public int testMaxWidth;
public BubbleStyle testBubbleStyle;
public PivotType testPivotType;
@@ -150,7 +150,7 @@ namespace AibisDream
public void SaveStyle()
{
if (!testBubbleStyle) return;
InitRefs();
testBubbleStyle.linePadding = _lineText.margin;
@@ -159,7 +159,7 @@ namespace AibisDream
testBubbleStyle.actorFontSize = _actorName.fontSize;
testBubbleStyle.BubblePadding = _layoutGroup.padding;
testBubbleStyle.hasActorName = _actorName.gameObject.activeSelf;
}
#endif
Assets/Scripts/UI/Panel/DialogPanel.cs
+24
View File
@@ -0,0 +1,24 @@
using UnityEngine;
namespace AibisDream
{
public class DialogPanel : MonoBehaviour, IUIPanel
{
#region UI面板功能
public bool IsOpen => gameObject.activeSelf;
public bool IsCloseable => false;
public void Show()
{
gameObject.SetActive(true);
}
public void Hide()
{
gameObject.SetActive(false);
}
#endregion
}
}
Assets/Scripts/UI/Panel/DialogPanel.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2ecd4df87fde33d4a8944917a863a6af
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/Config/character.csv
+38 -38
View File
@@ -1,38 +1,38 @@
通过key索引配置,中文名,,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径
Key,Cn,,DialogViewType,Role,NameColor,HeadPicPath,VoicePath
peipei,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP
pp,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP
me,我,Me,Default,Player,,me_head,VO/voice_ME
jj,姐姐,Sister,Default,Player,,me_head,VO/voice_JJ
jj?,柔和女声,???,Default,Player,,me_head,VO/voice_JJ
hs,火山,Huoshan,Default,MainActor,#FFA800,peipei_head,VO/voice_HS
hs?,沙哑男声,???,Default,MainActor,#FFA800,peipei_head,VO/voice_HS
yl,英理,Yingli,Default,MainActor,#4000FF,peipei_head,VO/voice_YL
peipei_novoice,胆怯女声,Timid female voice,Default,Aside,#00FFFF,,VO/voice_PP
yingli_novoice,严厉女声,Stern female voice,Default,Aside,#FFCC00,,
tutorial,教学,Teaching,Default,Aside,,,
docter,儿科医生,Pediatrician,Default,Aside,#FFCC00,,
peipei_child,童年佩佩,Childhood Peipei,Default,Aside,#00FFFF,,VO/voice_PP
unknown,？？？,???,Default,Aside,#FFCC00,,
shitou,石头,Stone,Default,MainActor,,,VO/voice_shitou
Descent,Descent,Descent,Default,Aside,#FFCC00,,VO/voice_me
e-assistant,电子助手,Electronic assistant,Default,Aside,#FFCC00,,VO/voice_me
Gotashi_unknow,戴纯金雕塑头的男人,Man with a pure gold sculpture head,Default,Aside,#FFCC00,,
Linking,连接中……,Connecting...,Screen,Aside,#E6A23C,,
Analysing,分析中,Analyzing...,Screen,Aside,#E6A23C,,
Error,错误警告,Error warning,Screen,Aside,#E6A23C,,
UfModule,UnstableFusion<br>图像生成模块,UnstableFusion image generation module,Screen,Aside,#F56C6C,,
EyeModule,HS9型<br>视觉模块,HS9 type visual module,Screen,Aside,#F56C6C,,
EmoModule,通用型<br>情绪发生模块,Universal emotion generation module,Screen,Aside,#F56C6C,,
MemModule,通用型<br>记忆模块,Universal memory module,Screen,Aside,#F56C6C,,
LogicModule,MK1型<br>逻辑处理模块,MK1 type logic processing module,Screen,Aside,#F56C6C,,
SpeakerModule,MK1型<br>表达模块,MK1 type expression module,Screen,Aside,#F56C6C,,
ChipModule,4R7型<br>色觉晶圆训练槽,4R7 type color perception wafer training slot,Screen,Aside,#F56C6C,,
HeartModule,C03UR型特配<br>涡轮增压动力模块,C03UR special turbocharged power module,Screen,Aside,#E6A23C,,
LungModule,MK1型<br>气体处理模块,MK1 type gas processing module,Screen,Aside,#E6A23C,,
LiverModule,MK1型<br>冷却液循环模块,MK1 type coolant circulation module,Screen,Aside,#E6A23C,,
DigestModule,MK1型<br>物料处理模块,MK1 type material processing module,Screen,Aside,#E6A23C,,
CenterText,,,CenterText,Aside,,,
CenterOption,,,CenterOption,Aside,,,
Task,,,Task,Aside,,,
TempText,,,Default,Aside,,,
通过key索引配置,中文名,,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径,气泡序号（默认0）
Key,Cn,,DialogViewType,Role,NameColor,HeadPicPath,VoicePath,BubbleIdx
peipei,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
pp,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
me,我,Me,Default,Player,,me_head,VO/voice_ME,
jj,姐姐,Sister,Default,Player,,me_head,VO/voice_JJ,
jj?,柔和女声,???,Default,Player,,me_head,VO/voice_JJ,
hs,火山,Huoshan,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
hs?,沙哑男声,???,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
yl,英理,Yingli,Default,MainActor,#4000FF,peipei_head,VO/voice_YL,
peipei_novoice,胆怯女声,Timid female voice,Default,Aside,#00FFFF,,VO/voice_PP,1
yingli_novoice,严厉女声,Stern female voice,Default,Aside,#FFCC00,,,
tutorial,教学,Teaching,Default,Aside,,,,
docter,儿科医生,Pediatrician,Default,Aside,#FFCC00,,,
peipei_child,童年佩佩,Childhood Peipei,Default,Aside,#00FFFF,,VO/voice_PP,
unknown,？？？,???,Default,Aside,#FFCC00,,,
shitou,石头,Stone,Default,MainActor,,,VO/voice_shitou,
Descent,Descent,Descent,Default,Aside,#FFCC00,,VO/voice_me,
e-assistant,电子助手,Electronic assistant,Default,Aside,#FFCC00,,VO/voice_me,
Gotashi_unknow,戴纯金雕塑头的男人,Man with a pure gold sculpture head,Default,Aside,#FFCC00,,,
Linking,连接中……,Connecting...,Screen,Aside,#E6A23C,,,
Analysing,分析中,Analyzing...,Screen,Aside,#E6A23C,,,
Error,错误警告,Error warning,Screen,Aside,#E6A23C,,,
UfModule,UnstableFusion<br>图像生成模块,UnstableFusion image generation module,Screen,Aside,#F56C6C,,,
EyeModule,HS9型<br>视觉模块,HS9 type visual module,Screen,Aside,#F56C6C,,,
EmoModule,通用型<br>情绪发生模块,Universal emotion generation module,Screen,Aside,#F56C6C,,,
MemModule,通用型<br>记忆模块,Universal memory module,Screen,Aside,#F56C6C,,,
LogicModule,MK1型<br>逻辑处理模块,MK1 type logic processing module,Screen,Aside,#F56C6C,,,
SpeakerModule,MK1型<br>表达模块,MK1 type expression module,Screen,Aside,#F56C6C,,,
ChipModule,4R7型<br>色觉晶圆训练槽,4R7 type color perception wafer training slot,Screen,Aside,#F56C6C,,,
HeartModule,C03UR型特配<br>涡轮增压动力模块,C03UR special turbocharged power module,Screen,Aside,#E6A23C,,,
LungModule,MK1型<br>气体处理模块,MK1 type gas processing module,Screen,Aside,#E6A23C,,,
LiverModule,MK1型<br>冷却液循环模块,MK1 type coolant circulation module,Screen,Aside,#E6A23C,,,
DigestModule,MK1型<br>物料处理模块,MK1 type material processing module,Screen,Aside,#E6A23C,,,
CenterText,,,CenterText,Aside,,,,
CenterOption,,,CenterOption,Aside,,,,
Task,,,Task,Aside,,,,
TempText,,,Default,Aside,,,,
1 通过key索引配置 中文名 显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框 人物角色（Player/MainActor/Aside） 名称显示时的颜色 头像Pic路径 语音资源路径 气泡序号（默认0）
2 Key Cn DialogViewType Role NameColor HeadPicPath VoicePath BubbleIdx
3 peipei 佩佩 Peipei Default MainActor #00FFFF peipei_head VO/voice_PP
4 pp 佩佩 Peipei Default MainActor #00FFFF peipei_head VO/voice_PP
5 me 我 Me Default Player me_head VO/voice_ME
6 jj 姐姐 Sister Default Player me_head VO/voice_JJ
7 jj? 柔和女声 ??? Default Player me_head VO/voice_JJ
8 hs 火山 Huoshan Default MainActor #FFA800 peipei_head VO/voice_HS
9 hs? 沙哑男声 ??? Default MainActor #FFA800 peipei_head VO/voice_HS
10 yl 英理 Yingli Default MainActor #4000FF peipei_head VO/voice_YL
11 peipei_novoice 胆怯女声 Timid female voice Default Aside #00FFFF VO/voice_PP 1
12 yingli_novoice 严厉女声 Stern female voice Default Aside #FFCC00
13 tutorial 教学 Teaching Default Aside
14 docter 儿科医生 Pediatrician Default Aside #FFCC00
15 peipei_child 童年佩佩 Childhood Peipei Default Aside #00FFFF VO/voice_PP
16 unknown ？？？ ??? Default Aside #FFCC00
17 shitou 石头 Stone Default MainActor VO/voice_shitou
18 Descent Descent Descent Default Aside #FFCC00 VO/voice_me
19 e-assistant 电子助手 Electronic assistant Default Aside #FFCC00 VO/voice_me
20 Gotashi_unknow 戴纯金雕塑头的男人 Man with a pure gold sculpture head Default Aside #FFCC00
21 Linking 连接中…… Connecting... Screen Aside #E6A23C
22 Analysing 分析中 Analyzing... Screen Aside #E6A23C
23 Error 错误警告 Error warning Screen Aside #E6A23C
24 UfModule UnstableFusion<br>图像生成模块 UnstableFusion image generation module Screen Aside #F56C6C
25 EyeModule HS9型<br>视觉模块 HS9 type visual module Screen Aside #F56C6C
26 EmoModule 通用型<br>情绪发生模块 Universal emotion generation module Screen Aside #F56C6C
27 MemModule 通用型<br>记忆模块 Universal memory module Screen Aside #F56C6C
28 LogicModule MK1型<br>逻辑处理模块 MK1 type logic processing module Screen Aside #F56C6C
29 SpeakerModule MK1型<br>表达模块 MK1 type expression module Screen Aside #F56C6C
30 ChipModule 4R7型<br>色觉晶圆训练槽 4R7 type color perception wafer training slot Screen Aside #F56C6C
31 HeartModule C03UR型特配<br>涡轮增压动力模块 C03UR special turbocharged power module Screen Aside #E6A23C
32 LungModule MK1型<br>气体处理模块 MK1 type gas processing module Screen Aside #E6A23C
33 LiverModule MK1型<br>冷却液循环模块 MK1 type coolant circulation module Screen Aside #E6A23C
34 DigestModule MK1型<br>物料处理模块 MK1 type material processing module Screen Aside #E6A23C
35 CenterText CenterText Aside
36 CenterOption CenterOption Aside
37 Task Task Aside
38 TempText Default Aside