diff --git a/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png b/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png new file mode 100644 index 000000000..ec2096c29 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png differ diff --git a/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png.meta b/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png.meta new file mode 100644 index 000000000..dbf582072 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/Img_Fish/cion_1.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 9aaf93beba8dd1a4797b67dee38c97e4 +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: 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/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png b/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png new file mode 100644 index 000000000..a69073c8f Binary files /dev/null and b/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png differ diff --git a/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png.meta b/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png.meta new file mode 100644 index 000000000..5827e2e22 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/Img_Fish/cion_2.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: b87eb5ed7d0f2864d9223218fadf02ef +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: 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/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png b/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png new file mode 100644 index 000000000..5c8b726eb Binary files /dev/null and b/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png differ diff --git a/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png.meta b/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png.meta new file mode 100644 index 000000000..a44394a0a --- /dev/null +++ b/meng_yao/Assets/Resources/animation/Img_Fish/cion_3.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 38e6b85e401c08f4eb5938aa19e72515 +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: 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/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity b/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity index 8b5767791..a0c71d607 100644 --- a/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity +++ b/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity @@ -206,6 +206,117 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &41279280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 41279281} + - component: {fileID: 41279284} + - component: {fileID: 41279283} + - component: {fileID: 41279282} + m_Layer: 5 + m_Name: shipnumber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &41279281 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41279280} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 0.59999996, y: 0.7789514, z: 0.7789514} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1271499322} + m_Father: {fileID: 1048058358} + m_RootOrder: 4 + 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: 2.504, y: 0.887} + m_SizeDelta: {x: 1.65, y: 0.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!210 &41279282 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41279280} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 99 +--- !u!222 &41279283 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41279280} + m_CullTransparentMesh: 1 +--- !u!212 &41279284 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41279280} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4319f8a1771ef154db3f5b49657b9d57, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.65, y: 0.42} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &56093339 GameObject: m_ObjectHideFlags: 0 @@ -323,6 +434,7 @@ Transform: - {fileID: 733512740} - {fileID: 1616921918} - {fileID: 1621691473} + - {fileID: 809751611} - {fileID: 2088916450} - {fileID: 102276562} m_Father: {fileID: 787643888} @@ -396,6 +508,7 @@ MonoBehaviour: getgoldnumber: 100 goldshop: {fileID: 1621691472} goldNumerTextPro: {fileID: 1113669198} + shipNumberTextPro: {fileID: 1972442482} HightLight: {fileID: 102276561} Btntrans: {fileID: 56346249} FishPrice: 0 @@ -514,7 +627,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 56346249} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &102276563 SpriteRenderer: @@ -894,6 +1007,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a48788a64136b294b8e996807b88dad1, type: 3} m_Name: m_EditorClassIdentifier: + icon: + - {fileID: 21300000, guid: 9aaf93beba8dd1a4797b67dee38c97e4, type: 3} + - {fileID: 21300000, guid: b87eb5ed7d0f2864d9223218fadf02ef, type: 3} + - {fileID: 21300000, guid: 38e6b85e401c08f4eb5938aa19e72515, type: 3} --- !u!1 &199805571 GameObject: m_ObjectHideFlags: 0 @@ -1435,7 +1552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.14, y: 2.04} + m_AnchoredPosition: {x: -0.14, y: 2.4690003} m_SizeDelta: {x: 1.65, y: 0.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &310426480 @@ -2347,6 +2464,7 @@ Transform: - {fileID: 325072784} - {fileID: 310426479} - {fileID: 1780327003} + - {fileID: 2098360461} - {fileID: 1005748196} - {fileID: 1504197551} m_Father: {fileID: 787643888} @@ -2421,6 +2539,7 @@ MonoBehaviour: getgoldnumber: 100 goldshop: {fileID: 1780327002} goldNumerTextPro: {fileID: 979148971} + shipNumberTextPro: {fileID: 1565889060} HightLight: {fileID: 1504197550} Btntrans: {fileID: 559443431} FishPrice: 0 @@ -2455,7 +2574,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1048058358} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &579933542 SpriteRenderer: @@ -3050,6 +3169,117 @@ Transform: m_Father: {fileID: 1987825451} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &809751610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 809751611} + - component: {fileID: 809751614} + - component: {fileID: 809751613} + - component: {fileID: 809751612} + m_Layer: 5 + m_Name: shipnumber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &809751611 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809751610} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 0.59999996, y: 0.7789514, z: 0.7789514} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1972442481} + m_Father: {fileID: 56346249} + m_RootOrder: 3 + 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: -3.82, y: 1.45} + m_SizeDelta: {x: 1.65, y: 0.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!210 &809751612 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809751610} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 99 +--- !u!222 &809751613 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809751610} + m_CullTransparentMesh: 1 +--- !u!212 &809751614 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809751610} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4319f8a1771ef154db3f5b49657b9d57, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.65, y: 0.42} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &814245188 GameObject: m_ObjectHideFlags: 0 @@ -3863,7 +4093,7 @@ Transform: - {fileID: 815685643} - {fileID: 736711439} m_Father: {fileID: 559443431} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1048058357 GameObject: @@ -3899,6 +4129,7 @@ Transform: - {fileID: 1380133528} - {fileID: 784479836} - {fileID: 548580335} + - {fileID: 41279281} - {fileID: 579933541} m_Father: {fileID: 787643888} m_RootOrder: 1 @@ -3972,6 +4203,7 @@ MonoBehaviour: getgoldnumber: 100 goldshop: {fileID: 784479835} goldNumerTextPro: {fileID: 1634093115} + shipNumberTextPro: {fileID: 1271499323} HightLight: {fileID: 579933540} Btntrans: {fileID: 1048058358} FishPrice: 0 @@ -4462,6 +4694,178 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1271499321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271499322} + - component: {fileID: 1271499324} + - component: {fileID: 1271499323} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1271499322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271499321} + 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: 41279281} + 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 &1271499323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271499321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: 9999 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1271499324} + m_maskType: 0 +--- !u!23 &1271499324 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271499321} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1328318912 GameObject: m_ObjectHideFlags: 0 @@ -5205,7 +5609,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 559443431} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1504197552 SpriteRenderer: @@ -5384,6 +5788,178 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1565889058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1565889059} + - component: {fileID: 1565889061} + - component: {fileID: 1565889060} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1565889059 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565889058} + 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: 2098360461} + 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 &1565889060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565889058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: 9999 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1565889061} + m_maskType: 0 +--- !u!23 &1565889061 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565889058} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1576490688 GameObject: m_ObjectHideFlags: 0 @@ -5842,7 +6418,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: -1.71, y: 3.31} + m_AnchoredPosition: {x: -3.8, y: 2.44} m_SizeDelta: {x: 1.65, y: 0.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1616921919 @@ -5954,7 +6530,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: -1.74, y: 2.79} + m_AnchoredPosition: {x: -3.83, y: 1.9200001} m_SizeDelta: {x: 1.65, y: 0.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1621691474 @@ -6437,7 +7013,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.148, y: 1.505} + m_AnchoredPosition: {x: -0.148, y: 1.934} m_SizeDelta: {x: 1.65, y: 0.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1780327004 @@ -7249,6 +7825,178 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1972442480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1972442481} + - component: {fileID: 1972442483} + - component: {fileID: 1972442482} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1972442481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972442480} + 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: 809751611} + 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 &1972442482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972442480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: 9999 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1972442483} + m_maskType: 0 +--- !u!23 &1972442483 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972442480} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1978754813 GameObject: m_ObjectHideFlags: 0 @@ -7791,8 +8539,119 @@ Transform: - {fileID: 1506570752} - {fileID: 2079495230} m_Father: {fileID: 56346249} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2098360460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2098360461} + - component: {fileID: 2098360464} + - component: {fileID: 2098360463} + - component: {fileID: 2098360462} + m_Layer: 5 + m_Name: shipnumber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2098360461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098360460} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 0.6, y: 0.7789474, z: 0.7789474} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1565889059} + m_Father: {fileID: 559443431} m_RootOrder: 3 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.148, y: 1.481} + m_SizeDelta: {x: 1.65, y: 0.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!210 &2098360462 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098360460} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 99 +--- !u!222 &2098360463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098360460} + m_CullTransparentMesh: 1 +--- !u!212 &2098360464 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098360460} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4319f8a1771ef154db3f5b49657b9d57, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.65, y: 0.42} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2133241628 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs b/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs index b3282c9d8..8a061c496 100644 --- a/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs +++ b/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs @@ -18,7 +18,7 @@ public class boy : mount { //测试用 Login login = new Login(); - login.Phone = "test1"; + login.Phone = "1111"; await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login)); @@ -52,13 +52,14 @@ public class boy : mount if (currencType == 0)//金币 { allfisherman = await web.SendRequest(web.URL + "/FisherElfActive/GetListOfGold", "POST"); - + // Debug.Log(allfisherman); } else//宝石 { allfisherman = await web.SendRequest(web.URL + "/FisherElfActive/GetListOfGem", "POST"); + // Debug.Log(allfisherman); } - //Debug.Log(allfisherman); + Debug.Log(allfisherman); Response allfishermanres = JsonUtility.FromJson(allfisherman); //Debug.Log(Struct.StructToString(allfishermanres, 1)); foreach (Item item in allfishermanres.List) diff --git a/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs b/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs index c7eb2fc39..70b74acfc 100644 --- a/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs +++ b/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs @@ -170,7 +170,9 @@ public class landContorl : MonoBehaviour fishMan = GameObject.Instantiate(fishManPrefab); fishMan.transform.position = endPos.position; fishManShipContorl = fishMan.GetComponent(); - MoveToStartPos(); + + fishManShipContorl.UpShowTimer(timerStr); + StartCoroutine(Fishing()); return; } @@ -240,17 +242,25 @@ public class landContorl : MonoBehaviour IEnumerator Fishing() { - fishMan.GetComponent().SetState(ShipState.shipthrow); + // 创建一个摆动效果的 Tween + //注意 ，摆动动的是船，移动移动是根节点 + var swayTween = fishManShipContorl.Man.transform.DOLocalRotate(new Vector3(0, 0, 10), 1f, RotateMode.LocalAxisAdd) // 每次摆动角度 + .SetEase(Ease.InOutSine) + .SetLoops(-1, LoopType.Yoyo); // 无限往复 - + + fishMan.GetComponent().SetState(ShipState.shipthrow); yield return new WaitForSeconds(1f); fishMan.GetComponent().SetState(ShipState.stand); // 等待捕鱼指定时间 yield return new WaitForSeconds(fishingNeedTimer-1f); + // 停止摆动效果 + swayTween.Kill(); + // 返回起点 - MoveToStartPos(); + // MoveToStartPos(); } diff --git a/meng_yao/Assets/script/cultivation_gold_gold_Island/boy_jinsha.cs b/meng_yao/Assets/script/cultivation_gold_gold_Island/boy_jinsha.cs index d28b81f8c..03f56c9d9 100644 --- a/meng_yao/Assets/script/cultivation_gold_gold_Island/boy_jinsha.cs +++ b/meng_yao/Assets/script/cultivation_gold_gold_Island/boy_jinsha.cs @@ -18,7 +18,7 @@ public class boy_jinsha:mount { //测试用 Login login = new Login(); - login.Phone = "tast4"; + login.Phone = "tast5"; await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login)); @@ -72,7 +72,7 @@ public class boy_jinsha:mount { if (gameObject.GetComponent().ActivateValue == item.ActivateValue)//如果价格一致 { - Debug.Log(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString()); + //Debug.Log(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString()); gameObject.GetComponent().add_fish(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString()); } } diff --git a/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs b/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs index 66b7b7e7e..b1e36c272 100644 --- a/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs +++ b/meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs @@ -6,45 +6,61 @@ using TMPro; public class landContorl_jinsha : MonoBehaviour { + [Header("渔船的预制体")] public GameObject fishManPrefab; - private GameObject fishMan; - private shipcontorl fishManShipContorl; + + private GameObject fishMan;//生成的渔船 + private shipcontorl fishManShipContorl;//渔船的控制器 + + [Header("渔船生成点")] public Transform startPos; + [Header("渔船终点")] public Transform endPos; + [Header("岛屿类型编号")] public int type; + public bool isbuy = false; - // public bool isGoldLand = false; + public float ActivateValue = 0; public int Num = 0; public int Type = 0; - //路径 + + [Header("渔船航行路径点集合")] public List paths; //航行时间 + [Header("航行时间")] public float pathsNeedTimer = 30f; //捕鱼时间 + [Header("捕鱼时间")] public float fishingNeedTimer = 30f; //休息时间 - public float restTimer = 5f; - - //每次获得的金币数量，默认100 - public int getgoldnumber = 100; + [Header("休息时间")] + public float restTimer = 5f; - public GameObject goldshop; - + + [Header("显示金币数量")] public TextMeshPro goldNumerTextPro; - - public GameObject HightLight;//高亮 + [Header("显示船只数量")] + public TextMeshPro shipNumberTextPro; + public int shipNumber = 0; + + [Header("点击的高亮图层")] + public GameObject HightLight;//高亮图层 public Transform Btntrans; public float FishPrice; public GameObject map; + + + public static bool canClick=true; + // Start is called before the first frame update private void Start() @@ -52,11 +68,7 @@ public class landContorl_jinsha : MonoBehaviour FishPrice = 10; - if (goldshop == null) - { - Debug.LogError("goldshop==null"); - return; - } + HightLight.SetActive(false); @@ -111,6 +123,7 @@ public class landContorl_jinsha : MonoBehaviour } else { + //Promptmgr.Instance.PromptBubble("购买失败", Color.black, Color.red); Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); } } @@ -125,20 +138,29 @@ public class landContorl_jinsha : MonoBehaviour } private void OnMouseDown() - { - + { OnClick(); } private void OnTouch() - { - - + { OnClick(); } private void OnClick() { - if(!isbuy) + if (!canClick) + { + return; + } + + if (fishMan != null) + { + Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red); + + return; + } + + if (!isbuy) { Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red); return; @@ -156,7 +178,7 @@ public class landContorl_jinsha : MonoBehaviour if (fishMan != null) { - Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red); + //Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red); fishManShipContorl.UpShowTimer(timerStr); return; } @@ -166,7 +188,9 @@ public class landContorl_jinsha : MonoBehaviour fishMan = GameObject.Instantiate(fishManPrefab); fishMan.transform.position = endPos.position; fishManShipContorl = fishMan.GetComponent(); - MoveToStartPos(); + + fishManShipContorl.UpShowTimer(timerStr); + StartCoroutine(Fishing()); this.isbuy = true; @@ -237,6 +261,12 @@ public class landContorl_jinsha : MonoBehaviour IEnumerator Fishing() { + // 创建一个摆动效果的 Tween + //注意 ，摆动动的是船，移动移动是根节点 + var swayTween = fishManShipContorl.Man.transform.DOLocalRotate(new Vector3(0, 0, 10), 1f, RotateMode.LocalAxisAdd) // 每次摆动角度 + .SetEase(Ease.InOutSine) + .SetLoops(-1, LoopType.Yoyo); // 无限往复 + fishMan.GetComponent().SetState(ShipState.shipthrow); @@ -247,8 +277,11 @@ public class landContorl_jinsha : MonoBehaviour // 等待捕鱼指定时间 yield return new WaitForSeconds(fishingNeedTimer - 1f); + + // 停止摆动效果 + // swayTween.Kill(); // 返回起点 - MoveToStartPos(); + //MoveToStartPos(); } @@ -258,7 +291,7 @@ public class landContorl_jinsha : MonoBehaviour // 随机选择一条路径 Path selectedPath = paths[Random.Range(0, paths.Count)]; - // 移动到捕鱼点 + // 移动到点 StartCoroutine(MoveToStartPos(fishMan, selectedPath.pathPoints)); } @@ -303,6 +336,8 @@ public class landContorl_jinsha : MonoBehaviour // 等待捕鱼指定时间 yield return new WaitForSeconds(restTimer); + + // 停止摆动效果 swayTween.Kill(); diff --git a/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs b/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs index c42ded5a2..ad8199ff2 100644 --- a/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs +++ b/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs @@ -7,6 +7,8 @@ public class shopman :mount public static shopman instance; public delegate void OnClikeWT(int type, int num); public event OnClikeWT OnType;//点击事件 + + public List icon; // Start is called before the first frame update public override void Awake() { @@ -18,18 +20,19 @@ public class shopman :mount //关闭摄像头逻辑 Cinemachine_2dCon.SetCameraContorl(false); - Debug.LogError("禁用生成船只逻辑"); + //Debug.LogError("禁用生成船只逻辑"); + landContorl_jinsha.canClick = false; List boxTypes = new List(); boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第一层", Type = 4, is_required = true }); - boxTypes.Add(new BoxType { Name = "矿工1", prompt = "初级精灵", Type = 3, is_required = true }); + boxTypes.Add(new BoxType { Name = "矿工1", prompt = "初级精灵", Type = 3, is_required = true, icon = icon[0] }); boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第二层", Type = 4, is_required = true }); - boxTypes.Add(new BoxType { Name = "矿工1", prompt = "中级精灵", Type = 3, is_required = true }); + boxTypes.Add(new BoxType { Name = "矿工1", prompt = "中级精灵", Type = 3, is_required = true, icon = icon[1] }); boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第三层", Type = 4, is_required = true }); - boxTypes.Add(new BoxType { Name = "矿工1", prompt = "高级精灵", Type = 3, is_required = true }); + boxTypes.Add(new BoxType { Name = "矿工1", prompt = "高级精灵", Type = 3, is_required = true, icon = icon[2] }); @@ -44,6 +47,7 @@ public class shopman :mount { //关闭摄像头逻辑 Cinemachine_2dCon.SetCameraContorl(true); + landContorl_jinsha.canClick = true; }; gameObjects[1].GetComponent().register_click(async (BoxType boxType, int type) =>//登录确定或取消