diff --git a/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png new file mode 100644 index 0000000..6606e38 Binary files /dev/null and b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png differ diff --git a/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png.meta b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png.meta new file mode 100644 index 0000000..badb64b --- /dev/null +++ b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-hover背景.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 86b9a7116516fee42a9f1964c8d4c560 +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: 1 + 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: 2048 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png new file mode 100644 index 0000000..6daa779 Binary files /dev/null and b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png differ diff --git a/Assets/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png.meta b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png.meta new file mode 100644 index 0000000..a166b13 --- /dev/null +++ b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-浅色背景.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5aac52b586df42542a84a06973ad9821 +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: 1 + 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: 2048 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png new file mode 100644 index 0000000..943c1a0 Binary files /dev/null and b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png differ diff --git a/Assets/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png.meta b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png.meta new file mode 100644 index 0000000..7941541 --- /dev/null +++ b/Assets/Art/Sprites/经络穴位UI/左侧工具面板-选中背景.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5c8433a3a42450a4d984388736f87dac +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: 1 + 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: 2048 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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/JingMai/Liu/Shader Graphs_Liu.mat b/Assets/JingMai/Liu/Shader Graphs_LiuBlue.mat similarity index 95% rename from Assets/JingMai/Liu/Shader Graphs_Liu.mat rename to Assets/JingMai/Liu/Shader Graphs_LiuBlue.mat index fa57bdb..199d3ef 100644 --- a/Assets/JingMai/Liu/Shader Graphs_Liu.mat +++ b/Assets/JingMai/Liu/Shader Graphs_LiuBlue.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Shader Graphs_Liu + m_Name: Shader Graphs_LiuBlue m_Shader: {fileID: -6465566751694194690, guid: b4c631287938cf0469de45667a11004b, type: 3} m_ValidKeywords: [] @@ -57,7 +57,7 @@ Material: - _ZWrite: 0 - _ZWriteControl: 0 m_Colors: - - _BaseColor: {r: 0, g: 1, b: 0.19017506, a: 0} + - _BaseColor: {r: 0, g: 0, b: 1, a: 0} m_BuildTextureStacks: [] --- !u!114 &6952258956058297864 MonoBehaviour: diff --git a/Assets/JingMai/Liu/Shader Graphs_Liu.mat.meta b/Assets/JingMai/Liu/Shader Graphs_LiuBlue.mat.meta similarity index 100% rename from Assets/JingMai/Liu/Shader Graphs_Liu.mat.meta rename to Assets/JingMai/Liu/Shader Graphs_LiuBlue.mat.meta diff --git a/Assets/JingMai/Liu/Shader Graphs_Liu 1.mat b/Assets/JingMai/Liu/Shader Graphs_LiuRed.mat similarity index 93% rename from Assets/JingMai/Liu/Shader Graphs_Liu 1.mat rename to Assets/JingMai/Liu/Shader Graphs_LiuRed.mat index 651cedd..d2b04e0 100644 --- a/Assets/JingMai/Liu/Shader Graphs_Liu 1.mat +++ b/Assets/JingMai/Liu/Shader Graphs_LiuRed.mat @@ -7,11 +7,9 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Shader Graphs_Liu 1 + m_Name: Shader Graphs_LiuRed m_Shader: {fileID: -6465566751694194690, guid: b4c631287938cf0469de45667a11004b, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON @@ -22,7 +20,6 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -52,7 +49,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _ReverseDir: 0 - - _Speed: 0.188 + - _Speed: 0.083 - _SrcBlend: 1 - _Surface: 1 - _WorkflowMode: 1 diff --git a/Assets/JingMai/Liu/Shader Graphs_Liu 1.mat.meta b/Assets/JingMai/Liu/Shader Graphs_LiuRed.mat.meta similarity index 100% rename from Assets/JingMai/Liu/Shader Graphs_Liu 1.mat.meta rename to Assets/JingMai/Liu/Shader Graphs_LiuRed.mat.meta diff --git a/Assets/_Scenes/JingLuoXueWei.unity b/Assets/_Scenes/JingLuoXueWei.unity index 04777a5..39e13ac 100644 --- a/Assets/_Scenes/JingLuoXueWei.unity +++ b/Assets/_Scenes/JingLuoXueWei.unity @@ -2970,6 +2970,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1811462525} + - {fileID: 975232558} m_Father: {fileID: 6864721284539055035} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3421,6 +3422,12 @@ MonoBehaviour: - {fileID: 1343522807} - {fileID: 914636702} - {fileID: 95679524} + allRedJingLuoRenderer: [] + allBlueJingLuoRenderer: [] + redJingLuoMaterial: {fileID: 2100000, guid: a3ffda5cda3dd4044b204f94f1fe11f2, type: 2} + blueJingLuoMaterial: {fileID: 2100000, guid: 7346d2dd5ec6f634e803050d8150aa0f, type: 2} + defaultJingLuoMaterial: {fileID: 5650526492999649590, guid: b261180ea6a601d4a90b1c38bb910adf, + type: 3} allXueWeiRenderer: - {fileID: 1343522819} - {fileID: 1343522818} @@ -3500,6 +3507,7 @@ MonoBehaviour: - {fileID: 95679526} redMaterial: {fileID: 2100000, guid: 37ff2ca219a96324f937ab6e2e95840f, type: 2} blueMaterial: {fileID: 2100000, guid: 4b7c5f61612317846a93db8ba071955f, type: 2} + selectJingLuoName: interactionManager: {fileID: 0} timelineManager: {fileID: 0} playerManager: {fileID: 0} @@ -18464,6 +18472,83 @@ Transform: m_Father: {fileID: 246030009} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &975232557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 975232558} + - component: {fileID: 975232560} + - component: {fileID: 975232559} + m_Layer: 6 + m_Name: leftbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &975232558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975232557} + 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: + - {fileID: 1578446399} + m_Father: {fileID: 131123747} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 58, y: 0} + m_SizeDelta: {x: 72, y: 517} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &975232559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975232557} + 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: 21300000, guid: 5aac52b586df42542a84a06973ad9821, 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 &975232560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975232557} + m_CullTransparentMesh: 1 --- !u!1 &978522854 GameObject: m_ObjectHideFlags: 0 @@ -24156,7 +24241,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: b261180ea6a601d4a90b1c38bb910adf, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1152882870984560961, guid: b261180ea6a601d4a90b1c38bb910adf, type: 3} @@ -28286,6 +28371,145 @@ CapsuleCollider: m_Height: 0.025 m_Direction: 2 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1578446398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1578446399} + - component: {fileID: 1578446403} + - component: {fileID: 1578446402} + - component: {fileID: 1578446401} + - component: {fileID: 1578446400} + m_Layer: 6 + m_Name: xunXing_Btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1578446399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578446398} + 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: + - {fileID: 1582125097} + m_Father: {fileID: 975232558} + m_RootOrder: 0 + 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: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1578446400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578446398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07faecfd079d0d849ae36d57a1111e00, type: 3} + m_Name: + m_EditorClassIdentifier: + img: {fileID: 21300000, guid: e7869cec7e7e9a847816793fdd0df1ea, type: 3} + hoverImg: {fileID: 21300000, guid: 5c8433a3a42450a4d984388736f87dac, type: 3} + isOpen: 0 +--- !u!114 &1578446401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578446398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 5c8433a3a42450a4d984388736f87dac, + type: 3} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1578446402} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1578446402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578446398} + 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: 21300000, guid: e7869cec7e7e9a847816793fdd0df1ea, 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 &1578446403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578446398} + m_CullTransparentMesh: 1 --- !u!1 &1581078591 GameObject: m_ObjectHideFlags: 0 @@ -28348,6 +28572,86 @@ Transform: m_Father: {fileID: 1494920894} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1582125096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1582125097} + - component: {fileID: 1582125099} + - component: {fileID: 1582125098} + m_Layer: 6 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1582125097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582125096} + 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: 1578446399} + m_RootOrder: 0 + 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 &1582125098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582125096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 12800000, guid: 60ee95c36778d1e45be2c34febf3bae9, type: 3} + m_FontSize: 20 + m_FontStyle: 3 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5FAA\u884C" +--- !u!222 &1582125099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1582125096} + m_CullTransparentMesh: 1 --- !u!1 &1582853761 GameObject: m_ObjectHideFlags: 0 @@ -33010,7 +33314,7 @@ GameObject: - component: {fileID: 1811462527} - component: {fileID: 1811462526} m_Layer: 6 - m_Name: bg + m_Name: rightbg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/_Scripts/Application/JingLuoXueWei/GameManager.cs b/Assets/_Scripts/Application/JingLuoXueWei/GameManager.cs index afd79da..0198107 100644 --- a/Assets/_Scripts/Application/JingLuoXueWei/GameManager.cs +++ b/Assets/_Scripts/Application/JingLuoXueWei/GameManager.cs @@ -1,8 +1,9 @@ -using ZXKFramework; -using UnityEngine; -using System.Collections; using NUnit.Framework; +using System.Collections; using System.Collections.Generic; +using UnityEngine; +using YiLiao.Main; +using ZXKFramework; namespace YiLiao.JingLuoXueWei { public class GameManager : MonoSingleton @@ -12,6 +13,37 @@ namespace YiLiao.JingLuoXueWei /// public List allJingLuoGame; + + /// + /// ɫľ(ڱɫ) + /// + [Header("ɫľ(ڱɫ)")] + public List allRedJingLuoRenderer; + + /// + /// ɫľ(ڱɫ) + /// + [Header("ɫľ(ڱɫ)")] + public List allBlueJingLuoRenderer; + + /// + /// ɫIJ + /// + [Header("ɫIJ")] + public Material redJingLuoMaterial; + + /// + /// ɫIJ + /// + [Header("ɫIJ")] + public Material blueJingLuoMaterial; + + /// + /// ĬϵIJ + /// + [Header("ĬϵIJ")] + public Material defaultJingLuoMaterial; + /// /// еѨλ(ڱɫ) /// @@ -20,13 +52,13 @@ namespace YiLiao.JingLuoXueWei /// /// ĬϵIJ /// - [Header("ĬϵIJ")] + [Header("ѨλĬϵIJ")] public Material redMaterial; /// /// ɫIJ /// - [Header("ɫIJ")] + [Header("ѨλɫIJ")] public Material blueMaterial; [HideInInspector] @@ -131,5 +163,51 @@ namespace YiLiao.JingLuoXueWei Game.Instance.eventManager.RemoveListener(PlayTrueOrFalseSound); Game.Instance.eventManager.RemoveListener(PlaySound); } + + /// + /// ľɫ(ѭеʱʹ) + /// + /// + public void ChangeJingLuoColor(string name) + { + for (int i = 0; i < allRedJingLuoRenderer.Count; i++) + { + if (allRedJingLuoRenderer[i].gameObject.name.Equals(name)) + { + allRedJingLuoRenderer[i].material = redJingLuoMaterial; + } + else + { + allRedJingLuoRenderer[i].material = defaultJingLuoMaterial; + } + } + + for (int i = 0; i < allBlueJingLuoRenderer.Count; i++) + { + if (allBlueJingLuoRenderer[i].gameObject.name.Equals(name)) + { + allBlueJingLuoRenderer[i].material = blueJingLuoMaterial; + } + else + { + allBlueJingLuoRenderer[i].material = defaultJingLuoMaterial; + } + } + } + + /// + /// ɫĻĬɫ(رѭеʱʹ) + /// + public void ChangeJingLuoDefaultColor() + { + for (int i = 0; i < allRedJingLuoRenderer.Count; i++) + { + allRedJingLuoRenderer[i].material = defaultJingLuoMaterial; + } + for (int i = 0; i < allBlueJingLuoRenderer.Count; i++) + { + allBlueJingLuoRenderer[i].material = defaultJingLuoMaterial; + } + } } } diff --git a/Assets/_Scripts/Application/JingLuoXueWei/UI/LeftBigBtnPanel.cs b/Assets/_Scripts/Application/JingLuoXueWei/UI/LeftBigBtnPanel.cs index 0cca77e..3352a8d 100644 --- a/Assets/_Scripts/Application/JingLuoXueWei/UI/LeftBigBtnPanel.cs +++ b/Assets/_Scripts/Application/JingLuoXueWei/UI/LeftBigBtnPanel.cs @@ -43,11 +43,22 @@ public class LeftBigBtnPanel : UIBase GameModel gameModel; + Button xunXing_Btn; + /// + /// Ƿѭ + /// + bool isOpenXunXing = false; + + /// + /// ǰѡľ + /// + string selectJingLuoName; public override void Init(IUIManager uictrl) { base.Init(uictrl); gameManager = GameManager.Instance; gameModel = MVC.GetModel(); + xunXing_Btn = transform.FindFirst