diff --git a/Assets/ArtRes/Models/women/Women-01@Walking/Women-01@Stand.fbx.meta b/Assets/ArtRes/Models/women/Women-01@Walking/Women-01@Stand.fbx.meta index 734b002..44dd12b 100644 --- a/Assets/ArtRes/Models/women/Women-01@Walking/Women-01@Stand.fbx.meta +++ b/Assets/ArtRes/Models/women/Women-01@Walking/Women-01@Stand.fbx.meta @@ -5,7 +5,7 @@ ModelImporter: internalIDToNameTable: - first: 74: -203655887218126122 - second: mixamo.com + second: Stand externalObjects: {} materials: materialImportMode: 2 @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Stand + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 418 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -70,6 +99,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 diff --git a/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png b/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png new file mode 100644 index 0000000..3d42840 Binary files /dev/null and b/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png differ diff --git a/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png.meta b/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png.meta new file mode 100644 index 0000000..d7d7a3d --- /dev/null +++ b/Assets/ArtRes/Sprite/UI_Panel/UI_ProcessTipPanel/任务感叹号按钮.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: a11d39002c2f59743a59ba54bb343040 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Tip/ImageTips.prefab b/Assets/Resources/UI/UI_Tip/ImageTips.prefab index ec3ee28..5b2a663 100644 --- a/Assets/Resources/UI/UI_Tip/ImageTips.prefab +++ b/Assets/Resources/UI/UI_Tip/ImageTips.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -1820, y: -980} + m_AnchoredPosition: {x: 17, y: 20} + m_SizeDelta: {x: 603.168, y: 431.3433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6838249975052946968 CanvasRenderer: diff --git a/Assets/Scenes/04_ToolMaterialScene.unity b/Assets/Scenes/04_ToolMaterialScene.unity index 6e4016b..a7df05d 100644 --- a/Assets/Scenes/04_ToolMaterialScene.unity +++ b/Assets/Scenes/04_ToolMaterialScene.unity @@ -1401,7 +1401,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u68B3\u5986\u955C" + m_text: "\u6362\u88C5\u955C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2} m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2} diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index d0d040f..253598c 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -1910,8 +1910,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 680750128} m_LocalRotation: {x: -0, y: -0.033108294, z: -0, w: 0.9994518} - m_LocalPosition: {x: 0, y: 1.47, z: 0} - m_LocalScale: {x: 0.27768508, y: 0.27768508, z: 0.27768508} + m_LocalPosition: {x: -0.104, y: 1.096, z: -0.123} + m_LocalScale: {x: 1.5, y: 1.5, z: 0.27768508} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1198127457} @@ -1958,7 +1958,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 795bf845bc82229408b2751cbf24f324, type: 3} + m_Sprite: {fileID: 21300000, guid: a11d39002c2f59743a59ba54bb343040, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2415,6 +2415,7 @@ MonoBehaviour: npcSpeack: - "\u60A8\u597D" speackIndex: 0 + spriteRenderer: {fileID: 1638246613} --- !u!136 &890581131 CapsuleCollider: m_ObjectHideFlags: 0 @@ -3941,6 +3942,7 @@ MonoBehaviour: - "\u7740\u88C5\u89C4\u8303\u3001\u4E2A\u4EBA\u9632\u62A4\u7528\u54C1\u5408\u683C\u9F50\u5907\u3001\u4EBA\u5458\u7CBE\u795E\u72B6\u6001\u826F\u597D\uFF0C\u53EF\u4EE5\u5F00\u5C55\u5DE5\u4F5C\uFF01" - "\u4ECA\u5929\u5DE5\u4F5C\u5185\u5BB9\u662F\u76F4\u63A5\u63A5\u5165\u5F0F\u7535\u80FD\u8BA1\u91CF\u88C5\u7F6E\u8F6E\u6362\u4F5C\u4E1A\uFF0C\u5DE5\u4F5C\u5730\u70B9\u662Fxxx......" speackIndex: 0 + spriteRenderer: {fileID: 680750130} --- !u!4 &1198127457 Transform: m_ObjectHideFlags: 0 @@ -4666,8 +4668,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638246611} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 1.47, z: 0} - m_LocalScale: {x: 0.27768508, y: 0.27768508, z: 0.27768508} + m_LocalPosition: {x: 0, y: 0.996, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 0.27768508} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 890581128} @@ -4714,7 +4716,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 795bf845bc82229408b2751cbf24f324, type: 3} + m_Sprite: {fileID: 21300000, guid: a11d39002c2f59743a59ba54bb343040, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Scripts/Project/Objects/Other/NPCController.cs b/Assets/Scripts/Project/Objects/Other/NPCController.cs index d894d80..a12bc36 100644 --- a/Assets/Scripts/Project/Objects/Other/NPCController.cs +++ b/Assets/Scripts/Project/Objects/Other/NPCController.cs @@ -6,6 +6,7 @@ public class NPCController : PermanentTriggerBase { public List npcSpeack; public int speackIndex = 0; + public SpriteRenderer spriteRenderer; protected override void OnMDown() { base.OnMDown(); @@ -17,6 +18,7 @@ public class NPCController : PermanentTriggerBase panel.Init(triggerName, npcSpeack[speackIndex], NextSpeack); }); _highlight.SetHighlighted(false); + spriteRenderer.gameObject.SetActive(false); } }