From 306fe88beed1606b283d488bd5a67eb7d1c07658 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 10 Mar 2025 23:19:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BE=8E=E6=9C=AF=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Animation/天桥上场景导出.controller | 2 +- .../Controller/character1.controller | 2 +- .../Controller/character2.controller | 2 +- .../Controller/character3.controller | 2 +- .../Controller/character4.controller | 2 +- .../Controller/character5.controller | 2 +- .../Controller/诊室附近树叶动画.controller | 58 +- .../Out/Prefab/MoveableCharacter1.prefab | 2 +- .../Out/Prefab/MoveableCharacter2.prefab | 2 +- .../Out/Prefab/MoveableCharacter3.prefab | 2 +- .../Out/Prefab/MoveableCharacter4.prefab | 2 +- .../Out/Prefab/MoveableCharacter5.prefab | 2 +- Assets/Resources/Art/Fix/Peipei/UFheatMap.png | 4 +- Assets/Resources/Art/Fix/收藏夹.meta | 8 + Assets/Resources/Art/Fix/收藏夹/托盘.png | 3 + Assets/Resources/Art/Fix/收藏夹/托盘.png.meta | 127 +++ Assets/Resources/Art/Fix/放映机/放映机.psb | 4 +- Assets/Resources/Art/Fix/检索UI.meta | 8 + Assets/Resources/Art/Fix/检索UI/检索UI.psb | 3 + .../Resources/Art/Fix/检索UI/检索UI.psb.meta | 752 ++++++++++++++++++ Assets/Resources/Art/Fix/温控器/温控器 1.psb | 3 - Assets/Resources/Art/Fix/温控器/温控器(2).psb | 3 + .../{温控器 1.psb.meta => 温控器(2).psb.meta} | 86 +- Assets/Scenes/PeipeiFixScene.unity | 210 ++++- Assets/Scenes/Persistence.unity | 32 +- Assets/Scripts/Clue/FavoritesManager.cs | 2 +- .../FixSystem/HeatMap/HeatMapController.cs | 2 +- 27 files changed, 1238 insertions(+), 89 deletions(-) create mode 100644 Assets/Resources/Art/Fix/收藏夹.meta create mode 100644 Assets/Resources/Art/Fix/收藏夹/托盘.png create mode 100644 Assets/Resources/Art/Fix/收藏夹/托盘.png.meta create mode 100644 Assets/Resources/Art/Fix/检索UI.meta create mode 100644 Assets/Resources/Art/Fix/检索UI/检索UI.psb create mode 100644 Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta delete mode 100644 Assets/Resources/Art/Fix/温控器/温控器 1.psb create mode 100644 Assets/Resources/Art/Fix/温控器/温控器(2).psb rename Assets/Resources/Art/Fix/温控器/{温控器 1.psb.meta => 温控器(2).psb.meta} (78%) 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); From 86cab8056811c5d15eec40f7f632cf7fa0185acf Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Tue, 11 Mar 2025 12:26:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=BF=98?= =?UTF-8?q?=E6=9C=89bug=E5=9C=A8=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Background/FixScene/佩佩视角屋子导出.psb | 3 + .../FixScene/佩佩视角屋子导出.psb.meta | 436 +++++++++++ .../Out/Prefab/MoveableCharacter1.prefab | 2 +- .../Out/Prefab/MoveableCharacter2.prefab | 2 +- .../Out/Prefab/MoveableCharacter3.prefab | 2 +- .../Out/Prefab/MoveableCharacter4.prefab | 2 +- .../Out/Prefab/MoveableCharacter5.prefab | 2 +- .../Resources/Art/Fix/检索UI/数据检索UI.psb | 3 + .../Art/Fix/检索UI/数据检索UI.psb.meta | 461 +++++++++++ Assets/Resources/Art/Fix/检索UI/检索UI.psb | 3 - .../Resources/Art/Fix/检索UI/角色检索UI.psb | 3 + .../Art/Fix/检索UI/角色检索UI.psb.meta | 564 +++++++++++++ .../Art/Fix/检索UI/非法进程检测UI.psb | 3 + ...索UI.psb.meta => 非法进程检测UI.psb.meta} | 341 +------- .../Materials/EyeMaterials/plantColor.mat | 2 +- Assets/Scenes/Bridge.unity | 2 +- Assets/Scenes/ClinicOut.unity | 10 +- Assets/Scenes/PeipeiFixScene.unity | 55 +- Assets/Scenes/Persistence.unity | 740 +++++++++++++++++- Assets/Scripts/FixSystem/DraggableUI.cs | 6 +- .../FixSystem/HeatMap/HeatMapController.cs | 3 +- 21 files changed, 2281 insertions(+), 364 deletions(-) create mode 100644 Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb create mode 100644 Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb.meta create mode 100644 Assets/Resources/Art/Fix/检索UI/数据检索UI.psb create mode 100644 Assets/Resources/Art/Fix/检索UI/数据检索UI.psb.meta delete mode 100644 Assets/Resources/Art/Fix/检索UI/检索UI.psb create mode 100644 Assets/Resources/Art/Fix/检索UI/角色检索UI.psb create mode 100644 Assets/Resources/Art/Fix/检索UI/角色检索UI.psb.meta create mode 100644 Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb rename Assets/Resources/Art/Fix/检索UI/{检索UI.psb.meta => 非法进程检测UI.psb.meta} (56%) diff --git a/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb b/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb new file mode 100644 index 000000000..19e082169 --- /dev/null +++ b/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f6a1f7ba3144309784a4fb9b7463acba54fd6c9dd0975d793231e616640b19f +size 21189915 diff --git a/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb.meta b/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb.meta new file mode 100644 index 000000000..e9f3d8c78 --- /dev/null +++ b/Assets/Resources/Art/Background/FixScene/佩佩视角屋子导出.psb.meta @@ -0,0 +1,436 @@ +fileFormatVersion: 2 +guid: 88fa6cf5a25f78b489e400aaeefe44f1 +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: "\u7A97\u5B50" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2601 + y: 469 + width: 188 + height: 278 + spriteID: f0a2d424be1ec0d4daf0e434ea1d251a + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2601, y: 469} + spritePosition: {x: 1998, y: 705} + - name: "\u7535\u8111" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2601 + y: 4 + width: 519 + height: 192 + spriteID: 3b60372e8f7e75d4ba8fb4777855407f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2601, y: 4} + spritePosition: {x: 823, y: 433} + - name: "\u6D77\u62A5" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2601 + y: 204 + width: 218 + height: 257 + spriteID: 05f92982be07c9041a21d67356618be6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2601, y: 204} + spritePosition: {x: 661, y: 472} + - name: "\u690D\u7269" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3128 + y: 4 + width: 269 + height: 168 + spriteID: 164cdede60d256c42b820aad26be7594 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3128, y: 4} + spritePosition: {x: 1451, y: 427} + - 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: 4 + width: 2589 + height: 1204 + spriteID: 11b12f8d032cb6343b2f94cc5cea3e53 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, 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: "UF\u89C6\u89D2\u4E0B\u751F\u6210\u7684\u56FE\u50CF\u5143\u7D20" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: e941588a141b56f479db3454d668ebef + layerID: 637 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 5" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: d895094d526880e4684305bc55024019 + layerID: 666 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6D77\u4E2D\u5927\u8C61" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: 8c2a75dae64ffd749bd065803bcdc2dc + layerID: 646 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u690D\u7269\u53D8\u6210\u7684\u753B\u7B14\u7B14\u7B52" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: 5f1bf878f8b636d4aa7198c430cd8ddb + layerID: 651 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u5915\u9633\u5C71\u4E18" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: 40d012f90d12d054b8b4b095c5d17097 + layerID: 659 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 1 \u62F7\u8D1D" + spriteName: + isGroup: 0 + parentIndex: 4 + spriteID: 6e6a26c6b33e3f046a0fb07c7a0be1d2 + layerID: 655 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u8272\u76F8/\u9971\u548C\u5EA6 1" + spriteName: + isGroup: 0 + parentIndex: 4 + spriteID: e00cb4f5c86d7af42810b4b13c2b9311 + layerID: 665 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u8272\u9636 1" + spriteName: + isGroup: 0 + parentIndex: 4 + spriteID: d4750bcb749c6be489a6433b8733ffb3 + layerID: 662 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u56FE\u5C42 1 \u62F7\u8D1D 2" + spriteName: + isGroup: 0 + parentIndex: 4 + spriteID: dd619b01f886515448f78aeb6d501809 + layerID: 656 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u5915\u9633\u5C71\u4E18" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: 9713048476e1591449391ce052b71542 + layerID: 657 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 4" + spriteName: + isGroup: 0 + parentIndex: 9 + spriteID: 22f2788988d685542a68985f6c194113 + layerID: 664 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 3" + spriteName: + isGroup: 0 + parentIndex: 9 + spriteID: db1382cf3f3423d42b9ac9c9b9ecc7fc + layerID: 661 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 2" + spriteName: + isGroup: 0 + parentIndex: 9 + spriteID: 8a4910856da3a3e459c28726ad02e802 + layerID: 654 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u56FE\u5C42 1" + spriteName: + isGroup: 0 + parentIndex: 9 + spriteID: 4f403b854fa76234fabfccf65b54804a + layerID: 653 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u7A97\u5B50" + spriteName: "\u7A97\u5B50" + isGroup: 0 + parentIndex: -1 + spriteID: f0a2d424be1ec0d4daf0e434ea1d251a + layerID: 559 + mosaicPosition: {x: 2601, y: 469} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u7535\u8111" + spriteName: "\u7535\u8111" + isGroup: 0 + parentIndex: -1 + spriteID: 3b60372e8f7e75d4ba8fb4777855407f + layerID: 399 + mosaicPosition: {x: 2601, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6D77\u62A5" + spriteName: "\u6D77\u62A5" + isGroup: 0 + parentIndex: -1 + spriteID: 05f92982be07c9041a21d67356618be6 + layerID: 606 + mosaicPosition: {x: 2601, y: 204} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u690D\u7269" + spriteName: "\u690D\u7269" + isGroup: 0 + parentIndex: -1 + spriteID: 164cdede60d256c42b820aad26be7594 + layerID: 617 + mosaicPosition: {x: 3128, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: "\u80CC\u666F" + isGroup: 0 + parentIndex: -1 + spriteID: 11b12f8d032cb6343b2f94cc5cea3e53 + layerID: 626 + mosaicPosition: {x: 4, 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/Background/Out/Prefab/MoveableCharacter1.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab index bbb7f0016..2d164ff51 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter1.prefab @@ -26,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab index b9a8fa3f4..16f2889d0 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter2.prefab @@ -30,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab index 35e0c0975..62733405d 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter3.prefab @@ -30,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab index bfcc62016..87a87eb67 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter4.prefab @@ -30,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab index f97f939ab..b3e6ac572 100644 --- a/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab +++ b/Assets/Resources/Art/Background/Out/Prefab/MoveableCharacter5.prefab @@ -30,7 +30,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: d3121f8853c53864b9b2e687c16c62af, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Resources/Art/Fix/检索UI/数据检索UI.psb b/Assets/Resources/Art/Fix/检索UI/数据检索UI.psb new file mode 100644 index 000000000..32829c347 --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/数据检索UI.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c68b3008ba55176fe501a49f0201fc317b9ebd0baae65a08bf402f7a1f723b5 +size 15395236 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..1ebf81b96 --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/数据检索UI.psb.meta @@ -0,0 +1,461 @@ +fileFormatVersion: 2 +guid: 861822809bd80d8429bc9b6227cf18ca +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: "\u5E95\u90E8\u6A2A\u7EBF" + 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: 3526 + height: 1984 + spriteID: 146552c6877197d49934202617b13d06 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3852, y: 4} + spritePosition: {x: 157, y: 88} + - name: "\u8272\u89C9\u6676\u5706\u8BAD\u7EC3\u69FD" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2883 + y: 6508 + width: 535 + height: 69 + spriteID: d48d0f758b7f0404fa87c735c7d9c807 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2883, y: 6508} + spritePosition: {x: 2074, y: 1622} + - name: 50% + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3426 + y: 6508 + width: 208 + height: 78 + spriteID: 174823c6403d1c846bd2b948818f356b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3426, y: 6508} + spritePosition: {x: 1816, y: 1438} + - name: "\u6EDA\u52A8\u6587\u5B57" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1471 + y: 6737 + width: 201 + height: 561 + spriteID: 771dbcd0560a7cf4997b6d4ac5b8c673 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 276, y: 6700} + spritePosition: {x: 2402, y: 37} + - name: "\u8FDB\u5EA6\u6761" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1471 + y: 6636 + width: 1365 + height: 93 + spriteID: a1e2af42d2f5de44389c64a99c466f61 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1469, y: 6635} + spritePosition: {x: 1238, y: 1430} + - name: "\u8FDB\u5EA6\u6761\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: 1471 + y: 6508 + width: 1404 + height: 120 + spriteID: 2ea2ee66023973e428b8b23c04d17e6e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1471, y: 6508} + spritePosition: {x: 1218, y: 1417} + - name: "\u4FE1\u606F\u680F" + 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: 1459 + height: 1007 + spriteID: b8ca4ef18a079d647b850dd01497d9a8 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 6508} + spritePosition: {x: 1190, y: 708} + - 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: 4c78419a41180a94fa15ba1721cba380 + 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: 408776888cc235746838f89e5051ec5c + 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: 610c658aae629164a86f498db0fc898a + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4340} + 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: "\u6570\u636E\u68C0\u7D22" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 9556d13397d5eb442a3e6216cbee5ed3 + layerID: 78 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u5E95\u90E8\u6A2A\u7EBF" + spriteName: "\u5E95\u90E8\u6A2A\u7EBF" + isGroup: 0 + parentIndex: 0 + spriteID: 146552c6877197d49934202617b13d06 + layerID: 116 + mosaicPosition: {x: 3852, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8272\u89C9\u6676\u5706\u8BAD\u7EC3\u69FD" + spriteName: "\u8272\u89C9\u6676\u5706\u8BAD\u7EC3\u69FD" + isGroup: 0 + parentIndex: 0 + spriteID: d48d0f758b7f0404fa87c735c7d9c807 + layerID: 149 + mosaicPosition: {x: 2883, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: 50% + spriteName: 50% + isGroup: 0 + parentIndex: 0 + spriteID: 174823c6403d1c846bd2b948818f356b + layerID: 80 + mosaicPosition: {x: 3426, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6EDA\u52A8\u6587\u5B57" + spriteName: "\u6EDA\u52A8\u6587\u5B57" + isGroup: 0 + parentIndex: 0 + spriteID: 771dbcd0560a7cf4997b6d4ac5b8c673 + layerID: 77 + mosaicPosition: {x: 1471, y: 6737} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761" + spriteName: "\u8FDB\u5EA6\u6761" + isGroup: 0 + parentIndex: 0 + spriteID: a1e2af42d2f5de44389c64a99c466f61 + layerID: 136 + mosaicPosition: {x: 1471, y: 6636} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + spriteName: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: 2ea2ee66023973e428b8b23c04d17e6e + layerID: 74 + mosaicPosition: {x: 1471, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4FE1\u606F\u680F" + spriteName: "\u4FE1\u606F\u680F" + isGroup: 0 + parentIndex: 0 + spriteID: b8ca4ef18a079d647b850dd01497d9a8 + layerID: 81 + mosaicPosition: {x: 4, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6697\u8FB9" + spriteName: "\u6697\u8FB9" + isGroup: 0 + parentIndex: 0 + spriteID: 4c78419a41180a94fa15ba1721cba380 + layerID: 97 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u9ED1\u5E95" + spriteName: "\u9ED1\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: 408776888cc235746838f89e5051ec5c + layerID: 73 + mosaicPosition: {x: 4, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u80CC\u666F" + spriteName: "\u80CC\u666F" + isGroup: 0 + parentIndex: 0 + spriteID: 610c658aae629164a86f498db0fc898a + layerID: 72 + mosaicPosition: {x: 4, y: 4340} + 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/检索UI/检索UI.psb b/Assets/Resources/Art/Fix/检索UI/检索UI.psb deleted file mode 100644 index bb01355d9..000000000 --- a/Assets/Resources/Art/Fix/检索UI/检索UI.psb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:454f3a01fc8ad361c491899e38d245b184f47641f3bb40c98fec3eb38af9106a -size 48926827 diff --git a/Assets/Resources/Art/Fix/检索UI/角色检索UI.psb b/Assets/Resources/Art/Fix/检索UI/角色检索UI.psb new file mode 100644 index 000000000..e112107d8 --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/角色检索UI.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5927bdba54f20aeab91c1af10f18b6e9ba31fb7619f5237698b048cba71a8454 +size 5456513 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..e69245e3d --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/角色检索UI.psb.meta @@ -0,0 +1,564 @@ +fileFormatVersion: 2 +guid: 7954b723f184de945b05cdde096089c8 +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: "\u5E95\u90E8\u6A2A\u7EBF" + 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: 3526 + height: 1984 + spriteID: ee4d92fe7002ebf4586015b221271545 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3852, y: 4} + spritePosition: {x: 157, y: 88} + - name: "\u60C5\u7EEA\u8868" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2875 + y: 6508 + width: 656 + height: 343 + spriteID: edb0cf1255458fc4e9672f8dea2191b6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2875, y: 6508} + spritePosition: {x: 1980, y: 1686} + - name: "\u60C5\u7EEA\u8FDB\u5EA6\u8868" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3601 + y: 6859 + width: 194 + height: 333 + spriteID: e6eae90b567d1c24588dc9143861acb3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3601, y: 6859} + spritePosition: {x: 2284, y: 1692} + - name: "\u6EDA\u52A8\u6587\u5B57" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1471 + y: 6508 + width: 1396 + height: 650 + spriteID: 7f71fde070b52044c80cfe969989989e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1471, y: 6508} + spritePosition: {x: 1207, y: 727} + - name: 50% + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3539 + y: 6716 + width: 208 + height: 78 + spriteID: 4627b1c0c29fb6b469aa4532084cd4b4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3539, y: 6716} + spritePosition: {x: 1816, y: 1430} + - name: "\u7EFF\u8272\u8FDB\u5EA6\u6761" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2875 + y: 6859 + width: 718 + height: 136 + spriteID: 85a6bcdda3f7e0f4c85dc3b51d0c5d98 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2875, y: 6859} + spritePosition: {x: 1204, y: 1401} + - name: "\u8FDB\u5EA6\u6761\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: 7205 + width: 1458 + height: 154 + spriteID: 2d70cf69085e8b74e80b498550599412 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 7205} + spritePosition: {x: 1191, y: 1392} + - name: "\u4EBA\u7269\u626B\u63CF\u8868\u73B0" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3539 + y: 6508 + width: 273 + height: 200 + spriteID: d39ac5cf870971643b1a9ec9c432b4d6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3539, y: 6508} + spritePosition: {x: 1650, y: 1698} + - name: "\u4EBA\u7269\u8BC6\u522B\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: 7367 + width: 386 + height: 482 + spriteID: f8d01d29f5eb6ca459f98635f3755483 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 7367} + spritePosition: {x: 1584, y: 1590} + - name: "\u4FE1\u606F\u680F\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: 1459 + height: 689 + spriteID: 5be2d46a689f0dc4d866cb0a29d8abd4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 6508} + spritePosition: {x: 1190, y: 708} + - 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: 1c8f040bfdf40004bb5f3f5bab49bd8f + 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: 7b76b019d322c024293fd437e56cf502 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2172} + spritePosition: {x: 0, y: 0} + - name: "\u56FE\u5C42 1" + 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: 70cbc5ff112df7c449954a30e135225c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4340} + 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: "\u89D2\u8272\u68C0\u7D22" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 4442d5bd9928f224791480bf996ca614 + layerID: 18 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u5E95\u90E8\u6A2A\u7EBF" + spriteName: "\u5E95\u90E8\u6A2A\u7EBF" + isGroup: 0 + parentIndex: 0 + spriteID: ee4d92fe7002ebf4586015b221271545 + layerID: 142 + mosaicPosition: {x: 3852, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u60C5\u7EEA\u8868" + spriteName: "\u60C5\u7EEA\u8868" + isGroup: 0 + parentIndex: 0 + spriteID: edb0cf1255458fc4e9672f8dea2191b6 + layerID: 61 + mosaicPosition: {x: 2875, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u60C5\u7EEA\u8FDB\u5EA6\u8868" + spriteName: "\u60C5\u7EEA\u8FDB\u5EA6\u8868" + isGroup: 0 + parentIndex: 0 + spriteID: e6eae90b567d1c24588dc9143861acb3 + layerID: 71 + mosaicPosition: {x: 3601, y: 6859} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6EDA\u52A8\u6587\u5B57" + spriteName: "\u6EDA\u52A8\u6587\u5B57" + isGroup: 0 + parentIndex: 0 + spriteID: 7f71fde070b52044c80cfe969989989e + layerID: 66 + mosaicPosition: {x: 1471, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: 50% + spriteName: 50% + isGroup: 0 + parentIndex: 0 + spriteID: 4627b1c0c29fb6b469aa4532084cd4b4 + layerID: 16 + mosaicPosition: {x: 3539, y: 6716} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u7EFF\u8272\u8FDB\u5EA6\u6761" + spriteName: "\u7EFF\u8272\u8FDB\u5EA6\u6761" + isGroup: 0 + parentIndex: 0 + spriteID: 85a6bcdda3f7e0f4c85dc3b51d0c5d98 + layerID: 89 + mosaicPosition: {x: 2875, y: 6859} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + spriteName: "\u8FDB\u5EA6\u6761\u9ED1\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: 2d70cf69085e8b74e80b498550599412 + layerID: 14 + mosaicPosition: {x: 4, y: 7205} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4EBA\u7269\u626B\u63CF\u8868\u73B0" + spriteName: "\u4EBA\u7269\u626B\u63CF\u8868\u73B0" + isGroup: 0 + parentIndex: 0 + spriteID: d39ac5cf870971643b1a9ec9c432b4d6 + layerID: 38 + mosaicPosition: {x: 3539, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4EBA\u7269\u8BC6\u522B\u6846" + spriteName: "\u4EBA\u7269\u8BC6\u522B\u6846" + isGroup: 0 + parentIndex: 0 + spriteID: f8d01d29f5eb6ca459f98635f3755483 + layerID: 3 + mosaicPosition: {x: 4, y: 7367} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4FE1\u606F\u680F\u8FB9\u6846" + spriteName: "\u4FE1\u606F\u680F\u8FB9\u6846" + isGroup: 0 + parentIndex: 0 + spriteID: 5be2d46a689f0dc4d866cb0a29d8abd4 + layerID: 7 + mosaicPosition: {x: 4, y: 6508} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4FE1\u606F\u680F\u534A\u900F\u660E\u9ED1\u5E95" + spriteName: + isGroup: 0 + parentIndex: 0 + spriteID: b32fc7f7f78b7244c9c52a430da72514 + layerID: 49 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u6697\u8FB9" + spriteName: "\u6697\u8FB9" + isGroup: 0 + parentIndex: 0 + spriteID: 1c8f040bfdf40004bb5f3f5bab49bd8f + layerID: 96 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u9ED1\u5E95" + spriteName: "\u9ED1\u5E95" + isGroup: 0 + parentIndex: 0 + spriteID: 7b76b019d322c024293fd437e56cf502 + layerID: 68 + mosaicPosition: {x: 4, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FE\u5C42 1" + spriteName: "\u56FE\u5C42 1" + isGroup: 0 + parentIndex: -1 + spriteID: 70cbc5ff112df7c449954a30e135225c + layerID: 311 + mosaicPosition: {x: 4, y: 4340} + 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/检索UI/非法进程检测UI.psb b/Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb new file mode 100644 index 000000000..397d5807b --- /dev/null +++ b/Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab54b3eccb9324e29313968da72db93d068e9bfb3256ab2662a291ad99827231 +size 27094653 diff --git a/Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta b/Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb.meta similarity index 56% rename from Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta rename to Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb.meta index 0e8b4ba2f..e6c8d9d96 100644 --- a/Assets/Resources/Art/Fix/检索UI/检索UI.psb.meta +++ b/Assets/Resources/Art/Fix/检索UI/非法进程检测UI.psb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4bdeba1a971eef34fac588620fcedeb3 +guid: 7e32317cfb9ffa142ab1197f442fe3bb ScriptedImporter: internalIDToNameTable: [] externalObjects: {} @@ -102,10 +102,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 2172 + y: 4 width: 3526 height: 1984 - spriteID: 138990630a08f5a499262721934814a3 + spriteID: cad1cd0f4d37ea74898671391e8b1256 spriteBone: [] spriteOutline: [] vertices: [] @@ -113,7 +113,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 2172} + uvTransform: {x: 3852, y: 4} spritePosition: {x: 170, y: 88} - name: "\u8B66\u793A\u7B26\u53F7" originalName: @@ -126,7 +126,7 @@ ScriptedImporter: y: 7079 width: 1780 height: 166 - spriteID: 15b13be2fab455e4e9d3943337405af3 + spriteID: 71f3ba4187f2e65429f537e39868afa1 spriteBone: [] spriteOutline: [] vertices: [] @@ -147,7 +147,7 @@ ScriptedImporter: y: 7253 width: 1249 height: 60 - spriteID: 807c22f3542d3954c8b1a520bd67763f + spriteID: ca1b878394f0cde448c20ff6440779b1 spriteBone: [] spriteOutline: [] vertices: [] @@ -168,7 +168,7 @@ ScriptedImporter: y: 7321 width: 658 height: 90 - spriteID: aa307252bb158d442bfe4df4d3517c8b + spriteID: f4cdaf7510998024bb48850f45b93cda spriteBone: [] spriteOutline: [] vertices: [] @@ -189,7 +189,7 @@ ScriptedImporter: y: 7079 width: 1838 height: 146 - spriteID: dc5b59dde8d4592498052bbe64598db9 + spriteID: c63d6ee7736f38a4491f6cd642feb798 spriteBone: [] spriteOutline: [] vertices: [] @@ -210,7 +210,7 @@ ScriptedImporter: y: 6508 width: 1899 height: 563 - spriteID: a68b44aebf06e0b40a1af7845f1b1475 + spriteID: 396ed46487e77e941b4cef28b5d9463a spriteBone: [] spriteOutline: [] vertices: [] @@ -231,7 +231,7 @@ ScriptedImporter: y: 6508 width: 1897 height: 557 - spriteID: 3adfb3cec26813a42bf08d4dcc315224 + spriteID: 7c514c8ce4698c04b839f783a3a8a77b spriteBone: [] spriteOutline: [] vertices: [] @@ -252,7 +252,7 @@ ScriptedImporter: y: 4 width: 3840 height: 2160 - spriteID: 93500016c546a8e4293d0771ea5dde29 + spriteID: 0fa015d913a973a448e730463cd5329c spriteBone: [] spriteOutline: [] vertices: [] @@ -273,7 +273,7 @@ ScriptedImporter: y: 2172 width: 3840 height: 2160 - spriteID: 9293e1434e243334d83f9f6686eda6ba + spriteID: a259303bf90659745bedb69d106aeefe spriteBone: [] spriteOutline: [] vertices: [] @@ -294,7 +294,7 @@ ScriptedImporter: y: 4340 width: 3840 height: 2160 - spriteID: cd91f53a1b5e64148a162cf20af3f387 + spriteID: 7d1c0c837abec3a4ab7545866d978ef9 spriteBone: [] spriteOutline: [] vertices: [] @@ -304,27 +304,6 @@ ScriptedImporter: 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: [] @@ -363,7 +342,7 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: -1 - spriteID: 377307a2526af6447b206eca2d70c1b5 + spriteID: f017dfe6dfdecbf44bbd6cb88989e0d6 layerID: 108 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -373,9 +352,9 @@ ScriptedImporter: spriteName: "\u56DB\u89D2" isGroup: 0 parentIndex: 0 - spriteID: 138990630a08f5a499262721934814a3 + spriteID: cad1cd0f4d37ea74898671391e8b1256 layerID: 144 - mosaicPosition: {x: 3852, y: 2172} + mosaicPosition: {x: 3852, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -383,7 +362,7 @@ ScriptedImporter: spriteName: "\u8B66\u793A\u7B26\u53F7" isGroup: 0 parentIndex: 0 - spriteID: 15b13be2fab455e4e9d3943337405af3 + spriteID: 71f3ba4187f2e65429f537e39868afa1 layerID: 263 mosaicPosition: {x: 4, y: 7079} flatten: 0 @@ -393,7 +372,7 @@ ScriptedImporter: 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 + spriteID: ca1b878394f0cde448c20ff6440779b1 layerID: 227 mosaicPosition: {x: 4, y: 7253} flatten: 0 @@ -403,7 +382,7 @@ ScriptedImporter: spriteName: CONFIRM isGroup: 0 parentIndex: 0 - spriteID: aa307252bb158d442bfe4df4d3517c8b + spriteID: f4cdaf7510998024bb48850f45b93cda layerID: 113 mosaicPosition: {x: 4, y: 7321} flatten: 0 @@ -413,7 +392,7 @@ ScriptedImporter: spriteName: "\u786E\u8BA4\u6309\u94AE\u6A59\u8272\u5E95" isGroup: 0 parentIndex: 0 - spriteID: dc5b59dde8d4592498052bbe64598db9 + spriteID: c63d6ee7736f38a4491f6cd642feb798 layerID: 111 mosaicPosition: {x: 1792, y: 7079} flatten: 0 @@ -423,7 +402,7 @@ ScriptedImporter: spriteName: "\u4FE1\u606F\u6846\u8FB9\u6846" isGroup: 0 parentIndex: 0 - spriteID: a68b44aebf06e0b40a1af7845f1b1475 + spriteID: 396ed46487e77e941b4cef28b5d9463a layerID: 233 mosaicPosition: {x: 4, y: 6508} flatten: 0 @@ -433,7 +412,7 @@ ScriptedImporter: spriteName: "\u4FE1\u606F\u6846\u9ED1\u5E95" isGroup: 0 parentIndex: 0 - spriteID: 3adfb3cec26813a42bf08d4dcc315224 + spriteID: 7c514c8ce4698c04b839f783a3a8a77b layerID: 214 mosaicPosition: {x: 1911, y: 6508} flatten: 0 @@ -443,7 +422,7 @@ ScriptedImporter: spriteName: "\u6697\u8FB9" isGroup: 0 parentIndex: 0 - spriteID: 93500016c546a8e4293d0771ea5dde29 + spriteID: 0fa015d913a973a448e730463cd5329c layerID: 146 mosaicPosition: {x: 4, y: 4} flatten: 0 @@ -453,7 +432,7 @@ ScriptedImporter: spriteName: "\u9ED1\u5E95 " isGroup: 0 parentIndex: 0 - spriteID: 9293e1434e243334d83f9f6686eda6ba + spriteID: a259303bf90659745bedb69d106aeefe layerID: 213 mosaicPosition: {x: 4, y: 2172} flatten: 0 @@ -463,282 +442,12 @@ ScriptedImporter: spriteName: "\u80CC\u666F" isGroup: 0 parentIndex: 0 - spriteID: cd91f53a1b5e64148a162cf20af3f387 + spriteID: 7d1c0c837abec3a4ab7545866d978ef9 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 diff --git a/Assets/Resources/Materials/EyeMaterials/plantColor.mat b/Assets/Resources/Materials/EyeMaterials/plantColor.mat index fa3122103..cb95fb4a5 100644 --- a/Assets/Resources/Materials/EyeMaterials/plantColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/plantColor.mat @@ -386,7 +386,7 @@ Material: - _SourceAlphaDissolveInvert: 0 - _SourceAlphaDissolveNoiseFactor: 3.4 - _SourceAlphaDissolveWidth: 0.73 - - _SourceGlowDissolveFade: 18 + - _SourceGlowDissolveFade: 15 - _SourceGlowDissolveInvert: 0 - _SourceGlowDissolveNoiseFactor: 0.2 - _SourceGlowDissolveWidth: 0.1 diff --git a/Assets/Scenes/Bridge.unity b/Assets/Scenes/Bridge.unity index 80cfb7431..bc9205a88 100644 --- a/Assets/Scenes/Bridge.unity +++ b/Assets/Scenes/Bridge.unity @@ -10466,7 +10466,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index f105490fd..724136db1 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -161,10 +161,10 @@ MonoBehaviour: spawnPoints: - {fileID: 1162229158} - {fileID: 544493100} - IntervalBetweenWave: {x: 1, y: 3} + IntervalBetweenWave: {x: 2, y: 4} minSpawnCount: 2 maxSpawnCount: 4 - IntervalBetweenCharacter: {x: 2, y: 3} + IntervalBetweenCharacter: {x: 4, y: 6} --- !u!4 &47105643 Transform: m_ObjectHideFlags: 0 @@ -657,7 +657,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &172576939 Transform: m_ObjectHideFlags: 0 @@ -1150,7 +1150,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8151,7 +8151,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1501389274 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index cd135255e..9f7917ad4 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -3340,7 +3340,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.99, y: 2.39} + oldSize: {x: 2.69, y: 1.68} newSize: {x: 1.99, y: 2.37} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -3362,8 +3362,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTransform: {fileID: 0} - burnRadiusMin: 18 - burnRadiusMax: 22 + burnRadiusMin: 15 + burnRadiusMax: 18 backSpriteRenderer: {fileID: 1036194065} wrongColorSpriteRenderer: {fileID: 1211051073} imageSpriteRender: {fileID: 163241097} @@ -3409,7 +3409,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 2 - m_Sprite: {fileID: -7700938947007804724, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + m_Sprite: {fileID: -3308696911521073974, guid: 88fa6cf5a25f78b489e400aaeefe44f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -7397,7 +7397,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 1134468525 - m_SortingOrder: 19 + m_SortingOrder: 25 m_TargetDisplay: 0 --- !u!224 &320706165 RectTransform: @@ -8419,7 +8419,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 2 - m_Sprite: {fileID: -7700938947007804724, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + m_Sprite: {fileID: -3308696911521073974, guid: 88fa6cf5a25f78b489e400aaeefe44f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.28235295} m_FlipX: 0 m_FlipY: 0 @@ -8835,11 +8835,20 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6304010051377152671, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalPosition.x + value: -5.99 + objectReference: {fileID: 0} + - target: {fileID: 6304010051377152671, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + propertyPath: m_LocalPosition.y + value: 6.4 + 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} + - {fileID: -2812824633678238534, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} insertIndex: -1 @@ -8857,6 +8866,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} m_PrefabInstance: {fileID: 462519807} m_PrefabAsset: {fileID: 0} +--- !u!4 &462519809 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4289677991053106474, guid: 079f757a9919f014eac74bd37bdf023f, type: 3} + m_PrefabInstance: {fileID: 462519807} + m_PrefabAsset: {fileID: 0} --- !u!1 &466676742 GameObject: m_ObjectHideFlags: 0 @@ -11640,11 +11654,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} m_PrefabInstance: {fileID: 542753288} m_PrefabAsset: {fileID: 0} ---- !u!4 &542753290 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -4289677991053106474, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} - m_PrefabInstance: {fileID: 542753288} - m_PrefabAsset: {fileID: 0} --- !u!1 &542992025 GameObject: m_ObjectHideFlags: 0 @@ -12528,15 +12537,15 @@ MonoBehaviour: Pos: - {fileID: 1484838014} - {fileID: 1678197549} - - {fileID: 0} + - {fileID: 2012607336} - {fileID: 1616768533} - {fileID: 1983689271} - {fileID: 190481521} - - {fileID: 0} + - {fileID: 5501319149006720954} coolingButton: {fileID: 1170503232} heatmapGameobject: {fileID: 1652512854} imageToMove: {fileID: 1006909204} - imageToRotate: {fileID: 542753290} + imageToRotate: {fileID: 462519809} inPos: {x: -33, y: -2, z: 0} outPos: {x: -24, y: -2, z: 0} --- !u!1 &633823201 @@ -14407,7 +14416,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: -34.32, y: 0.58} + m_AnchoredPosition: {x: -35.18, y: 0.58} m_SizeDelta: {x: 2.5, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &777225789 @@ -14680,7 +14689,7 @@ Transform: m_GameObject: {fileID: 783319747} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.5649986, y: 5.745, z: 0} + m_LocalPosition: {x: 3.5649986, y: 5.03, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17878,7 +17887,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 2 - m_Sprite: {fileID: -7700938947007804724, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + m_Sprite: {fileID: -3308696911521073974, guid: 88fa6cf5a25f78b489e400aaeefe44f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -19498,7 +19507,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.234, y: -0.857} + m_AnchoredPosition: {x: 0.23399997, y: -0.83} m_SizeDelta: {x: 0.75, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170503232 @@ -20542,7 +20551,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 3 - m_Sprite: {fileID: -7700938947007804724, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + m_Sprite: {fileID: -3308696911521073974, guid: 88fa6cf5a25f78b489e400aaeefe44f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -25129,7 +25138,7 @@ SpriteRenderer: m_SortingLayerID: 1034535805 m_SortingLayer: 9 m_SortingOrder: 1 - m_Sprite: {fileID: 4530019578705644916, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} + m_Sprite: {fileID: 93274702361635029, guid: 88fa6cf5a25f78b489e400aaeefe44f1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -28314,7 +28323,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: -24.89, y: -2.28} + m_AnchoredPosition: {x: -25.31, y: -2.28} m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652512856 @@ -28330,7 +28339,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 777225788} - button: {fileID: 1170503230} + button: {fileID: 1170503232} isDone: 0 --- !u!114 &1652512857 MonoBehaviour: @@ -31677,7 +31686,7 @@ Transform: m_GameObject: {fileID: 1841275528} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.622, y: 0.604, z: 0} + m_LocalPosition: {x: -4.86, y: 0.604, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 18da78914..5fc9ae9fe 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -474,6 +474,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 27659197} m_CullTransparentMesh: 1 +--- !u!1 &28473418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28473419} + - component: {fileID: 28473421} + - component: {fileID: 28473420} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &28473419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28473418} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919987} + 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: 0} + m_SizeDelta: {x: 328, y: 44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &28473420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28473418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -9137905974819863392, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &28473421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28473418} + m_CullTransparentMesh: 1 --- !u!1001 &37345342 PrefabInstance: m_ObjectHideFlags: 0 @@ -8140,6 +8215,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 614046221} m_CullTransparentMesh: 1 +--- !u!1 &615975975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 615975976} + - component: {fileID: 615975978} + - component: {fileID: 615975977} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &615975976 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615975975} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919986} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2, y: -73} + m_SizeDelta: {x: -105.93996, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &615975977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615975975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -5343777769485757413, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &615975978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615975975} + m_CullTransparentMesh: 1 --- !u!1 &616017231 GameObject: m_ObjectHideFlags: 0 @@ -8216,6 +8366,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616017231} m_CullTransparentMesh: 1 +--- !u!1 &618640544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618640545} + - component: {fileID: 618640547} + - component: {fileID: 618640546} + m_Layer: 5 + m_Name: Background (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &618640545 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618640544} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919986} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!114 &618640546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618640544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 4412397904695706118, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &618640547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618640544} + m_CullTransparentMesh: 0 --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -9338,10 +9563,10 @@ MonoBehaviour: - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} - runMode: 1 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - saveFileName: "PeipeiDay2_\u5F00\u573A\u5BF9\u8BDD" + testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} + saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -18252,6 +18477,94 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563634750} m_CullTransparentMesh: 1 +--- !u!1 &1582682139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1582682140} + - component: {fileID: 1582682143} + - component: {fileID: 1582682142} + - component: {fileID: 1582682141} + m_Layer: 5 + m_Name: Panel (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1582682140 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582682139} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919985} + 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: 0} + m_SizeDelta: {x: 1764, y: 992} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1582682141 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582682139} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1582682142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582682139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 4220943640777440900, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1582682143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582682139} + m_CullTransparentMesh: 0 --- !u!1 &1584263513 GameObject: m_ObjectHideFlags: 0 @@ -20574,10 +20887,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2003858546407399498} m_Modifications: + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_fontSize + value: 34 + objectReference: {fileID: 0} + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_margin.w + value: 61.253906 + objectReference: {fileID: 0} + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_margin.x + value: 146.36395 + objectReference: {fileID: 0} + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_margin.y + value: 13.941345 + objectReference: {fileID: 0} + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_margin.z + value: -3.2749023 + objectReference: {fileID: 0} - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_fontAsset value: objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_fontSizeBase + value: 34 + objectReference: {fileID: 0} - target: {fileID: -6871444879100676761, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_sharedMaterial value: @@ -20586,22 +20923,158 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2811829909130799374, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 220275218809313090, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.x + value: 948 + objectReference: {fileID: 0} + - target: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.y + value: 278 + objectReference: {fileID: 0} - target: {fileID: 1317429119650744762, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 2481099176212259020, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2613063118643684449, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2613063118643684449, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -9137905974819863392, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + - target: {fileID: 2613063118643684449, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.x + value: 328 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.x + value: -140 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.y + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 2793915599792594175, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2793915599792594175, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2793915599792594175, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2793915599792594175, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_Name value: "\u5355\u6309\u94AE\u7EAF\u6587\u672C\u7A97\u53E3" objectReference: {fileID: 0} - target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2996643995751393983, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4197218052025329118, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4347123750396967633, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.x + value: 860 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.y + value: 83.5 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.x + value: -424 + objectReference: {fileID: 0} + - target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.y + value: 110 + objectReference: {fileID: 0} - target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_fontAsset value: @@ -20614,9 +21087,41 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -9137905974819863392, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542306672742598678, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4803553275159719416, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_Color.a - value: 0.69411767 + value: 0.27450982 + objectReference: {fileID: 0} + - target: {fileID: 4944782672019241072, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4988450368902842157, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} propertyPath: m_Pivot.x @@ -20698,9 +21203,59 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2811829909130799374, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578474604623335935, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8935709563351595522, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9219810584082714769, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: 1 + addedObject: {fileID: 1787711229} + - targetCorrespondingSourceObject: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: 2 + addedObject: {fileID: 1582682140} + - targetCorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: 1 + addedObject: {fileID: 1813908449} + - targetCorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: 2 + addedObject: {fileID: 618640545} + - targetCorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: -1 + addedObject: {fileID: 615975976} + - targetCorrespondingSourceObject: {fileID: 892337495822208186, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + insertIndex: -1 + addedObject: {fileID: 28473419} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} --- !u!114 &1704919984 stripped @@ -20719,6 +21274,16 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} m_PrefabInstance: {fileID: 1704919983} m_PrefabAsset: {fileID: 0} +--- !u!224 &1704919986 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + m_PrefabInstance: {fileID: 1704919983} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1704919987 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 892337495822208186, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + m_PrefabInstance: {fileID: 1704919983} + m_PrefabAsset: {fileID: 0} --- !u!1 &1729236132 GameObject: m_ObjectHideFlags: 0 @@ -21406,6 +21971,94 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.58, b: 0.04, a: 1} m_EffectDistance: {x: 3, y: -3} m_UseGraphicAlpha: 1 +--- !u!1 &1787711228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1787711229} + - component: {fileID: 1787711232} + - component: {fileID: 1787711231} + - component: {fileID: 1787711230} + m_Layer: 5 + m_Name: Panel (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1787711229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787711228} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919985} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!225 &1787711230 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787711228} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1787711231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787711228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -8704681604324562808, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1787711232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787711228} + m_CullTransparentMesh: 0 --- !u!1 &1788453625 GameObject: m_ObjectHideFlags: 0 @@ -21737,6 +22390,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804770167} m_CullTransparentMesh: 1 +--- !u!1 &1813908448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1813908449} + - component: {fileID: 1813908451} + - component: {fileID: 1813908450} + m_Layer: 5 + m_Name: Background (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1813908449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813908448} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1704919986} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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!114 &1813908450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813908448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 5284210313342259889, guid: 7e32317cfb9ffa142ab1197f442fe3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1813908451 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813908448} + m_CullTransparentMesh: 0 --- !u!1 &1825866674 GameObject: m_ObjectHideFlags: 0 @@ -39371,7 +40099,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs index ca35520eb..a46e47d81 100644 --- a/Assets/Scripts/FixSystem/DraggableUI.cs +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -8,7 +8,7 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler private Canvas canvas; public RectTransform target; - public GameObject button; + public Button button; public bool isDone = false; private bool isLocked = false; @@ -41,11 +41,11 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler if (distance <= 1 && !isDone) { - button.SetActive(true); + button.interactable=true; } else { - button.SetActive(false); + button.interactable=false; } } diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index 4457c47a5..b6c271182 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -68,13 +68,14 @@ public class HeatMapController : MonoBehaviour private IEnumerator ShowHeatMapCoroutine() { // 初始化Heatmap位置 + heatmapGameobject.transform.localPosition = outPos; heatmapGameobject.SetActive(true); heatmapGameobject.transform.DOLocalMove(inPos, 1f); heatmapGameobject.GetComponent().isDone = false; yield return new WaitForSeconds(1f); // 等待动画完成 heatmapGameobject.GetComponent().UnlockDrag(); - coolingButton.interactable = true; + coolingButton.interactable = false; } public void HideHeatMap() From 533b94fc226356f4ebe48c733851ee2891beac83 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Tue, 11 Mar 2025 13:24:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/PeipeiFixScene.unity | 89 +++++++++++++++++++++++++++++- Assets/Scenes/Persistence.unity | 4 +- 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 9f7917ad4..cbc9dc51c 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -5910,6 +5910,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1559880459} - {fileID: 1138423320} - {fileID: 2012607336} - {fileID: 1616369506} @@ -12537,7 +12538,7 @@ MonoBehaviour: Pos: - {fileID: 1484838014} - {fileID: 1678197549} - - {fileID: 2012607336} + - {fileID: 1559880459} - {fileID: 1616768533} - {fileID: 1983689271} - {fileID: 190481521} @@ -26622,6 +26623,90 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &1559880458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1559880459} + - component: {fileID: 1559880460} + m_Layer: 0 + m_Name: Module Pic (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1559880459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559880458} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.02, y: 0.03, z: 0} + m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 236134620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1559880460 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559880458} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 3 + m_Sprite: {fileID: -8510992098524624651, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.99, y: 1.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1589824314 GameObject: m_ObjectHideFlags: 0 @@ -31123,7 +31208,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.97961426, y: -7.803589} + m_AnchoredPosition: {x: -0.9794922, y: -7.803589} m_SizeDelta: {x: -715.9592, y: -426.5894} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1805580366 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 5fc9ae9fe..861338227 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -7376,7 +7376,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9563,7 +9563,7 @@ MonoBehaviour: - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} - runMode: 2 + runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED"