diff --git a/Assets/ResRaw/Maps/Map1/Map1.unity b/Assets/ResRaw/Maps/Map1/Map1.unity index ab1a0194f..0151d1699 100644 --- a/Assets/ResRaw/Maps/Map1/Map1.unity +++ b/Assets/ResRaw/Maps/Map1/Map1.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 0.8050667 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_SkyboxMaterial: {fileID: 2036836573} + m_SkyboxMaterial: {fileID: 293664729} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -165,6 +165,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26623fd0e291a478a9f8b68a3df7e8a6, type: 3} m_Name: m_EditorClassIdentifier: + _Version: 0 _Mode: 0 _Weight: 1 _Queue: 0 @@ -174,7 +175,6 @@ MonoBehaviour: _Data: rid: -2 _DrawBounds: 0 - _Version: 0 _Primitive: 3 _Inverted: 0 _WaterHeightDistanceCulling: 0 @@ -230,6 +230,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &116710584 MeshFilter: @@ -308,7 +309,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135187477} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.38268346, z: -0, w: 0.92387956} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -325,8 +326,8 @@ WindZone: m_Enabled: 1 m_Mode: 0 m_Radius: 20 - m_WindMain: 1 - m_WindTurbulence: 0 + m_WindMain: 0.25 + m_WindTurbulence: 0.25 m_WindPulseMagnitude: 0.5 m_WindPulseFrequency: 0.01 --- !u!1 &155834305 @@ -419,6 +420,54 @@ Transform: - {fileID: 1943117823856942010} m_Father: {fileID: 965921865900907107} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &293664729 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enviro/Skybox + m_Shader: {fileID: 4800000, guid: 34fee0a1b19b20b45aea7483b5f757da, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _GalaxyTex: + m_Texture: {fileID: 8900000, guid: 5734983fc81450b4187c3cfa5985edef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MoonGlowTex: + m_Texture: {fileID: 2800000, guid: 6838e0810da4e49488b5d9a6ee76eb07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MoonTex: + m_Texture: {fileID: 2800000, guid: c6fd9f694390e0245b6dca5812065950, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _StarsTex: + m_Texture: {fileID: 8900000, guid: b5a7175da0f133b4d951c19c9c2cebfc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SunTex: + m_Texture: {fileID: 2800000, guid: c95bed5306e94f24ba5802d841607ac7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &616245857 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +606,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e64c239f69eea46778ded6dcc3427a34, type: 3} m_Name: m_EditorClassIdentifier: WaveHarmonic.Crest::WaveHarmonic.Crest.WaterRenderer + _Version: 2 _Layer: 4 _Material: {fileID: 2100000, guid: 8ab064b6606504a55b489af2787350c2, type: 2} _VolumeMaterial: {fileID: 0} @@ -566,7 +616,6 @@ MonoBehaviour: _TimeSliceBoundsUpdateFrameCount: 1 _SurfaceSelfIntersectionFixMode: 4 _AllowRenderQueueSorting: 0 - _Version: 2 _Camera: {fileID: 0} _TimeProvider: {fileID: 0} _WindZone: {fileID: 0} @@ -594,7 +643,10 @@ MonoBehaviour: _Resolution: 384 _GeometryDownSampleFactor: 2 _ExtentsSizeMultiplier: 100 + _MultipleViewpoints: 0 _Viewpoint: {fileID: 0} + _CameraExclusions: -1 + _DataBackgroundMode: 3 _CenterOfDetailDisplacementCorrection: 1 _SampleTerrainHeightForScale: 1 _ForceScaleChangeSmoothing: 0 @@ -630,10 +682,16 @@ MonoBehaviour: _Portals: rid: 2003882626816671964 _ShowWaterProxyPlane: 0 - _EditModeFrameRate: 30 _FollowSceneCamera: 1 + _EditorMultipleViewpoints: 1 _HeightQueries: 1 _Debug: + _VisualizeData: 0 + _VisualizeDataType: 0 + _VisualizeDataExposure: 0 + _VisualizeDataRange: 10 + _VisualizeDataSaturate: 1 + _SimulatePaused: 0 _AttachDebugGUI: 0 _ShowHiddenObjects: 0 _DisableFollowViewpoint: 0 @@ -641,6 +699,8 @@ MonoBehaviour: _LogScaleChange: 0 _PauseOnScaleChange: 0 _IgnoreWavesForScaleChange: 0 + _OverrideScale: 0 + _ScaleOverride: 0 _ForceNoGraphics: 0 _Resources: {fileID: 11400000, guid: 0817af17dea584e5382e6216db162d4a, type: 2} references: @@ -652,88 +712,119 @@ MonoBehaviour: _Version: 0 _Enabled: 1 _Layer: 4 + _MeshType: 0 + _ChunkTemplate: {fileID: 1516456258233481520, guid: 17840562212c147d6bdb5144d35bc442, type: 3} + _SupportCustomRenderers: 1 _Material: {fileID: 2100000, guid: 5f4abc1146fb7bb44bbf906676601ad4, type: 2} _VolumeMaterial: {fileID: 0} - _ChunkTemplate: {fileID: 1516456258233481520, guid: 17840562212c147d6bdb5144d35bc442, type: 3} _CastShadows: 0 _WaterBodyCulling: 1 _TimeSliceBoundsUpdateFrameCount: 1 + _CameraExclusions: 6 _SurfaceSelfIntersectionFixMode: 4 _AllowRenderQueueSorting: 0 _Debug: _UniformTiles: 0 _DisableSkirt: 0 + _DrawRendererBounds: 0 - rid: 2003882626816671950 type: {class: AnimatedWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _OverrideResolution: 0 _Resolution: 256 _TextureFormatMode: 100 _TextureFormat: 48 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 4096 + _CollisionLayers: -1 + _BakedWaveData: {fileID: 0} + _WaveSampling: 0 _WaveResolutionMultiplier: 1 _AttenuationInShallows: 0.95 _ShallowsMaximumDepth: 1000 _CollisionSource: 2 - _CollisionLayers: -1 - _MaximumQueryCount: 4096 - _BakedWaveData: {fileID: 0} - rid: 2003882626816671951 type: {class: DepthLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 100 _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 512 _IncludeTerrainHeight: 1 _EnableSignedDistanceFields: 1 - rid: 2003882626816671952 type: {class: LevelLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 0 _Resolution: 256 _TextureFormatMode: 300 _TextureFormat: 45 + _Blur: 0 + _BlurIterations: 4 - rid: 2003882626816671953 type: {class: FoamLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 100 _TextureFormat: 45 + _Blur: 0 + _BlurIterations: 1 _SimulationFrequency: 30 _Prewarm: 1 _Settings: {fileID: 0} - rid: 2003882626816671954 type: {class: DynamicWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _OverrideResolution: 0 _Resolution: 512 _TextureFormatMode: 300 _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 _SimulationFrequency: 60 _AttenuationInShallows: 1 _Settings: {fileID: 0} - rid: 2003882626816671955 type: {class: FlowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 1 _Resolution: 128 _TextureFormatMode: 100 _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 1024 - rid: 2003882626816671956 type: {class: ShadowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 100 _TextureFormat: 6 + _Blur: 1 + _BlurIterations: 1 _SimulationFrequency: 60 _DynamicSoftShadows: 1 _SoftJitterExtinctionFactor: 0.75 @@ -746,11 +837,14 @@ MonoBehaviour: - rid: 2003882626816671957 type: {class: AbsorptionLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 200 _TextureFormat: 23 + _Blur: 0 + _BlurIterations: 1 _ShorelineColorSource: 0 _ShorelineColor: {r: 0.513, g: 1, b: 1, a: 0.153} _ShorelineColorMaximumDistance: 10 @@ -758,11 +852,14 @@ MonoBehaviour: - rid: 2003882626816671958 type: {class: ScatteringLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 200 _TextureFormat: 23 + _Blur: 0 + _BlurIterations: 1 _ShorelineColorSource: 0 _ShorelineColor: {r: 0, g: 0.588, b: 1, a: 1} _ShorelineColorMaximumDistance: 10 @@ -770,20 +867,26 @@ MonoBehaviour: - rid: 2003882626816671959 type: {class: ClipLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 100 _TextureFormat: 5 + _Blur: 0 + _BlurIterations: 1 _DefaultClippingState: 0 - rid: 2003882626816671960 type: {class: AlbedoLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 0 _OverrideResolution: 1 _Resolution: 768 _TextureFormatMode: 100 _TextureFormat: 8 + _Blur: 0 + _BlurIterations: 1 - rid: 2003882626816671961 type: {class: WaterReflections, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: @@ -794,13 +897,12 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1 _Resolution: 256 - _RenderOnlySingleCamera: 0 + _Overscan: 1.5 _Sky: 1 _DisablePixelLights: 1 _DisableShadows: 1 _HDR: 0 _Stencil: 0 - _AllowMSAA: 0 _QualitySettingsOverride: _OverrideLodBias: 0 _LodBias: 0.5 @@ -816,9 +918,13 @@ MonoBehaviour: _UseObliqueMatrix: 1 _NonObliqueNearSurface: 0 _NonObliqueNearSurfaceThreshold: 0.05 + _RenderOnlySingleCamera: 0 + _RendererIndex: 0 _Debug: _ShowHiddenObjects: 0 _DisableRecursiveRendering: 0 + _ForceCompatibility: 0 + _AllowMSAA: 0 - rid: 2003882626816671962 type: {class: UnderwaterRenderer, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: @@ -829,9 +935,10 @@ MonoBehaviour: _EnvironmentalLightingEnable: 0 _EnvironmentalLightingWeight: 1 _EnvironmentalLightingVolumeProfile: {fileID: 0} - _AllCameras: 0 + _CameraExclusions: 6 _CopyWaterMaterialParametersEachFrame: 1 _FarPlaneMultiplier: 0.68 + _EnableChunkCulling: 1 _CullLimit: 0.001 _Debug: _VisualizeMask: 0 @@ -840,12 +947,15 @@ MonoBehaviour: _DisableHeightAboveWaterOptimization: 0 _DisableArtifactCorrection: 0 _OnlyReflectionCameras: 0 + _AllCameras: 0 - rid: 2003882626816671963 type: {class: Meniscus, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: + _Version: 0 _Enabled: 1 _Layer: 4 _Material: {fileID: 2100000, guid: 238e45299a5ec46308e9bf99ddf67963, type: 2} + _CameraExclusions: 6 - rid: 2003882626816671964 type: {class: PortalRenderer, ns: WaveHarmonic.Crest.Portals, asm: WaveHarmonic.Crest} data: @@ -937,7 +1047,7 @@ MonoBehaviour: customRendering: 0 useFog: 0 bakingCam: {fileID: 0} - renderId: 2 + renderId: 2416 --- !u!215 &878887029 ReflectionProbe: m_ObjectHideFlags: 0 @@ -1239,14 +1349,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1511791494} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -1291,7 +1401,7 @@ Light: m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ForceVisible: 0 - m_ShadowRadius: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 m_LightUnit: 1 m_LuxAtDistance: 1 @@ -1453,54 +1563,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 0.5, z: 1} m_Center: {x: 0, y: -0.27, z: 0} ---- !u!21 &2036836573 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Enviro/Skybox - m_Shader: {fileID: 4800000, guid: 34fee0a1b19b20b45aea7483b5f757da, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _GalaxyTex: - m_Texture: {fileID: 8900000, guid: 5734983fc81450b4187c3cfa5985edef, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MoonGlowTex: - m_Texture: {fileID: 2800000, guid: 6838e0810da4e49488b5d9a6ee76eb07, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MoonTex: - m_Texture: {fileID: 2800000, guid: c6fd9f694390e0245b6dca5812065950, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _StarsTex: - m_Texture: {fileID: 8900000, guid: b5a7175da0f133b4d951c19c9c2cebfc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SunTex: - m_Texture: {fileID: 2800000, guid: c95bed5306e94f24ba5802d841607ac7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: [] - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &2079119365 GameObject: m_ObjectHideFlags: 0 @@ -1582,6 +1644,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2079119368 MeshFilter: @@ -1603,6 +1666,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ba152b967dd345829964814e3b3a4e6, type: 3} m_Name: m_EditorClassIdentifier: + _Version: 1 _Mesh: {fileID: 0} _Queue: 0 _Mode: 0 @@ -1610,7 +1674,6 @@ MonoBehaviour: _UseClipWithDisplacement: 1 _Debug: _DrawBounds: 0 - _Version: 1 --- !u!4 &1345093109557349 Transform: m_ObjectHideFlags: 0 @@ -1792,6 +1855,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &104857336656708279 GameObject: @@ -1897,6 +1961,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &244973818137003810 MeshRenderer: @@ -1945,6 +2010,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &252424774068123055 Transform: @@ -2008,6 +2074,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &298585609622091821 GameObject: @@ -2112,6 +2179,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &554130459156321724 GameObject: @@ -2254,6 +2322,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &738155963636641849 MeshFilter: @@ -2346,6 +2415,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &876042276585208902 MeshRenderer: @@ -2394,6 +2464,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &889183690659728398 MeshRenderer: @@ -2442,6 +2513,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &900930274742057516 Transform: @@ -2663,6 +2735,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1001 &1408135040815030237 PrefabInstance: @@ -2805,6 +2878,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1532869733694518496 Transform: @@ -2906,6 +2980,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &1633434909314178782 MeshRenderer: @@ -2954,6 +3029,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1656122982990141623 MeshFilter: @@ -3386,6 +3462,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1941610856899923042 Transform: @@ -3474,6 +3551,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &1969845078094266085 Transform: @@ -3559,6 +3637,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2062736557332907056 GameObject: @@ -3623,6 +3702,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2119578301835123094 MeshFilter: @@ -3785,6 +3865,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &2244358638022793970 MeshRenderer: @@ -3833,6 +3914,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2244846754388692099 MeshFilter: @@ -4023,6 +4105,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2443651094165028239 GameObject: @@ -4120,6 +4203,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &2499304139886017089 MeshRenderer: @@ -4168,6 +4252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2527598540884480375 GameObject: @@ -4248,6 +4333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2557867628416470564 GameObject: @@ -4358,6 +4444,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &2711933489986054871 Transform: @@ -4421,6 +4508,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2771590360407691021 MeshFilter: @@ -4537,6 +4625,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2925531759857564663 GameObject: @@ -4610,6 +4699,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &3024239823563913533 Transform: @@ -4965,6 +5055,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3753112964450873725 GameObject: @@ -5112,6 +5203,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &3891336036710451418 MeshFilter: @@ -5291,6 +5383,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4086566507038547348 GameObject: @@ -5372,6 +5465,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4186952720974027118 GameObject: @@ -5436,6 +5530,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &4197878558712225025 MeshRenderer: @@ -5484,6 +5579,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4245425441651373085 GameObject: @@ -5609,7 +5705,7 @@ LODGroup: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5953689207547942728} - serializedVersion: 2 + serializedVersion: 3 m_LocalReferencePoint: {x: -0.0006620884, y: 0.029440403, z: -0.21671814} m_Size: 3.5574026 m_FadeMode: 0 @@ -5640,6 +5736,7 @@ LODGroup: renderers: - renderer: {fileID: 0} m_Enabled: 0 + m_GlobalIlluminationLOD: 0 --- !u!23 &4626715996787910948 MeshRenderer: m_ObjectHideFlags: 0 @@ -5687,6 +5784,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4652857820789821110 GameObject: @@ -5776,6 +5874,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4828901449887825182 GameObject: @@ -5856,6 +5955,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4851033752428097393 GameObject: @@ -5920,6 +6020,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &4907553228847687014 MeshRenderer: @@ -5968,6 +6069,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &4925441058657947462 MeshRenderer: @@ -6016,6 +6118,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &4958422612845635522 Transform: @@ -6273,7 +6376,7 @@ LODGroup: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2925531759857564663} - serializedVersion: 2 + serializedVersion: 3 m_LocalReferencePoint: {x: -0.016899168, y: 0.028624281, z: -0.04970956} m_Size: 4.4816446 m_FadeMode: 0 @@ -6297,6 +6400,7 @@ LODGroup: renderers: - renderer: {fileID: 2058427507013234258} m_Enabled: 1 + m_GlobalIlluminationLOD: 0 --- !u!4 &5255340629014967521 Transform: m_ObjectHideFlags: 0 @@ -6526,6 +6630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &5538843997132998282 MeshRenderer: @@ -6574,6 +6679,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &5574773301372677600 Transform: @@ -6971,6 +7077,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6163600924217123614 GameObject: @@ -7023,7 +7130,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 965921865900907107} - - component: {fileID: 7457174747398686439} + - component: {fileID: 6229810983371574679} m_Layer: 0 m_Name: SceneRoot m_TagString: Untagged @@ -7031,6 +7138,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6229810983371574679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229810983371574678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f820874d054495abd4d378473a14bcf, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.Map + Water: {fileID: 718680768} + Node: {fileID: 3673832994973231279} + GearsNode: {fileID: 6022323663597824692} + MapId: 0 + RoomCode: + FPS: 0 + updateInterval: 0.2 --- !u!4 &6243617290799133189 Transform: m_ObjectHideFlags: 0 @@ -7226,6 +7352,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6562369368229643801 GameObject: @@ -7290,6 +7417,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &6608904326459980923 MeshFilter: @@ -7522,6 +7650,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &6745283135507276353 Transform: @@ -8039,6 +8168,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &7301761064382946114 MeshRenderer: @@ -8087,6 +8217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &7302408690979132348 GameObject: @@ -8146,7 +8277,7 @@ LODGroup: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8023626678840213158} - serializedVersion: 2 + serializedVersion: 3 m_LocalReferencePoint: {x: -0.016922057, y: 0.028624266, z: -0.04967904} m_Size: 4.481644 m_FadeMode: 0 @@ -8178,6 +8309,7 @@ LODGroup: - renderer: {fileID: 5538843997132998282} - renderer: {fileID: 9179233119813907162} m_Enabled: 1 + m_GlobalIlluminationLOD: 0 --- !u!1 &7361430690074981207 GameObject: m_ObjectHideFlags: 0 @@ -8211,27 +8343,6 @@ Transform: m_Children: [] m_Father: {fileID: 8389129727785027936} m_LocalEulerAnglesHint: {x: 0, y: -0, z: 0} ---- !u!114 &7457174747398686439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6229810983371574678} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba52b4e0f1274042a192a3242f0a3946, type: 3} - m_Name: - m_EditorClassIdentifier: - sceneID: 0 - sceneName: Jack - WaterObject: {fileID: 718680767} - Node: {fileID: 3673832994973231279} - GearNode: {fileID: 6022323663597824692} - Water: {fileID: 718680768} - LineRenderer: {fileID: 0} - FPS: 0 - updateInterval: 0.2 --- !u!1 &7460703579491896368 GameObject: m_ObjectHideFlags: 0 @@ -8544,14 +8655,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7460703581314222162} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 1 m_Color: {r: 0.91764706, g: 0.7879085, b: 0.6506863, a: 1} m_Intensity: 2.3173 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 2 m_Resolution: -1 @@ -8596,7 +8707,7 @@ Light: m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ForceVisible: 0 - m_ShadowRadius: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 m_LightUnit: 1 m_LuxAtDistance: 1 @@ -8788,6 +8899,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &7801223269131947298 GameObject: @@ -9013,6 +9125,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &7986065266811799313 GameObject: @@ -9389,6 +9502,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &8155847722028099951 MeshRenderer: @@ -9437,6 +9551,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &8184371766308692831 Transform: @@ -9500,6 +9615,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &8310039229632234115 MeshRenderer: @@ -9548,6 +9664,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &8328136219275300202 Transform: @@ -9688,6 +9805,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &8483172168914452838 Transform: @@ -10120,6 +10238,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &9000187368650730199 GameObject: @@ -10193,7 +10312,7 @@ LODGroup: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7937535202981712117} - serializedVersion: 2 + serializedVersion: 3 m_LocalReferencePoint: {x: 0.00016912818, y: -0.12609306, z: -0.03054528} m_Size: 0.99226457 m_FadeMode: 0 @@ -10241,6 +10360,7 @@ LODGroup: - renderer: {fileID: 7767228929901739657} - renderer: {fileID: 3702983483138183273} m_Enabled: 1 + m_GlobalIlluminationLOD: 0 --- !u!33 &9170336634462315116 MeshFilter: m_ObjectHideFlags: 0 @@ -10296,6 +10416,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &9179409558643286273 GameObject: diff --git a/Assets/ResRaw/Prefabs/Player/Player.prefab b/Assets/ResRaw/Prefabs/Player/Player.prefab index 3314a71f9..cea6419bc 100644 --- a/Assets/ResRaw/Prefabs/Player/Player.prefab +++ b/Assets/ResRaw/Prefabs/Player/Player.prefab @@ -169,9 +169,9 @@ GameObject: - component: {fileID: 2216216690891386863} - component: {fileID: 3644333618879986678} - component: {fileID: 4477616030203838514} + - component: {fileID: 2059248182290203691} - component: {fileID: 8101446342893690422} - component: {fileID: 2923025939212586282} - - component: {fileID: 2431960384537678220} m_Layer: 14 m_Name: Player m_TagString: Untagged @@ -247,6 +247,36 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0, y: 1, z: 0} +--- !u!114 &2059248182290203691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172838236951268422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c69e72330154a86b756d89e82d276e9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.Player + EyeAngle: 0 + IsGrounded: 0 + Speed: 0 + RotationSpeed: 0 + MoveInput: {x: 0, y: 0} + Run: 0 + Root: {fileID: 8695154010886802211} + Eye: {fileID: 5745877877928638952} + FppLook: {fileID: 2969532427624891124} + IK: {fileID: 1593568502960682634} + ModelAsset: {fileID: 0} + Character: {fileID: 8101446342893690422} + FirstPerson: {fileID: 2923025939212586282} + MouseSensitivity: 0.1 + invertLook: 1 + minPitch: -75 + maxPitch: 60 + IsSelf: 0 --- !u!114 &8101446342893690422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -342,29 +372,6 @@ MonoBehaviour: _standingDownwardForceScale: 1 _camera: {fileID: 0} cameraParent: {fileID: 6835675132305341997} ---- !u!114 &2431960384537678220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8172838236951268422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a25908f34e4e4464a922b88337a5b733, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerUnityComponent - Root: {fileID: 8695154010886802211} - Eye: {fileID: 5745877877928638952} - FppLook: {fileID: 2969532427624891124} - IK: {fileID: 1593568502960682634} - ModelAsset: {fileID: 0} - Character: {fileID: 8101446342893690422} - FirstPerson: {fileID: 2923025939212586282} - MouseSensitivity: 0.1 - invertLook: 1 - minPitch: -75 - maxPitch: 60 --- !u!1 &8378981416044742488 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Common/Common/Services/Camera/CameraManager.cs b/Assets/Scripts/Common/Common/Services/Camera/CameraManager.cs index 74f29ef16..b20d0c887 100644 --- a/Assets/Scripts/Common/Common/Services/Camera/CameraManager.cs +++ b/Assets/Scripts/Common/Common/Services/Camera/CameraManager.cs @@ -17,7 +17,7 @@ namespace NBF [SerializeField] private CameraAsset _cameraAsset; private CameraShowMode _lastMode = CameraShowMode.None; - private PlayerUnityComponent FollowPlayer; + private Player FollowPlayer; private void Update() { @@ -55,14 +55,14 @@ namespace NBF _cameraAsset.tppVCam.Priority = 0; } - public void SetFppLook(PlayerUnityComponent playerUnityComponent) + public void SetFppLook(Player playerUnityComponent) { FollowPlayer = playerUnityComponent; _cameraAsset.fppVCam.LookAt = FollowPlayer.FppLook; Mode = CameraShowMode.FPP; } - public void SetFppFollow(PlayerUnityComponent playerUnityComponent) + public void SetFppFollow(Player playerUnityComponent) { _cameraAsset.fppVCam.Follow = FollowPlayer.ModelAsset.NeckTransform; } diff --git a/Assets/Scripts/Demo/SceneSettings.cs b/Assets/Scripts/Demo/SceneSettings.cs index 6c7ff0c0e..418f41b58 100644 --- a/Assets/Scripts/Demo/SceneSettings.cs +++ b/Assets/Scripts/Demo/SceneSettings.cs @@ -1,97 +1,97 @@ -using Enviro; -using NBF; -using UnityEngine; -using WaveHarmonic.Crest; - -public class SceneSettings : MonoBehaviour -{ - public static SceneSettings Instance; - - public int sceneID; - - public string sceneName = ""; - - public Transform WaterObject; - - public Transform Node; - - public Transform GearNode; - - public WaterRenderer Water; - - // public ObiUpdater obiFixedUpdater; - - public LineRenderer LineRenderer; - - - public int FPS; - - private void Awake() - { - Instance = this; - if (Node == null) - { - Node = transform; - } - - if (GearNode == null) - { - GearNode = Node; - } - - // obiFixedUpdater = FindFirstObjectByType(); - } - - private void Start() - { - EnviroManager.instance.Time.Settings.simulate = true; - // EnviroManager.instance.Time.SetTimeOfDay(0.5f * 24f); - } - - private void Update() - { - UpdateFPS(); - UpdateTimeOfDay(); - } - - - #region FPS - - public float updateInterval = 0.2f; // 更新间隔（秒） - - private float accum = 0; - private int frames = 0; - private float timeleft; - - void UpdateFPS() - { - timeleft -= Time.deltaTime; - accum += Time.timeScale / Time.deltaTime; - frames++; - - if (timeleft <= 0.0f) - { - FPS = (int)(accum / frames); - - timeleft = updateInterval; - accum = 0.0f; - frames = 0; - } - } - - #endregion - - #region 场景时间 - - private void UpdateTimeOfDay() - { - var p = GameTimer.GetGameDayProgress(); - p = 0.1f; - // Debug.Log(p); - EnviroManager.instance.Time.SetTimeOfDay(p * 24f); - // if(AzureCoreSystem) - // AzureCoreSystem.timeSystem.timeline = 24F * p; - } - - #endregion -} \ No newline at end of file +// using Enviro; +// using NBF; +// using UnityEngine; +// using WaveHarmonic.Crest; +// +// public class SceneSettings : MonoBehaviour +// { +// public static SceneSettings Instance; +// +// public int sceneID; +// +// public string sceneName = ""; +// +// public Transform WaterObject; +// +// public Transform Node; +// +// public Transform GearNode; +// +// public WaterRenderer Water; +// +// // public ObiUpdater obiFixedUpdater; +// +// public LineRenderer LineRenderer; +// +// +// public int FPS; +// +// private void Awake() +// { +// Instance = this; +// if (Node == null) +// { +// Node = transform; +// } +// +// if (GearNode == null) +// { +// GearNode = Node; +// } +// +// // obiFixedUpdater = FindFirstObjectByType(); +// } +// +// private void Start() +// { +// EnviroManager.instance.Time.Settings.simulate = true; +// // EnviroManager.instance.Time.SetTimeOfDay(0.5f * 24f); +// } +// +// private void Update() +// { +// UpdateFPS(); +// UpdateTimeOfDay(); +// } +// +// +// #region FPS +// +// public float updateInterval = 0.2f; // 更新间隔（秒） +// +// private float accum = 0; +// private int frames = 0; +// private float timeleft; +// +// void UpdateFPS() +// { +// timeleft -= Time.deltaTime; +// accum += Time.timeScale / Time.deltaTime; +// frames++; +// +// if (timeleft <= 0.0f) +// { +// FPS = (int)(accum / frames); +// +// timeleft = updateInterval; +// accum = 0.0f; +// frames = 0; +// } +// } +// +// #endregion +// +// #region 场景时间 +// +// private void UpdateTimeOfDay() +// { +// var p = GameTimer.GetGameDayProgress(); +// p = 0.1f; +// // Debug.Log(p); +// EnviroManager.instance.Time.SetTimeOfDay(p * 24f); +// // if(AzureCoreSystem) +// // AzureCoreSystem.timeSystem.timeline = 24F * p; +// } +// +// #endregion +// } \ No newline at end of file diff --git a/Assets/Scripts/Editor/RopeEditor.cs b/Assets/Scripts/Editor/RopeEditor.cs index 1f5082308..bf6fa7ce5 100644 --- a/Assets/Scripts/Editor/RopeEditor.cs +++ b/Assets/Scripts/Editor/RopeEditor.cs @@ -1,29 +1,29 @@ -using UnityEditor; -using UnityEngine; - -[CustomEditor(typeof(Rope))] -public class RopeFishLineEditor : Editor -{ - private Rope _target; - - void OnEnable() - { - _target = target as Rope; - // lookAtPoint = serializedObject.FindProperty("lookAtPoint"); - } - - public override void OnInspectorGUI() - { - base.OnInspectorGUI(); - - - if (GUILayout.Button("打印总长度")) - { - _target.DebugLength(); - // Debug.Log($"总长度={_target.GetCurrentLength()} 目标长度={_target.GetTargetLength()} smoot={_target.GetLengthSmoothVel()} relLen={_target.GetLengthByPoints()} PolylineLength={_target.GetPhysicsPolylineLength()}"); - } - // serializedObject.Update(); - // EditorGUILayout.PropertyField(lookAtPoint); - // serializedObject.ApplyModifiedProperties(); - } -} \ No newline at end of file +// using UnityEditor; +// using UnityEngine; +// +// [CustomEditor(typeof(Rope))] +// public class RopeFishLineEditor : Editor +// { +// private Rope _target; +// +// void OnEnable() +// { +// _target = target as Rope; +// // lookAtPoint = serializedObject.FindProperty("lookAtPoint"); +// } +// +// public override void OnInspectorGUI() +// { +// base.OnInspectorGUI(); +// +// +// if (GUILayout.Button("打印总长度")) +// { +// _target.DebugLength(); +// // Debug.Log($"总长度={_target.GetCurrentLength()} 目标长度={_target.GetTargetLength()} smoot={_target.GetLengthSmoothVel()} relLen={_target.GetLengthByPoints()} PolylineLength={_target.GetPhysicsPolylineLength()}"); +// } +// // serializedObject.Update(); +// // EditorGUILayout.PropertyField(lookAtPoint); +// // serializedObject.ApplyModifiedProperties(); +// } +// } \ No newline at end of file diff --git a/Assets/Scripts/Fishing.meta b/Assets/Scripts/Fishing.meta new file mode 100644 index 000000000..00f38664e --- /dev/null +++ b/Assets/Scripts/Fishing.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a4778c7b6ca74bb2acdc894fc98a6c5d +timeCreated: 1777437748 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/Animator.meta b/Assets/Scripts/Fishing/Animator.meta similarity index 100% rename from Assets/Scripts/Fishing~/Animator.meta rename to Assets/Scripts/Fishing/Animator.meta diff --git a/Assets/Scripts/Fishing~/Animator/ReelAnimator.cs b/Assets/Scripts/Fishing/Animator/ReelAnimator.cs similarity index 100% rename from Assets/Scripts/Fishing~/Animator/ReelAnimator.cs rename to Assets/Scripts/Fishing/Animator/ReelAnimator.cs diff --git a/Assets/Scripts/Fishing~/Animator/ReelAnimator.cs.meta b/Assets/Scripts/Fishing/Animator/ReelAnimator.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/Animator/ReelAnimator.cs.meta rename to Assets/Scripts/Fishing/Animator/ReelAnimator.cs.meta diff --git a/Assets/Scripts/Fishing/Fishing.cs b/Assets/Scripts/Fishing/Fishing.cs new file mode 100644 index 000000000..e8c5070c0 --- /dev/null +++ b/Assets/Scripts/Fishing/Fishing.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; +using Fantasy; +using Fantasy.Async; +using Fantasy.Entitas; +using NBF.Fishing2; +using RootMotion.FinalIK; +using Log = NBC.Log; + +namespace NBF +{ + public class Fishing + { + private static Fishing _instance; + + public static Fishing Instance + { + get + { + _instance ??= new Fishing(); + + return _instance; + } + } + + public bool Loading { get; private set; } + + public async FTask Go(int mapId, string roomCode = "") + { + Loading = true; + if (mapId == 0) + { + Log.Warning("账号没有进入过地图，进入新手引导地图"); + mapId = 99; + } + + var response = (G2C_EnterMapResponse)await Net.Call(new C2G_EnterMapRequest() + { + MapId = mapId, + RoomCode = roomCode + }); + Log.Info($"进入地图请求返回={response.ErrorCode}"); + if (response.ErrorCode != 0) + { + Notices.Error("enter room error"); + return false; + } + + LoadingPanel.Show(); + await ChangeMap(response.MapId, response.RoomCode, response.Units); + LoadingPanel.Hide(); + Loading = false; + return true; + } + + + public async FTask ChangeMap(int mapId, string roomCode, List units) + { + var sceneName = "Map1"; + //加载场景== + await SceneHelper.LoadScene(sceneName); + Map.Instance.SetData(mapId, roomCode, units); + Map.Instance.InstancePlayers(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Fishing.cs.meta b/Assets/Scripts/Fishing/Fishing.cs.meta new file mode 100644 index 000000000..005067864 --- /dev/null +++ b/Assets/Scripts/Fishing/Fishing.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 31a84e44641f4115a5531e1b7328630a +timeCreated: 1777438436 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Helper.meta b/Assets/Scripts/Fishing/Helper.meta new file mode 100644 index 000000000..65123f17e --- /dev/null +++ b/Assets/Scripts/Fishing/Helper.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a752ba9ae5b04fed93d81cf0764c5d00 +timeCreated: 1777437774 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/Helper/LoginHelper.cs b/Assets/Scripts/Fishing/Helper/LoginHelper.cs similarity index 100% rename from Assets/Scripts/Fishing~/Helper/LoginHelper.cs rename to Assets/Scripts/Fishing/Helper/LoginHelper.cs diff --git a/Assets/Scripts/Fishing~/Helper/LoginHelper.cs.meta b/Assets/Scripts/Fishing/Helper/LoginHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/Helper/LoginHelper.cs.meta rename to Assets/Scripts/Fishing/Helper/LoginHelper.cs.meta diff --git a/Assets/Scripts/Fishing~/Helper/PrefabsHelper.cs b/Assets/Scripts/Fishing/Helper/PrefabsHelper.cs similarity index 98% rename from Assets/Scripts/Fishing~/Helper/PrefabsHelper.cs rename to Assets/Scripts/Fishing/Helper/PrefabsHelper.cs index 13f240a8b..185a9510c 100644 --- a/Assets/Scripts/Fishing~/Helper/PrefabsHelper.cs +++ b/Assets/Scripts/Fishing/Helper/PrefabsHelper.cs @@ -4,7 +4,7 @@ using NBC.Asset; using NBF.Utils; using UnityEngine; -namespace NBF.Fishing2 +namespace NBF { public static class PrefabsHelper { diff --git a/Assets/Scripts/Fishing~/Helper/PrefabsHelper.cs.meta b/Assets/Scripts/Fishing/Helper/PrefabsHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/Helper/PrefabsHelper.cs.meta rename to Assets/Scripts/Fishing/Helper/PrefabsHelper.cs.meta diff --git a/Assets/Scripts/Fishing~/Helper/SceneHelper.cs b/Assets/Scripts/Fishing/Helper/SceneHelper.cs similarity index 100% rename from Assets/Scripts/Fishing~/Helper/SceneHelper.cs rename to Assets/Scripts/Fishing/Helper/SceneHelper.cs diff --git a/Assets/Scripts/Fishing~/Helper/SceneHelper.cs.meta b/Assets/Scripts/Fishing/Helper/SceneHelper.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/Helper/SceneHelper.cs.meta rename to Assets/Scripts/Fishing/Helper/SceneHelper.cs.meta diff --git a/Assets/Scripts/Fishing/Item.meta b/Assets/Scripts/Fishing/Item.meta new file mode 100644 index 000000000..741348e80 --- /dev/null +++ b/Assets/Scripts/Fishing/Item.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: be8d099db51445eea5a3eeb70849904a +timeCreated: 1777449783 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Item/FHandItem.cs b/Assets/Scripts/Fishing/Item/FHandItem.cs new file mode 100644 index 000000000..1e12baf19 --- /dev/null +++ b/Assets/Scripts/Fishing/Item/FHandItem.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace NBF +{ + public abstract class FHandItem : PlayerItem + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Item/FHandItem.cs.meta b/Assets/Scripts/Fishing/Item/FHandItem.cs.meta new file mode 100644 index 000000000..35057358d --- /dev/null +++ b/Assets/Scripts/Fishing/Item/FHandItem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f4bdd31c4ed448ecb00eca659d9d9db1 +timeCreated: 1777449812 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine.meta b/Assets/Scripts/Fishing/Item/FishingLine.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine.meta rename to Assets/Scripts/Fishing/Item/FishingLine.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLine.cs b/Assets/Scripts/Fishing/Item/FishingLine/FLine.cs similarity index 99% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLine.cs rename to Assets/Scripts/Fishing/Item/FishingLine/FLine.cs index ff9a18660..5d9afc72e 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLine.cs +++ b/Assets/Scripts/Fishing/Item/FishingLine/FLine.cs @@ -136,7 +136,7 @@ namespace NBF LinelenghtDiferent = GetLineDistance(); //非钓鱼状态 - if (Rod) Rod.PlayerItem.Tension = Mathf.Clamp(LinelenghtDiferent, 0f, 0.05f); + if (Rod) Rod.Tension = Mathf.Clamp(LinelenghtDiferent, 0f, 0.05f); } private void FixedUpdate() diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLine.cs.meta b/Assets/Scripts/Fishing/Item/FishingLine/FLine.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLine.cs.meta rename to Assets/Scripts/Fishing/Item/FishingLine/FLine.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineLogicNode.cs b/Assets/Scripts/Fishing/Item/FishingLine/FLineLogicNode.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineLogicNode.cs rename to Assets/Scripts/Fishing/Item/FishingLine/FLineLogicNode.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineLogicNode.cs.meta b/Assets/Scripts/Fishing/Item/FishingLine/FLineLogicNode.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineLogicNode.cs.meta rename to Assets/Scripts/Fishing/Item/FishingLine/FLineLogicNode.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineTest.cs b/Assets/Scripts/Fishing/Item/FishingLine/FLineTest.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineTest.cs rename to Assets/Scripts/Fishing/Item/FishingLine/FLineTest.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineTest.cs.meta b/Assets/Scripts/Fishing/Item/FishingLine/FLineTest.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/FishingLine/FLineTest.cs.meta rename to Assets/Scripts/Fishing/Item/FishingLine/FLineTest.cs.meta diff --git a/Assets/Scripts/Fishing~/Rope/Rope.cs b/Assets/Scripts/Fishing/Item/FishingLine/Rope.cs similarity index 100% rename from Assets/Scripts/Fishing~/Rope/Rope.cs rename to Assets/Scripts/Fishing/Item/FishingLine/Rope.cs diff --git a/Assets/Scripts/Fishing~/Rope/Rope.cs.meta b/Assets/Scripts/Fishing/Item/FishingLine/Rope.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/Rope/Rope.cs.meta rename to Assets/Scripts/Fishing/Item/FishingLine/Rope.cs.meta diff --git a/Assets/Scripts/Fishing/Item/PlayerItem.cs b/Assets/Scripts/Fishing/Item/PlayerItem.cs new file mode 100644 index 000000000..dd0821340 --- /dev/null +++ b/Assets/Scripts/Fishing/Item/PlayerItem.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace NBF +{ + public abstract class PlayerItem : MonoBehaviour + { + /// + /// 配置id + /// + public int ConfigID; + + public List BindItems = new List(); + + public Player Owner; + + + public virtual void Init(Player player, int configId, List bindItems) + { + Owner = player; + ConfigID = configId; + BindItems.Clear(); + BindItems.AddRange(bindItems); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Item/PlayerItem.cs.meta b/Assets/Scripts/Fishing/Item/PlayerItem.cs.meta new file mode 100644 index 000000000..600720610 --- /dev/null +++ b/Assets/Scripts/Fishing/Item/PlayerItem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ef008d609b8049ac8416abb496cbec72 +timeCreated: 1777451467 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle.meta b/Assets/Scripts/Fishing/Item/Tackle.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle.meta rename to Assets/Scripts/Fishing/Item/Tackle.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FBait.cs b/Assets/Scripts/Fishing/Item/Tackle/FBait.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FBait.cs rename to Assets/Scripts/Fishing/Item/Tackle/FBait.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FBait.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FBait.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FBait.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FBait.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FBobber.cs b/Assets/Scripts/Fishing/Item/Tackle/FBobber.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FBobber.cs rename to Assets/Scripts/Fishing/Item/Tackle/FBobber.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FBobber.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FBobber.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FBobber.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FBobber.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FFish.cs b/Assets/Scripts/Fishing/Item/Tackle/FFish.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FFish.cs rename to Assets/Scripts/Fishing/Item/Tackle/FFish.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FFish.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FFish.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FFish.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FFish.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FGearBase.cs b/Assets/Scripts/Fishing/Item/Tackle/FGearBase.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FGearBase.cs rename to Assets/Scripts/Fishing/Item/Tackle/FGearBase.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FGearBase.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FGearBase.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FGearBase.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FGearBase.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHook.cs b/Assets/Scripts/Fishing/Item/Tackle/FHook.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FHook.cs rename to Assets/Scripts/Fishing/Item/Tackle/FHook.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHook.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FHook.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FHook.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FHook.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FLure.cs b/Assets/Scripts/Fishing/Item/Tackle/FLure.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FLure.cs rename to Assets/Scripts/Fishing/Item/Tackle/FLure.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FLure.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FLure.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FLure.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FLure.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FReel.cs b/Assets/Scripts/Fishing/Item/Tackle/FReel.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FReel.cs rename to Assets/Scripts/Fishing/Item/Tackle/FReel.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FReel.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FReel.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FReel.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FReel.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FRod.cs b/Assets/Scripts/Fishing/Item/Tackle/FRod.cs similarity index 65% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FRod.cs rename to Assets/Scripts/Fishing/Item/Tackle/FRod.cs index 8cfbed96e..8577db9da 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FRod.cs +++ b/Assets/Scripts/Fishing/Item/Tackle/FRod.cs @@ -13,10 +13,6 @@ namespace NBF { public class FRod : FHandItem { - public PlayerItem PlayerItem; - - public override int ConfigId => PlayerItem?.ConfigID ?? 0; - public RodAsset Asset; public FReel Reel; @@ -30,6 +26,84 @@ namespace NBF public Transform GearRoot; + + #region Rod专属 + + private bool _stretchRope = true; + + public bool StretchRope + { + get => _stretchRope; + set + { + _stretchRope = value; + // Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent + // { + // Item = this + // }); + } + } + + private float _lineLength = 4.2f; + + /// + /// 线长度 + /// + public float LineLength + { + get => _lineLength; + set + { + _lineLength = value; + // Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent + // { + // Item = this + // }); + } + } + + private float _floatLength = 0.7f; + + /// + /// 浮漂线长度 + /// + public float FloatLength + { + get => _floatLength; + set + { + _floatLength = value; + // Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent + // { + // Item = this + // }); + } + } + + private float _tension; + + /// + /// 拉力 + /// + public float Tension + { + get => _tension; + set + { + if (!Mathf.Approximately(_tension, value)) + { + _tension = value; + } + + // Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent + // { + // Item = this + // }); + } + } + + #endregion + // public FWaterDisplacement LureHookWaterDisplacement; [HideInInspector] public FFish currentFish; @@ -57,13 +131,13 @@ namespace NBF if (Line.LineType == LineType.Spinning) { //没有浮漂类型 - Line.SetLenght(PlayerItem.LineLength); + Line.SetLenght(LineLength); } else { //有浮漂 - Line.SetLenght(PlayerItem.LineLength - PlayerItem.FloatLength); - Line.SetLenght(PlayerItem.FloatLength, FLineLogicNodeType.End); + Line.SetLenght(LineLength - FloatLength); + Line.SetLenght(FloatLength, FLineLogicNodeType.End); } } @@ -82,33 +156,27 @@ namespace NBF yield return 1; } - public async FTask InitRod(PlayerItem playerItem) + public async FTask InitRod() { - PlayerItem = playerItem; - - var playerView = playerItem.Owner.GetComponent(); - - var playerViewUnity = playerView.Unity; - transform.localPosition = Vector3.zero; transform.localRotation = Quaternion.identity; transform.localScale = Vector3.one; - SceneSettings.Instance.GearNode.position = playerViewUnity.transform.position; - await FTask.WaitFrame(playerView.Scene); //等待1帧 + Map.Instance.GearsNode.position = transform.position; + await FTask.WaitFrame(Game.Main); //等待1帧 - var obj = new GameObject($"rod_{ConfigId}"); - obj.transform.SetParent(SceneSettings.Instance.GearNode); - obj.transform.position = playerViewUnity.transform.position; - obj.transform.rotation = playerViewUnity.transform.rotation; + var obj = new GameObject($"rod_{ConfigID}"); + obj.transform.SetParent(Map.Instance.GearsNode); + obj.transform.position = transform.position; + obj.transform.rotation = transform.rotation; obj.transform.localScale = Vector3.one; GearRoot = obj.transform; var parent = GearRoot; CreateFishingHandler(); - await FTask.WaitFrame(playerView.Scene); //等待1帧 + await FTask.WaitFrame(Game.Main); //等待1帧 // children.Sort(); - foreach (var childConfigId in playerItem.BindItems) + foreach (var childConfigId in BindItems) { var itemType = childConfigId.GetItemType(); var config = Game.Tables.TbItem.Get(childConfigId); @@ -154,7 +222,7 @@ namespace NBF } } - await FTask.WaitFrame(playerView.Scene); //等待1帧 + await FTask.WaitFrame(Game.Main); //等待1帧 SetLineLength(); if (Reel) { @@ -190,11 +258,11 @@ namespace NBF Weight.Init(this); } - await FTask.WaitFrame(playerView.Scene); //等待1帧 + await FTask.WaitFrame(Game.Main); //等待1帧 - transform.SetParent(playerViewUnity.ModelAsset.RodRoot); + transform.SetParent(Owner.ModelAsset.RodRoot); transform.localPosition = Vector3.zero; - transform.rotation = playerViewUnity.ModelAsset.RodRoot.rotation; + transform.rotation = Owner.ModelAsset.RodRoot.rotation; } @@ -203,7 +271,7 @@ namespace NBF if (Line == null) { Debug.LogError("创建钓组====="); - var itemConfig = Game.Tables.TbItem.Get(ConfigId); + var itemConfig = Game.Tables.TbItem.Get(ConfigID); var rodType = (ItemSubType)itemConfig.Type; if (rodType == ItemSubType.RodTele) { @@ -299,7 +367,7 @@ namespace NBF // } if (Line) { - value = PlayerItem.Tension / maxRodStrength; + value = Tension / maxRodStrength; } return Mathf.Clamp01(value); @@ -308,51 +376,51 @@ namespace NBF private void BendControl() { - var _ccdik = Asset.CCDIK; - - var state = PlayerItem.Owner.State; - - - Vector3 vector = Line.EndNode.transform.position; - - // 当前物体的朝向与指向 Lure 的方向之间的夹角，在 0（完全对齐）到 1（完全相反）之间的一个比例值 - float headingAlignment = Vector3.Angle(base.transform.forward, - (Line.EndNode.transform.position - transform.position).normalized) / 180f; - // 经过朝向调制后的有效张力 - var effectiveTension = Mathf.Clamp(CurrentTension01 * headingAlignment, 0f, 1f); - - float multiple = 0; - if (state == PlayerState.Fight) - { - multiple = 1; - } - else - { - multiple = 0.1f; - } - - float targetWeight = effectiveTension * multiple; - if (targetWeight > 0) - { - // Debug.Log($"CurrentTension01={CurrentTension01} LinelenghtDiferent={Line.LinelenghtDiferent} Tension={PlayerItem.Tension} num2={effectiveTension} num3={headingAlignment} num6={multiple}"); - } - - if (state == PlayerState.Prepare) - { - targetWeight = 0.002f; - } - - float item = Mathf.MoveTowards(_ccdik.solver.IKPositionWeight, targetWeight, Time.deltaTime * bendSmooth); - previousWeights.RemoveAt(0); - previousWeights.Add(item); - float averageWeight = previousWeights.Average(); - if (currentFish) - { - averageWeight = Math.Min(averageWeight, 0.01f); - } - - _ccdik.solver.SetIKPosition(vector); - _ccdik.solver.SetIKPositionWeight(averageWeight); + // var _ccdik = Asset.CCDIK; + // + // var state = Owner.State; + // + // + // Vector3 vector = Line.EndNode.transform.position; + // + // // 当前物体的朝向与指向 Lure 的方向之间的夹角，在 0（完全对齐）到 1（完全相反）之间的一个比例值 + // float headingAlignment = Vector3.Angle(base.transform.forward, + // (Line.EndNode.transform.position - transform.position).normalized) / 180f; + // // 经过朝向调制后的有效张力 + // var effectiveTension = Mathf.Clamp(CurrentTension01 * headingAlignment, 0f, 1f); + // + // float multiple = 0; + // if (state == PlayerState.Fight) + // { + // multiple = 1; + // } + // else + // { + // multiple = 0.1f; + // } + // + // float targetWeight = effectiveTension * multiple; + // if (targetWeight > 0) + // { + // // Debug.Log($"CurrentTension01={CurrentTension01} LinelenghtDiferent={Line.LinelenghtDiferent} Tension={PlayerItem.Tension} num2={effectiveTension} num3={headingAlignment} num6={multiple}"); + // } + // + // if (state == PlayerState.Prepare) + // { + // targetWeight = 0.002f; + // } + // + // float item = Mathf.MoveTowards(_ccdik.solver.IKPositionWeight, targetWeight, Time.deltaTime * bendSmooth); + // previousWeights.RemoveAt(0); + // previousWeights.Add(item); + // float averageWeight = previousWeights.Average(); + // if (currentFish) + // { + // averageWeight = Math.Min(averageWeight, 0.01f); + // } + // + // _ccdik.solver.SetIKPosition(vector); + // _ccdik.solver.SetIKPositionWeight(averageWeight); } #endregion diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FRod.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FRod.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FRod.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FRod.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FWeight.cs b/Assets/Scripts/Fishing/Item/Tackle/FWeight.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FWeight.cs rename to Assets/Scripts/Fishing/Item/Tackle/FWeight.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FWeight.cs.meta b/Assets/Scripts/Fishing/Item/Tackle/FWeight.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Tackle/FWeight.cs.meta rename to Assets/Scripts/Fishing/Item/Tackle/FWeight.cs.meta diff --git a/Assets/Scripts/Fishing/Map.meta b/Assets/Scripts/Fishing/Map.meta new file mode 100644 index 000000000..cc8800557 --- /dev/null +++ b/Assets/Scripts/Fishing/Map.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c6dfe3235d0347008d10859d322eabd6 +timeCreated: 1777447863 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Map/Map.cs b/Assets/Scripts/Fishing/Map/Map.cs new file mode 100644 index 000000000..52e827cd5 --- /dev/null +++ b/Assets/Scripts/Fishing/Map/Map.cs @@ -0,0 +1,101 @@ +using System.Collections.Generic; +using Enviro; +using Fantasy; +using NBC; +using UnityEngine; +using WaveHarmonic.Crest; + +namespace NBF +{ + public class Map : SingletonMono + { + [Header("节点信息")] public WaterRenderer Water; + public Transform Node; + public Transform GearsNode; + [Header("角色参数")] public int MapId; + public string RoomCode; + + + public readonly List Units = new List(); + + + public readonly List Players = new List(); + + public void SetData(int mapId, string code, List units) + { + MapId = mapId; + RoomCode = code; + Units.AddRange(units); + } + + private void Start() + { + EnviroManager.instance.Time.Settings.simulate = true; + } + + private void Update() + { + UpdateFPS(); + UpdateTimeOfDay(); + } + + #region FPS + + public int FPS; + + public float updateInterval = 0.2f; // 更新间隔（秒） + + private float accum = 0; + private int frames = 0; + private float timeleft; + + void UpdateFPS() + { + timeleft -= Time.deltaTime; + accum += Time.timeScale / Time.deltaTime; + frames++; + + if (timeleft <= 0.0f) + { + FPS = (int)(accum / frames); + + timeleft = updateInterval; + accum = 0.0f; + frames = 0; + } + } + + #endregion + + #region 场景时间 + + private void UpdateTimeOfDay() + { + var p = GameTimer.GetGameDayProgress(); + p = 0.3f; + // Debug.Log(p); + EnviroManager.instance.Time.SetTimeOfDay(p * 24f); + // if(AzureCoreSystem) + // AzureCoreSystem.timeSystem.timeline = 24F * p; + } + + #endregion + + #region Player + + public void InstancePlayers() + { + var playerObject = PrefabsHelper.CreatePlayer(Node); + playerObject.transform.localPosition = new Vector3(484, 1, 422); + var player = playerObject.GetComponent(); + Players.Add(player); + player.IsSelf = true; + if (player.IsSelf) + { + CameraManager.Instance.SetFppLook(player); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Map/Map.cs.meta b/Assets/Scripts/Fishing/Map/Map.cs.meta new file mode 100644 index 000000000..5f5cc4511 --- /dev/null +++ b/Assets/Scripts/Fishing/Map/Map.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1f820874d054495abd4d378473a14bcf +timeCreated: 1777438296 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono.meta b/Assets/Scripts/Fishing/Mono.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono.meta rename to Assets/Scripts/Fishing/Mono.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/JointPinchController.cs b/Assets/Scripts/Fishing/Mono/JointPinchController.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/JointPinchController.cs rename to Assets/Scripts/Fishing/Mono/JointPinchController.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/JointPinchController.cs.meta b/Assets/Scripts/Fishing/Mono/JointPinchController.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/JointPinchController.cs.meta rename to Assets/Scripts/Fishing/Mono/JointPinchController.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerAnimator.cs b/Assets/Scripts/Fishing/Mono/PlayerAnimator.cs similarity index 81% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerAnimator.cs rename to Assets/Scripts/Fishing/Mono/PlayerAnimator.cs index 8088065b9..9e1e29139 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerAnimator.cs +++ b/Assets/Scripts/Fishing/Mono/PlayerAnimator.cs @@ -93,15 +93,15 @@ namespace NBF } - public void OnUseItem(PlayerItemView item) - { - var itemType = item.Item.ConfigID.GetItemType(); - if (itemType == ItemType.Rod) - { - _isRodLayerEnabled = true; - // _IK.SetBipedLeftHandIK(enabled: false, reel.FingersIKAnchor); - } - } + // public void OnUseItem(PlayerItemView item) + // { + // var itemType = item.Item.ConfigID.GetItemType(); + // if (itemType == ItemType.Rod) + // { + // _isRodLayerEnabled = true; + // // _IK.SetBipedLeftHandIK(enabled: false, reel.FingersIKAnchor); + // } + // } public void SetLayerWeight(string layer, float weight) @@ -153,14 +153,14 @@ namespace NBF public void OnRodThrowStart() { Debug.LogError("OnRodThrowStart"); - if (Player.State == PlayerState.Throw) - { - var playerStateView = Player.GetComponent(); - if (playerStateView.CurrentStateView is PlayerStageViewThrow playerStateThrow) - { - playerStateThrow.OnRodThrowStart(); - } - } + // if (Player.State == PlayerState.Throw) + // { + // var playerStateView = Player.GetComponent(); + // if (playerStateView.CurrentStateView is PlayerStageViewThrow playerStateThrow) + // { + // playerStateThrow.OnRodThrowStart(); + // } + // } } /// @@ -169,14 +169,14 @@ namespace NBF public void OnRodThrownEnd() { Debug.LogError("OnRodThrownEnd"); - if (Player.State == PlayerState.Throw) - { - var playerStateView = Player.GetComponent(); - if (playerStateView.CurrentStateView is PlayerStageViewThrow playerStateThrow) - { - playerStateThrow.OnRodThrownEnd(); - } - } + // if (Player.State == PlayerState.Throw) + // { + // var playerStateView = Player.GetComponent(); + // if (playerStateView.CurrentStateView is PlayerStageViewThrow playerStateThrow) + // { + // playerStateThrow.OnRodThrownEnd(); + // } + // } } #endregion diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerAnimator.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerAnimator.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerAnimator.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerAnimator.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerArm.cs b/Assets/Scripts/Fishing/Mono/PlayerArm.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerArm.cs rename to Assets/Scripts/Fishing/Mono/PlayerArm.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerArm.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerArm.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerArm.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerArm.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerChest.cs b/Assets/Scripts/Fishing/Mono/PlayerChest.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerChest.cs rename to Assets/Scripts/Fishing/Mono/PlayerChest.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerChest.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerChest.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerChest.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerChest.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerDebug.cs b/Assets/Scripts/Fishing/Mono/PlayerDebug.cs similarity index 66% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerDebug.cs rename to Assets/Scripts/Fishing/Mono/PlayerDebug.cs index 51f2cae50..3f45a6c7f 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerDebug.cs +++ b/Assets/Scripts/Fishing/Mono/PlayerDebug.cs @@ -15,10 +15,10 @@ namespace NBF if (Player == null) return; - for (int i = 1; i < Player.TrajectoryPoints.Count; i++) - { - Debug.DrawLine(Player.TrajectoryPoints[i - 1], Player.TrajectoryPoints[i], Color.yellow); - } + // for (int i = 1; i < Player.TrajectoryPoints.Count; i++) + // { + // Debug.DrawLine(Player.TrajectoryPoints[i - 1], Player.TrajectoryPoints[i], Color.yellow); + // } // Debug.DrawRay(Player.TrajectoryPoints[Player.TrajectoryPoints.Count], Vector3.up * 0.3f, Color.cyan); } diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerDebug.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerDebug.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerDebug.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerDebug.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerIK.cs b/Assets/Scripts/Fishing/Mono/PlayerIK.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerIK.cs rename to Assets/Scripts/Fishing/Mono/PlayerIK.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerIK.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerIK.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerIK.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerIK.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerMonoBehaviour.cs b/Assets/Scripts/Fishing/Mono/PlayerMonoBehaviour.cs similarity index 61% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerMonoBehaviour.cs rename to Assets/Scripts/Fishing/Mono/PlayerMonoBehaviour.cs index 9bf54689d..9dc808218 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerMonoBehaviour.cs +++ b/Assets/Scripts/Fishing/Mono/PlayerMonoBehaviour.cs @@ -6,12 +6,14 @@ namespace NBF { public Player Player { get; private set; } - public PlayerUnityComponent UnityComponent { get; private set; } protected void Awake() { - UnityComponent = GetComponentInParent(); - Player = UnityComponent.Player; + Player = GetComponent(); + if (Player == null) + { + Player = GetComponentInParent(); + } OnAwake(); } diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerMonoBehaviour.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerMonoBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerMonoBehaviour.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerMonoBehaviour.cs.meta diff --git a/Assets/Scripts/Fishing/Mono/PlayerUnityComponent.cs b/Assets/Scripts/Fishing/Mono/PlayerUnityComponent.cs new file mode 100644 index 000000000..c25999fb0 --- /dev/null +++ b/Assets/Scripts/Fishing/Mono/PlayerUnityComponent.cs @@ -0,0 +1,25 @@ +// using ECM2; +// using ECM2.Examples.FirstPerson; +// using UnityEngine; +// +// namespace NBF +// { +// public class PlayerUnityComponent : MonoBehaviour +// { +// public Player Player { get; set; } +// public Transform Root; +// public Transform Eye; +// public Transform FppLook; +// public Transform IK; +// public PlayerModelAsset ModelAsset; +// public CharacterMovement Character; +// public FirstPersonCharacter FirstPerson; +// +// [Header("视角相关")] public float MouseSensitivity = 0.1f; +// [Space(15f)] public bool invertLook = true; +// +// public float minPitch = -60f; +// +// public float maxPitch = 60f; +// } +// } \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerUnityComponent.cs.meta b/Assets/Scripts/Fishing/Mono/PlayerUnityComponent.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerUnityComponent.cs.meta rename to Assets/Scripts/Fishing/Mono/PlayerUnityComponent.cs.meta diff --git a/Assets/Scripts/Fishing/Player.meta b/Assets/Scripts/Fishing/Player.meta new file mode 100644 index 000000000..4f56944a3 --- /dev/null +++ b/Assets/Scripts/Fishing/Player.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e599a1ea5e4441f888ed9157dfbd0565 +timeCreated: 1777437826 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/Player.cs b/Assets/Scripts/Fishing/Player/Player.cs new file mode 100644 index 000000000..1dc4a4312 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/Player.cs @@ -0,0 +1,137 @@ +using System; +using System.Collections.Generic; +using ECM2; +using ECM2.Examples.FirstPerson; +using Fantasy.Async; +using UnityEngine; + +namespace NBF +{ + public class Player : MonoBehaviour + { + [Header("角色参数")] public float EyeAngle; + public bool IsGrounded; + public float Speed; + public float RotationSpeed; + public Vector2 MoveInput; + public bool Run; + + [Header("角色节点")] public Transform Root; + public Transform Eye; + public Transform FppLook; + public Transform IK; + + [Header("角色控制")] public PlayerModelAsset ModelAsset; + public CharacterMovement Character; + public FirstPersonCharacter FirstPerson; + + + [Header("视角相关")] public float MouseSensitivity = 0.1f; + [Space(15f)] public bool invertLook = true; + + public float minPitch = -60f; + + public float maxPitch = 60f; + + public bool IsLureRod => false; + + public bool IsSelf; + + #region 生命周期 + + private void Awake() + { + } + + private void Start() + { + CreatePlayerModel(); + if (IsSelf) + { + gameObject.AddComponent(); + } + } + + private void Update() + { + } + + private void FixedUpdate() + { + } + + #endregion + + #region 手持物品 + + private FHandItem HandItem; + private bool IsChangeItemIng; + + public async FTask UseItem(int configId, List bindItems) + { + if (IsChangeItemIng) return; + IsChangeItemIng = true; + + if (HandItem != null) + { + await UnUseItem(); + } + + // ModelAsset.PlayerAnimator.OnUseItem(itemView); + + // if (currItem == null) + // { + // //收起物品 + // await UnUseItem(prevItem); + // } + // else + // { + // // 先收起旧的物品 + // await UnUseItemConfirm(prevItem); + // var handItem = Player.HandItem; + // //拿起新物品 + // var itemType = handItem.ConfigID.GetItemType(); + // if (itemType == ItemType.Rod) + // { + // var itemView = handItem.GetOrAddComponent(); + // await itemView.InitShow(handItem); + // Unity.ModelAsset.PlayerAnimator.OnUseItem(itemView); + // } + // } + // + // var stateView = Player.GetComponent(); + // if (stateView != null && stateView.CurrentStateView is PlayerStageViewIdle playerStageViewIdle) + // { + // playerStageViewIdle.TakeLine(); + // } + + IsChangeItemIng = false; + } + + public async FTask UnUseItem() + { + if (HandItem != null) + { + ModelAsset.PlayerAnimator.OnUnUseItem(); + await FTask.Wait(Game.Main, 100); + } + + Destroy(HandItem.gameObject); + HandItem = null; + } + + #endregion + + #region 模型创建 + + private void CreatePlayerModel() + { + var modelObject = PrefabsHelper.CreatePlayer(Root, "Human_Male"); + modelObject.transform.localPosition = Vector3.zero; + ModelAsset = modelObject.GetComponent(); + ModelAsset.SetPlayer(FppLook); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/Player.cs.meta b/Assets/Scripts/Fishing/Player/Player.cs.meta new file mode 100644 index 000000000..103890177 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/Player.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7c69e72330154a86b756d89e82d276e9 +timeCreated: 1777437830 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/PlayerInput.cs b/Assets/Scripts/Fishing/Player/PlayerInput.cs new file mode 100644 index 000000000..9ed62ff2f --- /dev/null +++ b/Assets/Scripts/Fishing/Player/PlayerInput.cs @@ -0,0 +1,205 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Fantasy; +using Fantasy.Entitas.Interface; +using UnityEngine; +using UnityEngine.InputSystem; + +namespace NBF +{ + public class PlayerInput : PlayerMonoBehaviour + { + #region 生命周期 + + protected override void OnAwake() + { + AddInputEvent(); + } + + private void Update() + { + UpdateInput(); + UpdateMove(); + } + + private void OnDestroy() + { + RemoveInputEvent(); + } + + #endregion + + #region Input + + private void UpdateInput() + { + if (Input.GetKeyDown(KeyCode.Alpha0)) + { + // SetLineLength(lineLength); + } + else if (Input.GetKeyDown(KeyCode.Plus) || Input.GetKeyDown(KeyCode.Equals)) + { + // Player.HandItem.LineLength += 0.1f; + } + else if (Input.GetKeyDown(KeyCode.Minus)) + { + // Player.HandItem.LineLength -= 0.1f; + } + } + + private void AddInputEvent() + { + InputManager.OnPlayerPerformed += OnPlayerCanceled; + InputManager.OnPlayerPerformed += OnPlayerPerformed; + + InputManager.OnPlayerValueCanceled += OnPlayerValueCanceled; + InputManager.OnPlayerValuePerformed += OnPlayerValuePerformed; + } + + private void RemoveInputEvent() + { + InputManager.OnPlayerPerformed += OnPlayerCanceled; + InputManager.OnPlayerPerformed += OnPlayerPerformed; + + InputManager.OnPlayerValueCanceled += OnPlayerValueCanceled; + InputManager.OnPlayerValuePerformed += OnPlayerValuePerformed; + } + + private void OnPlayerPerformed(string action) + { + if (action == InputDef.Player.Run) + { + Player.Run = true; + } + } + + private void OnPlayerCanceled(string action) + { + if (action == InputDef.Player.Run) + { + Player.Run = false; + } + else if (action == InputDef.Player.ToBag) + { + //取消手持物品 + Log.Info($"取消手持物品"); + Player.UnUseItem().Coroutine(); + } + else if (action.StartsWith(InputDef.Player.QuickStarts)) + { + var index = int.Parse(action.Replace(InputDef.Player.QuickStarts, string.Empty)); + Log.Info($"快速使用===={index}"); + var item = RoleModel.Instance.GetSlotItem(index - 1); + if (item != null) + { + List children = RoleModel.Instance.GetBindItems(item.Id); + List bindItems = children.Select(itemInfo => itemInfo.ConfigId).ToList(); + Player.UseItem(item.ConfigId, bindItems).Coroutine(); + } + } + } + + private void OnPlayerValueCanceled(InputAction.CallbackContext context) + { + var actionName = context.action.name; + if (actionName == InputDef.Player.Move) + { + Player.MoveInput = Vector2.zero; + } + } + + private void OnPlayerValuePerformed(InputAction.CallbackContext context) + { + var actionName = context.action.name; + if (actionName == InputDef.Player.Move) + { + var v2 = context.ReadValue(); + Player.MoveInput = v2; + } + else if (actionName == InputDef.Player.Look) + { + } + } + + #endregion + + #region Move + + private Quaternion _lastRotation; + + private void UpdateMove() + { + UpdateGrounded(); + ProcessMoveStates(); + UpdateLookInput(); + } + + private void ProcessMoveStates() + { + { + var num2 = Player.Run ? 7 : 5; + Vector3 vector2 = Player.FirstPerson.GetRightVector() * Player.MoveInput.x * num2; + vector2 += Player.FirstPerson.GetForwardVector() * Player.MoveInput.y * num2; + // if (checkWaterBound) + // { + // SetMovementDirectionWithRaycastCheck(vector2); + // } + // else + { + Player.FirstPerson.SetMovementDirection(vector2); + } + } + } + + private void UpdateGrounded() + { + Player.IsGrounded = Player.FirstPerson.IsGrounded(); + Player.Speed = Player.FirstPerson.velocity.magnitude; + + Quaternion rotation = Player.FirstPerson.transform.rotation; + + // 计算当前帧与上一帧的旋转差异 + Quaternion rotationDelta = rotation * Quaternion.Inverse(_lastRotation); + + // 将四元数转换为角度轴表示 + rotationDelta.ToAngleAxis(out float angle, out Vector3 axis); + + // 确保角度在0-360范围内 + if (angle > 180f) angle -= 360f; + + // 获取Y轴旋转分量（归一化处理） + float yRotation = 0f; + if (Mathf.Abs(angle) > 0.001f && Mathf.Abs(axis.y) > 0.1f) + { + // 计算Y轴方向的旋转角度（考虑旋转轴方向） + yRotation = angle * Mathf.Sign(axis.y); + } + + float maxTurnSpeed = 180f; // 度/秒 + // 转换为角速度并归一化到[-1, 1] + float angularSpeed = yRotation / Time.deltaTime; + float turnValue = Mathf.Clamp(angularSpeed / maxTurnSpeed, -1f, 1f); + + + Player.RotationSpeed = turnValue; + + _lastRotation = rotation; + } + + #endregion + + #region Look + + private void UpdateLookInput() + { + Vector2 value = InputManager.GetLookInput(); + var u3d = Player; + u3d.FirstPerson.AddControlYawInput(value.x * u3d.MouseSensitivity); + u3d.FirstPerson.AddControlPitchInput((u3d.invertLook ? 0f - value.y : value.y) * u3d.MouseSensitivity, + u3d.minPitch, u3d.maxPitch); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/PlayerInput.cs.meta b/Assets/Scripts/Fishing/Player/PlayerInput.cs.meta new file mode 100644 index 000000000..b09122ff5 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/PlayerInput.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b0ff16b93bf44060b69e6b052a4f3d63 +timeCreated: 1777449292 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/RemotePlayer.cs b/Assets/Scripts/Fishing/Player/RemotePlayer.cs new file mode 100644 index 000000000..159eb3ba6 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/RemotePlayer.cs @@ -0,0 +1,8 @@ +using UnityEngine; + +namespace NBF +{ + public class RemotePlayer : MonoBehaviour + { + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/RemotePlayer.cs.meta b/Assets/Scripts/Fishing/Player/RemotePlayer.cs.meta new file mode 100644 index 000000000..d453b4b0d --- /dev/null +++ b/Assets/Scripts/Fishing/Player/RemotePlayer.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 83d5c2102a7749f0acb36f871d75566e +timeCreated: 1777438074 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/PlayerInputControl.cs b/Assets/Scripts/Fishing/PlayerInputControl.cs similarity index 100% rename from Assets/Scripts/Fishing~/PlayerInputControl.cs rename to Assets/Scripts/Fishing/PlayerInputControl.cs diff --git a/Assets/Scripts/Fishing~/PlayerInputControl.cs.meta b/Assets/Scripts/Fishing/PlayerInputControl.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/PlayerInputControl.cs.meta rename to Assets/Scripts/Fishing/PlayerInputControl.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerUnityComponent.cs b/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerUnityComponent.cs deleted file mode 100644 index 7ff6f9484..000000000 --- a/Assets/Scripts/Fishing~/New/View/Player/Mono/PlayerUnityComponent.cs +++ /dev/null @@ -1,25 +0,0 @@ -using ECM2; -using ECM2.Examples.FirstPerson; -using UnityEngine; - -namespace NBF -{ - public class PlayerUnityComponent : MonoBehaviour - { - public Player Player { get; set; } - public Transform Root; - public Transform Eye; - public Transform FppLook; - public Transform IK; - public PlayerModelAsset ModelAsset; - public CharacterMovement Character; - public FirstPersonCharacter FirstPerson; - - [Header("视角相关")] public float MouseSensitivity = 0.1f; - [Space(15f)] public bool invertLook = true; - - public float minPitch = -60f; - - public float maxPitch = 60f; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs b/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs deleted file mode 100644 index 0e8a5a1ad..000000000 --- a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UnityEngine; - -namespace NBF -{ - public abstract class FHandItem : MonoBehaviour - { - public abstract int ConfigId { get; } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs.meta b/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs.meta deleted file mode 100644 index defacea96..000000000 --- a/Assets/Scripts/Fishing~/New/View/Player/Tackle/FHandItem.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5460b0f542fd45e38145b2a4fb12e329 -timeCreated: 1766583615 \ No newline at end of file diff --git a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs index 7e0599735..881de856c 100644 --- a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs +++ b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs @@ -1,4 +1,5 @@ using System; +using NBF; using UnityEngine; using WaveHarmonic.Crest; @@ -84,9 +85,9 @@ public class CapsuleBuoyancyStable : MonoBehaviour public void InitBobber() { - if (_waterRenderer == null && SceneSettings.Instance) + if (_waterRenderer == null && Map.Instance) { - _waterRenderer = SceneSettings.Instance.Water; + _waterRenderer = Map.Instance.Water; } _cap = GetComponentInChildren(); _init = true; diff --git a/Assets/Scripts/Test/New/BobberPresentationController.cs b/Assets/Scripts/Test/New/BobberPresentationController.cs index 8c3601949..ded06066e 100644 --- a/Assets/Scripts/Test/New/BobberPresentationController.cs +++ b/Assets/Scripts/Test/New/BobberPresentationController.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using NBF; +using UnityEngine; using WaveHarmonic.Crest; @@ -225,8 +226,8 @@ public class BobberPresentationController : MonoBehaviour if (waterProviderBehaviour != null) _waterProvider = waterProviderBehaviour as IWaterSurfaceProvider; - if (waterRenderer == null && SceneSettings.Instance != null) - waterRenderer = SceneSettings.Instance.Water; + if (waterRenderer == null && Map.Instance != null) + waterRenderer = Map.Instance.Water; _pendingPosture = _posture; _pendingPostureTimer = 0f; diff --git a/Assets/Scripts/UI/Fishing/FishingPanel.cs b/Assets/Scripts/UI/Fishing/FishingPanel.cs index 6e2691e4f..6b9262213 100644 --- a/Assets/Scripts/UI/Fishing/FishingPanel.cs +++ b/Assets/Scripts/UI/Fishing/FishingPanel.cs @@ -24,8 +24,8 @@ namespace NBF protected override void OnUpdate() { - if (!SceneSettings.Instance) return; - TextFPS.text = SceneSettings.Instance.FPS.ToString(CultureInfo.InvariantCulture); + if (!Map.Instance) return; + TextFPS.text = Map.Instance.FPS.ToString(CultureInfo.InvariantCulture); } private void OnInteractiveObjectAction(InteractiveObject interactiveObject) diff --git a/Assets/Settings/DefaultVolumeProfile.asset b/Assets/Settings/DefaultVolumeProfile.asset index 9e4bbfdd8..66d98de62 100644 --- a/Assets/Settings/DefaultVolumeProfile.asset +++ b/Assets/Settings/DefaultVolumeProfile.asset @@ -379,6 +379,9 @@ MonoBehaviour: highQualityFiltering: m_OverrideState: 1 m_Value: 0 + filter: + m_OverrideState: 1 + m_Value: 0 downscale: m_OverrideState: 1 m_Value: 0 diff --git a/Assets/Settings/Mobile_RPAsset.asset b/Assets/Settings/Mobile_RPAsset.asset index 0fdefd13e..fdaa26f7b 100644 --- a/Assets/Settings/Mobile_RPAsset.asset +++ b/Assets/Settings/Mobile_RPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: Mobile_RPAsset m_EditorClassIdentifier: - k_AssetVersion: 12 - k_AssetPreviousVersion: 12 + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 1024 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -78,11 +79,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 m_GPUResidentDrawerMode: 0 - m_UseLegacyLightmaps: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 @@ -109,6 +110,7 @@ MonoBehaviour: m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 0 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 0 @@ -126,8 +128,14 @@ MonoBehaviour: m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 + m_PrefilterScreenSpaceIrradiance: 0 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index c8b2d503d..9ed0f8c3e 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -233,6 +233,7 @@ QualitySettings: GameCoreXboxOne: 0 Lumin: 0 Nintendo Switch: 0 + Nintendo Switch 2: 0 PS4: 0 PS5: 0 Server: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index bb6ee294f..032946b82 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,25 +24,25 @@ EditorUserSettings: value: 0005505f515750595e5f5f23412507441216497f2d7f24367e711c64b6b86c61 flags: 0 RecentlyUsedSceneGuid-3: - value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a - flags: 0 - RecentlyUsedSceneGuid-4: value: 00050c5150005f5f54560f2640270d4410161c28282b72357e7c4835e4b63760 flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 06090c5f54015f5a0f085b7b11765d444e4e1e287429773178704561b3b23561 flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 0257035f51050d090f0f5d734521094414164e797e7a20667d7a4536e0e36461 flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-6: value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d flags: 0 + RecentlyUsedSceneGuid-7: + value: 54070c5452075002590c0871127b5a4443161c2f797176312c2f1e6bb1b4353d + flags: 0 RecentlyUsedSceneGuid-8: - value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e + value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a flags: 0 RecentlyUsedSceneGuid-9: - value: 54070c5452075002590c0871127b5a4443161c2f797176312c2f1e6bb1b4353d + value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9afeffa9ffff8e85dd8390e2969e8899daa7