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

问题修复

Browse Source 
1. 指针切换问题
2. 不同分辨率适配问题
This commit is contained in:
dingyuntian
2025-03-19 15:46:06 +08:00
parent 6c72fd74d3
commit 72f63d8598
19 changed files with 1380 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Font/Chusung-220206 SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/齿轮/屏幕适应遮罩.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/齿轮/屏幕适应遮罩.png.meta
+153
View File
@@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 6cc1227684b7e6742ad1b9946b766592
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/Resources/Prefabs/FontAsset/VonwaonBitmap-16px SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/Resources/Prefabs/FontAsset/字小魂清水体(商用需授权) SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/Resources/Prefabs/UI/Aside Text.prefab
+3 -2
View File
@@ -102,6 +102,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
role: 0
idx: 0
maxCharNum: 27
--- !u!114 &2069893582614801070
MonoBehaviour:
@@ -202,8 +203,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Box.prefab
+38 -38
View File
@@ -18,7 +18,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8421241559617079726
RectTransform:
m_ObjectHideFlags: 0
@@ -35,8 +35,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 601.75, y: -173.93996}
m_SizeDelta: {x: 916.934, y: 171.4201}
m_AnchoredPosition: {x: 437, y: -151}
m_SizeDelta: {x: 760, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5975286064066965976
MonoBehaviour:
@@ -139,8 +139,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -630, y: 150}
m_SizeDelta: {x: 196.84, y: 90}
m_AnchoredPosition: {x: -458, y: 95}
m_SizeDelta: {x: 0, y: 90}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3498389414712684730
CanvasRenderer:
@@ -163,7 +163,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -247,16 +247,16 @@ RectTransform:
m_GameObject: {fileID: 5890622946834639560}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.2, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7131956091114956203}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -142.28, y: 67.7}
m_AnchoredPosition: {x: -60, y: 35}
m_SizeDelta: {x: 32, y: 19}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.49999997, y: 0.49999982}
--- !u!222 &5639890485129627689
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -313,7 +313,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7131956091114956203
RectTransform:
m_ObjectHideFlags: 0
@@ -425,8 +425,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 613, y: -170}
m_SizeDelta: {x: 939.4397, y: 132.6784}
m_AnchoredPosition: {x: 433, y: -150}
m_SizeDelta: {x: 750, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8735059991624197031
CanvasRenderer:
@@ -450,16 +450,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
m_text: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~<br>\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -483,19 +483,19 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 46
m_fontSizeBase: 46
m_fontSize: 32
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_HorizontalAlignment: 8
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterSpacing: 3
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacing: 32
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
@@ -504,7 +504,7 @@ MonoBehaviour:
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableKerning: 0
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@@ -519,7 +519,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 0, y: 0, z: -11.698608, w: -5.858551}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@@ -633,11 +633,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5969022388722944562}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -45}
m_SizeDelta: {x: 96.84, y: 50.000004}
m_Pivot: {x: 0, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6323810537521366264
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -668,17 +668,17 @@ MonoBehaviour:
m_Calls: []
m_text: "\u82F1\u7406"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 3238002687
m_fontColor: {r: 1, g: 1, b: 1, a: 0.7529412}
m_enableVertexGradient: 0
m_colorMode: 3
m_colorMode: 0
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
@@ -693,13 +693,13 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 50
m_fontSizeBase: 50
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_fontStyle: 8
m_HorizontalAlignment: 1
m_VerticalAlignment: 4096
m_textAlignment: 65535
@@ -709,7 +709,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@@ -729,7 +729,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: -0.00021362305, w: 0}
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab
+2 -2
View File
@@ -203,8 +203,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble Left.prefab
+3 -2
View File
@@ -132,6 +132,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
role: 2
idx: 0
maxCharNum: 14
--- !u!1 &6816142221905378472
GameObject:
@@ -202,8 +203,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab
+3 -2
View File
@@ -69,8 +69,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -344,4 +344,5 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
role: 1
idx: 0
maxCharNum: 14
Assets/Resources/Prefabs/UI/Bubble Right.prefab
+3 -2
View File
@@ -69,8 +69,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -344,4 +344,5 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
role: 1
idx: 0
maxCharNum: 14
Assets/Resources/Prefabs/UI/Center Choice Button.prefab
+2 -2
View File
@@ -188,8 +188,8 @@ MonoBehaviour:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Choice Button.prefab
+5 -5
View File
@@ -233,8 +233,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u9009\u9879\u4E00"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -258,15 +258,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 46
m_fontSizeBase: 46
m_fontSize: 32
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
Assets/Scenes/Persistence.unity
+40 -288
View File
@@ -4063,9 +4063,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -54.599014}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237392156
@@ -7989,7 +7989,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &533176308
RectTransform:
m_ObjectHideFlags: 0
@@ -8053,7 +8053,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1992781380}
m_HandleRect: {fileID: 1992781379}
m_Direction: 0
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -10030,10 +10030,10 @@ MonoBehaviour:
- {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
- {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
- {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2}
runMode: 0
runMode: 2
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED"
saveFileName: "PeipeiDay2_\u505C\u6B62\u60F3\u8C61"
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -10506,8 +10506,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 485, y: 80.70001}
m_SizeDelta: {x: 950, y: 918.6}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &761395784
MonoBehaviour:
@@ -10582,8 +10582,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 485, y: 80.70001}
m_SizeDelta: {x: 950, y: 918.6}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &773911911
MonoBehaviour:
@@ -12437,10 +12437,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1693917954}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 485, y: 80.70001}
m_SizeDelta: {x: 950, y: 918.6}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &927888435
MonoBehaviour:
@@ -12988,7 +12988,7 @@ MonoBehaviour:
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
@@ -14512,7 +14512,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1145374179
MonoBehaviour:
@@ -14529,8 +14529,8 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Top: 30
m_Bottom: 30
m_ChildAlignment: 1
m_Spacing: 10
m_ChildForceExpandWidth: 1
@@ -16359,281 +16359,33 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1604842429}
m_Modifications:
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_text
value: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~<br>\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01"
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontSize
value: 32
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_margin.w
value: -5.858551
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_margin.z
value: -11.698608
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontStyle
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_isRichText
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_lineSpacing
value: 32
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_spriteAsset
value:
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontSizeBase
value: 32
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_overflowMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_RaycastTarget
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableKerning
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_characterSpacing
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableAutoSizing
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_TextStyleHashCode
value: -1183493901
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_VerticalAlignment
value: 256
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_horizontalMapping
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: checkPaddingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableExtraPadding
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_wordWrappingRatios
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_HorizontalAlignment
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_parseCtrlCharacters
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_useMaxVisibleDescender
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1596915540455727478, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_IsTextObjectScaleStatic
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontSize
value: 36
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_margin.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_colorMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontStyle
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontColor.a
value: 0.7529412
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontSizeBase
value: 36
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableAutoSizing
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_fontColor32.rgba
value: 3238002687
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_VerticalAlignment
value: 4096
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableWordWrapping
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_overrideHtmlColors
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_enableVertexGradient
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256868743146392351, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_IsTextObjectScaleStatic
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Pivot.x
value: 0.49999997
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Pivot.y
value: 0.49999982
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.x
value: -60
objectReference: {fileID: 0}
- target: {fileID: 2340543909228546517, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 35
objectReference: {fileID: 0}
- target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_SizeDelta.x
value: 750
objectReference: {fileID: 0}
- target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_SizeDelta.y
value: 140
objectReference: {fileID: 0}
- target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.x
value: 433
objectReference: {fileID: 0}
- target: {fileID: 4013473223034251771, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.y
value: -150
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 72.01
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 50.000004
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 86.005005
objectReference: {fileID: 0}
- target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Color.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5659732676396959192, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Color.r
value: 0
value: -45
objectReference: {fileID: 0}
- target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.x
value: -458
objectReference: {fileID: 0}
- target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_AnchoredPosition.y
value: 95
value: 172.01001
objectReference: {fileID: 0}
- target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Name
@@ -16641,7 +16393,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
propertyPath: m_Pivot.x
@@ -18447,7 +18199,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: -17}
m_SizeDelta: {x: -17, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1463491729
MonoBehaviour:
@@ -20496,9 +20248,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -163.79704}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1596715192
@@ -21001,9 +20753,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -272.99506}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611684201
@@ -21941,10 +21693,10 @@ RectTransform:
- {fileID: 927888434}
m_Father: {fileID: 984233631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -485, y: -80.7}
m_SizeDelta: {x: 970, y: 161.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1694277408
GameObject:
@@ -23397,7 +23149,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1788453626
RectTransform:
m_ObjectHideFlags: 0
@@ -26424,7 +26176,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 100}
m_AnchoredPosition: {x: 0, y: 54}
m_SizeDelta: {x: 700, y: 550}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2038437603
Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+2
View File
@@ -83,7 +83,9 @@ namespace AibisDream.FixSystem
// 逐个字符添加
yield return DOTween.To(() => text.text.Length, x => UpdateText(x, targetText, oldText), targetLength,
targetText.Length * typeSpeed).WaitForCompletion();
EnumEventSystem.Global.Send(DialogEventEnum.LineShown);
yield return new WaitForSeconds(0.5f);
EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
_nextStep.Invoke();
}
Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs
-2
View File
@@ -68,8 +68,6 @@ namespace AibisDream
var duration = 1 / Mathf.Abs(initSpeed * speedRadio);
var target = speedRadio >= 0 ? new Vector3(0, 0, 360) : new Vector3(0, 0, -360);
Debug.Log("Rotate");
_rotateTween = gear.DORotate(target, duration, RotateMode.LocalAxisAdd)
.SetEase(Ease.Linear)
.SetLoops(-1, LoopType.Incremental);
Assets/Scripts/UI/DialogUI/DialogBoxBase.cs
+1 -1
View File
@@ -203,7 +203,7 @@ namespace AibisDream
else
{
_actorName.transform.parent.localPosition =
character.key == "me" ? new Vector3(460, 150, 0) : new Vector3(-630, 150, 0);
character.key == "me" ? new Vector3(310, 95, 0) : new Vector3(-458, 95, 0);
_actorName.transform.parent.gameObject.SetActive(true);
_actorName.text = character.GetActorName();
Assets/StreamingAssets/Config/sprite_group.json
+1114 -1
View File
File diff suppressed because one or more lines are too long