diff --git a/Assets/Animation/天桥上场景导出.controller b/Assets/Animation/天桥上场景导出.controller index ae9cc6108..03903067b 100644 --- a/Assets/Animation/天桥上场景导出.controller +++ b/Assets/Animation/天桥上场景导出.controller @@ -52,7 +52,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u5929\u6865\u4E0A\u573A\u666F\u5BFC\u51FA_Clip" - m_Speed: 0.5 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/character1.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/character1.controller index d317694ae..fb5158f20 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/character1.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/character1.controller @@ -60,7 +60,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: A - m_Speed: 0.6 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/character2.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/character2.controller index 92c6ec23f..bb7eb346c 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/character2.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/character2.controller @@ -139,7 +139,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: B - m_Speed: 0.85 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/character3.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/character3.controller index 3074de21f..80fff6179 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/character3.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/character3.controller @@ -34,7 +34,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: C - m_Speed: 0.7 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/character4.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/character4.controller index 630c1f0ab..0e57c41c0 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/character4.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/character4.controller @@ -8,7 +8,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: D - m_Speed: 0.7 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/character5.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/character5.controller index 219cdbe62..f6ac04bde 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/character5.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/character5.controller @@ -8,7 +8,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: E - m_Speed: 0.7 + m_Speed: 0.25 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Art/Background/Out/Animation/Controller/诊室附近树叶动画.controller b/Assets/Resources/Art/Background/Out/Animation/Controller/诊室附近树叶动画.controller index 5577e1e1a..1724b1a1a 100644 --- a/Assets/Resources/Art/Background/Out/Animation/Controller/诊室附近树叶动画.controller +++ b/Assets/Resources/Art/Background/Out/Animation/Controller/诊室附近树叶动画.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8864670545685273063 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-7194530936673588502 AnimatorStateMachine: serializedVersion: 6 @@ -10,8 +36,8 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 6922459302446706988} - m_Position: {x: 340, y: 70, z: 0} + m_State: {fileID: -8864670545685273063} + m_Position: {x: 370.7092, y: 167.695, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +47,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 6922459302446706988} + m_DefaultState: {fileID: -8864670545685273063} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -44,29 +70,3 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &6922459302446706988 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LEAF - m_Speed: 0.2 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 399208ced4b342e41b4f9bda15cfb0b9, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab index d6b24981e..bbb7f0016 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab @@ -98,5 +98,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: direction: {x: -1, y: 0} - speed: 2 + speed: 1 defaultFacingRight: 0 diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab index a7d2e291a..b9a8fa3f4 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab @@ -102,5 +102,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: direction: {x: 1, y: 0} - speed: 2 + speed: 1 defaultFacingRight: 1 diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab index 339e2ad8e..35e0c0975 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab @@ -102,5 +102,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: direction: {x: 1, y: 0} - speed: 1.8 + speed: 1 defaultFacingRight: 1 diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab index 885fe1ed2..bfcc62016 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab @@ -102,5 +102,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: direction: {x: 1, y: 0} - speed: 1.55 + speed: 1 defaultFacingRight: 1 diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab index 6d21e5a9f..f97f939ab 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab @@ -102,5 +102,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: direction: {x: 1, y: 0} - speed: 1.9 + speed: 1 defaultFacingRight: 1 diff --git a/Assets/Resources/Art/Fix/Peipei/UFheatMap.png b/Assets/Resources/Art/Fix/Peipei/UFheatMap.png index e0ab2ac74..3b27533ce 100644 --- a/Assets/Resources/Art/Fix/Peipei/UFheatMap.png +++ b/Assets/Resources/Art/Fix/Peipei/UFheatMap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17311bc9076d7a45cb745a77356da97acac93f658fed77a88f767c2da29fceeb -size 13701 +oid sha256:49aa8087139c7c94a2da1acc08b182d5a576b22b0d2806cbd14227876b926f48 +size 86773 diff --git a/Assets/Resources/Art/Fix/收藏夹.meta b/Assets/Resources/Art/Fix/收藏夹.meta new file mode 100644 index 000000000..d147a974b --- /dev/null +++ b/Assets/Resources/Art/Fix/收藏夹.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6dfbb3742bd3a7b44b6a9c1a89100950 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Fix/收藏夹/托盘.png b/Assets/Resources/Art/Fix/收藏夹/托盘.png new file mode 100644 index 000000000..8d66bd456 --- /dev/null +++ b/Assets/Resources/Art/Fix/收藏夹/托盘.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9819f300ca622241f3b91cc732cfd671d2849bba4f2df3d3ad7ce00c50296244 +size 241683 diff --git a/Assets/Resources/Art/Fix/收藏夹/托盘.png.meta b/Assets/Resources/Art/Fix/收藏夹/托盘.png.meta new file mode 100644 index 000000000..effa87da1 --- /dev/null +++ b/Assets/Resources/Art/Fix/收藏夹/托盘.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ac4c32ca3c3c14a458cbedba36108e2b +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: 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: 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: diff --git a/Assets/Resources/Art/Fix/放映机/放映机.psb b/Assets/Resources/Art/Fix/放映机/放映机.psb index a284ce5f3..08140e5e3 100644 --- a/Assets/Resources/Art/Fix/放映机/放映机.psb +++ b/Assets/Resources/Art/Fix/放映机/放映机.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7376fecfaafc2a698b6b15d78b542121e148cb0751a94944354e6d7cf1588635 -size 9953925 +oid sha256:3fc2a336c3a58ecadafc571e6d7a29a09ae48e79a8ce064cef5b3e804b0a9f05 +size 9948599 diff --git a/Assets/Resources/Art/Fix/检索UI.meta b/Assets/Resources/Art/Fix/检索UI.meta new file mode 100644 index 000000000..33a4d0405 --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d78f7edf45853834ea5426ae44594859 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Fix/检索UI/检索UI.psb b/Assets/Resources/Art/Fix/检索UI/检索UI.psb new file mode 100644 index 000000000..bb01355d9 --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/检索UI.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:454f3a01fc8ad361c491899e38d245b184f47641f3bb40c98fec3eb38af9106a +size 48926827 diff --git a/Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta b/Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta new file mode 100644 index 000000000..0e8b4ba2f --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta @@ -0,0 +1,752 @@ +fileFormatVersion: 2 +guid: 4bdeba1a971eef34fac588620fcedeb3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + 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: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u56DB\u89D2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3852 + y: 2172 + width: 3526 + height: 1984 + spriteID: 138990630a08f5a499262721934814a3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3852, y: 2172} + spritePosition: {x: 170, y: 88} + - name: "\u8B66\u793A\u7B26\u53F7" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 7079 + width: 1780 + height: 166 + spriteID: 15b13be2fab455e4e9d3943337405af3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 7079} + spritePosition: {x: 1041, y: 1211} + - name: " \u6B63\u5728\u5411\u89C6\u89C9\u975E\u6CD5\u5199\u5165\u8272\u5F69\u6570\u636E\uFF0C\u662F\u5426\u6253\u5370\u7D22\u5F15 " + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 7253 + width: 1249 + height: 60 + spriteID: 807c22f3542d3954c8b1a520bd67763f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 7253} + spritePosition: {x: 1304, y: 1263} + - name: CONFIRM + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 7321 + width: 658 + height: 90 + spriteID: aa307252bb158d442bfe4df4d3517c8b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 7321} + spritePosition: {x: 1597, y: 964} + - name: "\u786E\u8BA4\u6309\u94AE\u6A59\u8272\u5E95" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1792 + y: 7079 + width: 1838 + height: 146 + spriteID: dc5b59dde8d4592498052bbe64598db9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1792, y: 7079} + spritePosition: {x: 1015, y: 935} + - name: "\u4FE1\u606F\u6846\u8FB9\u6846" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 6508 + width: 1899 + height: 563 + spriteID: a68b44aebf06e0b40a1af7845f1b1475 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 6508} + spritePosition: {x: 983, y: 875} + - name: "\u4FE1\u606F\u6846\u9ED1\u5E95" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1911 + y: 6508 + width: 1897 + height: 557 + spriteID: 3adfb3cec26813a42bf08d4dcc315224 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1911, y: 6508} + spritePosition: {x: 983, y: 879} + - name: "\u6697\u8FB9" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 3840 + height: 2160 + spriteID: 93500016c546a8e4293d0771ea5dde29 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} + - name: "\u9ED1\u5E95 " + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 2172 + width: 3840 + height: 2160 + spriteID: 9293e1434e243334d83f9f6686eda6ba + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2172} + spritePosition: {x: 0, y: 0} + - name: "\u80CC\u666F" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4340 + width: 3840 + height: 2160 + spriteID: cd91f53a1b5e64148a162cf20af3f387 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4340} + spritePosition: {x: 0, y: 0} + - name: "\u80CC\u666F" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3852 + y: 4 + width: 3840 + height: 2160 + spriteID: 9a800add9e67c2e4194cab4e5d252c7b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3852, y: 4} + spritePosition: {x: 0, y: 0} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: [] + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u975E\u6CD5\u8FDB\u7A0B\u68C0\u6D4B" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 377307a2526af6447b206eca2d70c1b5 + layerID: 108 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u56DB\u89D2" + spriteName: "\u56DB\u89D2" + isGroup: 0 + parentIndex: 0 + spriteID: 138990630a08f5a499262721934814a3 + layerID: 144 + mosaicPosition: {x: 3852, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8B66\u793A\u7B26\u53F7" + spriteName: "\u8B66\u793A\u7B26\u53F7" + isGroup: 0 + parentIndex: 0 + spriteID: 15b13be2fab455e4e9d3943337405af3 + layerID: 263 + mosaicPosition: {x: 4, y: 7079} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: " \u6B63\u5728\u5411\u89C6\u89C9\u975E\u6CD5\u5199\u5165\u8272\u5F69\u6570\u636E\uFF0C\u662F\u5426\u6253\u5370\u7D22\u5F15 " + spriteName: " \u6B63\u5728\u5411\u89C6\u89C9\u975E\u6CD5\u5199\u5165\u8272\u5F69\u6570\u636E\uFF0C\u662F\u5426\u6253\u5370\u7D22\u5F15 " + isGroup: 0 + parentIndex: 0 + spriteID: 807c22f3542d3954c8b1a520bd67763f + layerID: 227 + mosaicPosition: {x: 4, y: 7253} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: CONFIRM + spriteName: CONFIRM + isGroup: 0 + parentIndex: 0 + spriteID: aa307252bb158d442bfe4df4d3517c8b + layerID: 113 + mosaicPosition: {x: 4, y: 7321} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u786E\u8BA4\u6309\u94AE\u6A59\u8272\u5E95" + spriteName: "\u786E\u8BA4\u6309\u94AE\u6A59\u8272\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: dc5b59dde8d4592498052bbe64598db9 + layerID: 111 + mosaicPosition: {x: 1792, y: 7079} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4FE1\u606F\u6846\u8FB9\u6846" + spriteName: "\u4FE1\u606F\u6846\u8FB9\u6846" + isGroup: 0 + parentIndex: 0 + spriteID: a68b44aebf06e0b40a1af7845f1b1475 + layerID: 233 + mosaicPosition: {x: 4, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4FE1\u606F\u6846\u9ED1\u5E95" + spriteName: "\u4FE1\u606F\u6846\u9ED1\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: 3adfb3cec26813a42bf08d4dcc315224 + layerID: 214 + mosaicPosition: {x: 1911, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6697\u8FB9" + spriteName: "\u6697\u8FB9" + isGroup: 0 + parentIndex: 0 + spriteID: 93500016c546a8e4293d0771ea5dde29 + layerID: 146 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u9ED1\u5E95 " + spriteName: "\u9ED1\u5E95 " + isGroup: 0 + parentIndex: 0 + spriteID: 9293e1434e243334d83f9f6686eda6ba + layerID: 213 + mosaicPosition: {x: 4, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: "\u80CC\u666F" + isGroup: 0 + parentIndex: 0 + spriteID: cd91f53a1b5e64148a162cf20af3f387 + layerID: 107 + mosaicPosition: {x: 4, y: 4340} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6570\u636E\u68C0\u7D22" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 21fd487373df493419b7391b887e5922 + layerID: 78 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u5E95\u90E8\u6A2A\u7EBF" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: 4ef6216ac8e2de140bb5f3694fa5df71 + layerID: 116 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8272\u89C9\u6676\u5706\u8BAD\u7EC3\u69FD" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: fa49e3c9288754a40b95ca4da00b5240 + layerID: 149 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: 50% + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: 569bedb59a0e61641bab6411b2b489aa + layerID: 80 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6EDA\u52A8\u6587\u5B57" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: c78f43449dbb6b045b5dba22005a1284 + layerID: 77 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: b3e4bd9d51fc77442a21ff8ffd90753a + layerID: 136 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: ac8ca5341c72de945bef8f47a6b730ac + layerID: 74 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4FE1\u606F\u680F" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: d024c51f858941b4faae218667d25f87 + layerID: 81 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6697\u8FB9" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: eeef20a172af9164f92b0ed7063037c5 + layerID: 97 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: 353e5493e345820489ca1e9f57017fb9 + layerID: 73 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: + isGroup: 0 + parentIndex: 11 + spriteID: 88e2f6876b9b83e40b3b71a267088059 + layerID: 72 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u89D2\u8272\u68C0\u7D22" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 9c30b7ff67f467f47b33bcf9e3f3e1b6 + layerID: 18 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u5E95\u90E8\u6A2A\u7EBF" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: c19c51ded7eecb047867cbbee5083f93 + layerID: 142 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u60C5\u7EEA\u8868" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: c635d9c5dbeaeae46a348f749768640d + layerID: 61 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u60C5\u7EEA\u8FDB\u5EA6\u8868" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 85e52b1fc4d430e4aa0c1b1475e7042b + layerID: 71 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6EDA\u52A8\u6587\u5B57" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: e6ca484825d753843a40cb869d2d6347 + layerID: 66 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: 50% + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 613ae40df9f54bd43b942d37872017cc + layerID: 16 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u7EFF\u8272\u8FDB\u5EA6\u6761" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 07b91ee6988bfc544afb72d08a418af6 + layerID: 89 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: c55da13ddb901184faf33b04ecf7bab6 + layerID: 14 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4EBA\u7269\u626B\u63CF\u8868\u73B0" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 14aba97f60605ad4a8253924dc05d3a1 + layerID: 38 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4EBA\u7269\u8BC6\u522B\u6846" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 686346ca059d14d45bdad4915468fd70 + layerID: 3 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4FE1\u606F\u680F\u8FB9\u6846" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 671ae1d5a8d157e4fb08fdeeca6f81c2 + layerID: 7 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4FE1\u606F\u680F\u534A\u900F\u660E\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 499482201a56d1c40ad5d424d5f78ad0 + layerID: 49 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u6697\u8FB9" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: 69aae1e3213fbf64b87668f869f3de4c + layerID: 96 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: dea5facd715225c4a8de90b725a36db1 + layerID: 68 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: + isGroup: 0 + parentIndex: 22 + spriteID: f5c280e405774f544a6808632e0c9b97 + layerID: 2 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: "\u80CC\u666F" + isGroup: 0 + parentIndex: -1 + spriteID: 9a800add9e67c2e4194cab4e5d252c7b + layerID: 1 + mosaicPosition: {x: 3852, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Art/Fix/温控器/温控器 1.psb b/Assets/Resources/Art/Fix/温控器/温控器 1.psb deleted file mode 100644 index d8353a392..000000000 --- a/Assets/Resources/Art/Fix/温控器/温控器 1.psb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78041b93345614a4a3c0bee01e884381de0153a42aaa72022e63b2e19f5f95f1 -size 1315084 diff --git a/Assets/Resources/Art/Fix/温控器/温控器(2).psb b/Assets/Resources/Art/Fix/温控器/温控器(2).psb new file mode 100644 index 000000000..a396b39b1 --- /dev/null +++ b/Assets/Resources/Art/Fix/温控器/温控器(2).psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e3673bc35034eb62bbe4dfb0bf6d29cee09209315cc16c7c440cfe700611177 +size 1395624 diff --git a/Assets/Resources/Art/Fix/温控器/温控器 1.psb.meta b/Assets/Resources/Art/Fix/温控器/温控器(2).psb.meta similarity index 78% rename from Assets/Resources/Art/Fix/温控器/温控器 1.psb.meta rename to Assets/Resources/Art/Fix/温控器/温控器(2).psb.meta index 78ce24270..9b424b77c 100644 --- a/Assets/Resources/Art/Fix/温控器/温控器 1.psb.meta +++ b/Assets/Resources/Art/Fix/温控器/温控器(2).psb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af0c993887e3e7e4a8ec5ea614265c94 +guid: 079f757a9919f014eac74bd37bdf023f ScriptedImporter: internalIDToNameTable: [] externalObjects: {} @@ -105,7 +105,7 @@ ScriptedImporter: y: 4 width: 703 height: 704 - spriteID: 8a0019c77539efb4a8ef129b7668c0d9 + spriteID: 0e855a1861950e043b25b9f14d71d763 spriteBone: [] spriteOutline: [] vertices: [] @@ -115,7 +115,7 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 2669, y: 4} spritePosition: {x: 44, y: 8} - - name: "\u6309\u94AE" + - name: disable originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -126,7 +126,7 @@ ScriptedImporter: y: 716 width: 191 height: 212 - spriteID: 4e46a4bd6cc574742bbdbaa50fced38b + spriteID: 0e19019fbf5e3d648a65b422de38383a spriteBone: [] spriteOutline: [] vertices: [] @@ -136,6 +136,48 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 2669, y: 716} spritePosition: {x: 754, y: 429} + - name: "\u6309\u94AE" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2868 + y: 716 + width: 191 + height: 212 + spriteID: df61e0439b7417e4e9816e15e3b813f2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2868, y: 716} + spritePosition: {x: 754, y: 429} + - name: "\u6309\u4E0B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3067 + y: 716 + width: 155 + height: 199 + spriteID: 8cefea34640ec9b47b8e6706c788b1d8 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3067, y: 716} + spritePosition: {x: 763, y: 440} - name: "\u6E29\u63A7\u5668 " originalName: pivot: {x: 0.5, y: 0.5} @@ -147,7 +189,7 @@ ScriptedImporter: y: 4 width: 2657 height: 718 - spriteID: a668fcd0f8a7c154da3ba9c448c7ff7a + spriteID: c1ad0013322638c42960ea78b1bcf905 spriteBone: [] spriteOutline: [] vertices: [] @@ -168,7 +210,7 @@ ScriptedImporter: y: 4 width: 653 height: 655 - spriteID: 8507261c86be68d4cac19f17617c4bd2 + spriteID: 0bbed31efc7752147bd483a07bfe287a spriteBone: [] spriteOutline: [] vertices: [] @@ -252,7 +294,7 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: -1 - spriteID: f0bed0715a446e84b9402ff288652082 + spriteID: 8b6d23c1bd88307458d8bf4695fffbce layerID: 7 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -262,19 +304,39 @@ ScriptedImporter: spriteName: "\u6E29\u5EA6\u68C0\u6D4B\u4EEA" isGroup: 0 parentIndex: 0 - spriteID: 8a0019c77539efb4a8ef129b7668c0d9 + spriteID: 0e855a1861950e043b25b9f14d71d763 layerID: 6 mosaicPosition: {x: 2669, y: 4} flatten: 0 isImported: 1 isVisible: 1 + - name: disable + spriteName: disable + isGroup: 0 + parentIndex: 0 + spriteID: 0e19019fbf5e3d648a65b422de38383a + layerID: 20 + mosaicPosition: {x: 2669, y: 716} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u6309\u94AE" spriteName: "\u6309\u94AE" isGroup: 0 parentIndex: 0 - spriteID: 4e46a4bd6cc574742bbdbaa50fced38b + spriteID: df61e0439b7417e4e9816e15e3b813f2 layerID: 13 - mosaicPosition: {x: 2669, y: 716} + mosaicPosition: {x: 2868, y: 716} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6309\u4E0B" + spriteName: "\u6309\u4E0B" + isGroup: 0 + parentIndex: 0 + spriteID: 8cefea34640ec9b47b8e6706c788b1d8 + layerID: 18 + mosaicPosition: {x: 3067, y: 716} flatten: 0 isImported: 1 isVisible: 1 @@ -282,7 +344,7 @@ ScriptedImporter: spriteName: "\u6E29\u63A7\u5668 " isGroup: 0 parentIndex: 0 - spriteID: a668fcd0f8a7c154da3ba9c448c7ff7a + spriteID: c1ad0013322638c42960ea78b1bcf905 layerID: 3 mosaicPosition: {x: 4, y: 4} flatten: 0 @@ -292,7 +354,7 @@ ScriptedImporter: spriteName: "\u98CE\u6247" isGroup: 0 parentIndex: 0 - spriteID: 8507261c86be68d4cac19f17617c4bd2 + spriteID: 0bbed31efc7752147bd483a07bfe287a layerID: 4 mosaicPosition: {x: 3380, y: 4} flatten: 0 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 4cc1d6c9a..cd135255e 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -6302,7 +6302,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &253767084 RectTransform: m_ObjectHideFlags: 0 @@ -8509,10 +8509,10 @@ RectTransform: m_GameObject: {fileID: 438012754} 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.006878, y: 0.98232, z: 0.98232} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 542753289} + m_Father: {fileID: 462519808} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8626,7 +8626,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1134468525 m_SortingLayer: 10 - m_SortingOrder: 4 + m_SortingOrder: 30 m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 @@ -8695,6 +8695,168 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} +--- !u!1001 &462519807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1652512855} + m_Modifications: + - target: {fileID: -8653719598885068355, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_Name + value: "\u6E29\u63A7\u5668(2)" + objectReference: {fileID: 0} + - target: {fileID: -8440883057401177851, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8440883057401177851, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingOrder + value: 28 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalScale.x + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalScale.y + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalScale.z + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalPosition.x + value: 3.5949998 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalPosition.y + value: -1.4 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5266115679162973009, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -5266115679162973009, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -3348453064163565959, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -3348453064163565959, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingOrder + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -3348453064163565959, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -3347946867092858598, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -517513296486380596, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -517513296486380596, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingOrder + value: 20 + objectReference: {fileID: 0} + - target: {fileID: -517513296486380596, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: 3320300831273220450, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6109654040213865295, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 6109654040213865295, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + - {fileID: 3320300831273220450, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + - {fileID: -3347946867092858598, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1006909204} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + insertIndex: -1 + addedObject: {fileID: 438012755} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + insertIndex: -1 + addedObject: {fileID: 542992026} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 4843985084834002234, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} +--- !u!4 &462519808 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_PrefabInstance: {fileID: 462519807} + m_PrefabAsset: {fileID: 0} --- !u!1 &466676742 GameObject: m_ObjectHideFlags: 0 @@ -11363,6 +11525,10 @@ PrefabInstance: propertyPath: m_Name value: "\u6E29\u63A7\u5668" objectReference: {fileID: 0} + - target: {fileID: -8653719598885068355, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -8379289232430307119, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} propertyPath: m_SortingLayer value: 10 @@ -11466,16 +11632,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: -2812824633678238534, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} - insertIndex: 0 - addedObject: {fileID: 1006909204} - - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} - insertIndex: 1 - addedObject: {fileID: 438012755} - - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} - insertIndex: -1 - addedObject: {fileID: 542992026} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 4843985084834002234, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} --- !u!4 &542753289 stripped @@ -11518,7 +11675,7 @@ RectTransform: m_LocalScale: {x: 1.0441998, y: 1.0441998, z: 1.0441998} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 542753289} + m_Father: {fileID: 462519808} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16820,7 +16977,7 @@ RectTransform: m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 542753289} + m_Father: {fileID: 462519808} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16867,7 +17024,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1134468525 m_SortingLayer: 10 - m_SortingOrder: 20 + m_SortingOrder: 30 m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -19341,7 +19498,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.21, y: -0.8} + m_AnchoredPosition: {x: 0.234, y: -0.857} m_SizeDelta: {x: 0.75, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170503232 @@ -19363,7 +19520,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -19373,10 +19530,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: -8343834114481201620, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_PressedSprite: {fileID: 2940318533885196621, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_SelectedSprite: {fileID: -8343834114481201620, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_DisabledSprite: {fileID: -5771761635850763225, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -19420,8 +19577,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -8343834114481201620, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -28151,12 +28308,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1170503231} + - {fileID: 462519808} - {fileID: 542753289} m_Father: {fileID: 320706165} 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: -24.88, y: -2} + m_AnchoredPosition: {x: -24.89, y: -2.28} m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652512856 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 0c604ef7d..18da78914 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -7301,7 +7301,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: [] @@ -20600,7 +20600,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_fontAsset @@ -20614,6 +20614,10 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 4803553275159719416, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.a + value: 0.69411767 + objectReference: {fileID: 0} - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -46565,10 +46569,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ac4c32ca3c3c14a458cbedba36108e2b, type: 3} - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5020591241610718058, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_IsActive value: 0 @@ -46585,6 +46609,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6590378973688895424, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7117798419024193216, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3} propertyPath: m_AnchorMax.x value: 1 diff --git a/Assets/Scripts/Clue/FavoritesManager.cs b/Assets/Scripts/Clue/FavoritesManager.cs index dad29bfc4..6fc00219d 100644 --- a/Assets/Scripts/Clue/FavoritesManager.cs +++ b/Assets/Scripts/Clue/FavoritesManager.cs @@ -52,7 +52,7 @@ public class FavoritesManager : MonoBehaviour private void Start() { favoritesUIRectTransform = favoritesUI.GetComponent(); - hiddenPosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x, -Screen.height); + hiddenPosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x*2, favoritesUIRectTransform.anchoredPosition.y); visiblePosition = new Vector2(favoritesUIRectTransform.anchoredPosition.x, 0); // // 设置收藏夹的初始位置为隐藏 favoritesUIRectTransform.anchoredPosition = hiddenPosition; diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index 672b3c343..4457c47a5 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -100,7 +100,7 @@ public class HeatMapController : MonoBehaviour // 移动和旋转动画 imageToMove.DOLocalMoveX(imageInitialPos.x + 3.5f, 1f); - var rotationTween = imageToRotate.DORotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360) + var rotationTween = imageToRotate.DORotate(new Vector3(0, 0, 360), 0.2f, RotateMode.FastBeyond360) .SetLoops(-1, LoopType.Restart) .SetEase(Ease.Linear);