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

Merge branch 'feature/bubble' into 'develop'

Browse Source 
Feature/bubble

See merge request aibis-dream/aibis-dream!292
This commit is contained in:
dingyuntian
2025-03-08 13:48:32 +00:00
parent 92fd486d69 0d7ef2fe4e
commit f19a6018bc
8 changed files with 454 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/RawResources/齿轮/场外气泡3.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/齿轮/场外气泡3.png.meta
+153
View File
@@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 5f8db6ae003ae0f449e77e8df3bd9556
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: 215
spriteBorder: {x: 0, y: 0, z: 68, w: 53}
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: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/RawResources/齿轮/场外气泡4.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/齿轮/场外气泡4.png.meta
+153
View File
@@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: a1a333888259d9f46a66d7d57b2a8716
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: 215
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/Resources/Prefabs/UI/Bubble Left Bottom.prefab
+4 -3
View File
@@ -69,7 +69,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 79e04f9b22fb71d4c8009e561c6e2849, type: 3}
m_Sprite: {fileID: 21300000, guid: 5f8db6ae003ae0f449e77e8df3bd9556, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -94,8 +94,8 @@ MonoBehaviour:
m_Padding:
m_Left: 30
m_Right: 45
m_Top: 30
m_Bottom: 50
m_Top: 50
m_Bottom: 30
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
@@ -132,6 +132,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
role: 2
idx: 1
maxCharNum: 14
--- !u!1 &6816142221905378472
GameObject:
Assets/Scenes/ClinicOut.unity
+127
View File
@@ -10565,6 +10565,7 @@ RectTransform:
- {fileID: 683476662073257099}
- {fileID: 146077694}
- {fileID: 2071726610}
- {fileID: 6077222920005442532}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -18415,6 +18416,132 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3}
m_PrefabInstance: {fileID: 7283383166883411261}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6077222920005442531
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 370776970}
m_Modifications:
- target: {fileID: 4266339626480639172, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_Name
value: Bubble Left Bottom
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_Pivot.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 647
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 268
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
--- !u!224 &6077222920005442532 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
m_PrefabInstance: {fileID: 6077222920005442531}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7283383166883411261
PrefabInstance:
m_ObjectHideFlags: 0
Assets/Scenes/Persistence.unity
+4 -4
View File
@@ -4697,10 +4697,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
ambEvent:
Guid:
Data1: -1978560838
Data2: 1285599156
Data3: -1740780130
Data4: -337441980
Data1: 1700888787
Data2: 1189708601
Data3: 1610383794
Data4: -1468709119
Path: event:/Amb/amb
--- !u!1 &387510857
GameObject:
Assets/Scripts/Utility/YarnUtil.cs
+7 -10
View File
@@ -35,16 +35,13 @@ namespace AibisDream.Utility
// 直接写就使用配置选项
if (characterAttribute.Properties.TryGetValue("name", out var nameValue))
{
return GetCharacterVoByKey(nameValue.StringValue);
}
// 带key就说明可能有自定义属性
if (characterAttribute.Properties.TryGetValue("key", out var keyValue))
{
// 先从配置文件找
var charVo = GetCharacterVoByKey(keyValue.StringValue);
// 再用自定义填充
return FullCharVoWithProps(charVo, characterAttribute.Properties);
var charVo = GetCharacterVoByKey(nameValue.StringValue);
if (characterAttribute.Properties.Count > 1)
{
charVo = FullCharVoWithProps(charVo, characterAttribute.Properties);
}
return charVo;
}
// 找不到Name和Key