diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 5a790e291..e9eef51d7 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -73,6 +73,21 @@ MonoBehaviour: - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} FilterEnum: 0 Filter: '*' + - Path: Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png + Address: UI/Common_atlas_mbu9ye + Type: Texture2D + Bundle: main/ui.bundle + Tags: + Group: + Name: UI + Enable: 1 + BundleMode: 0 + AddressMode: 2 + Tags: + Collectors: + - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} + FilterEnum: 0 + Filter: '*' - Path: Assets/ResRaw/Fgui/Common/Common_fui.bytes Address: UI/Common_fui Type: TextAsset @@ -22815,8 +22830,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: c96a5ac655b07d1e085439236fe63968 - Size: 6556310 + Hash: a6d6be8890d773594b4e6a1d4acf82d3 + Size: 7664301 Assets: - Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png Address: UI/Common_atlas0 @@ -22878,6 +22893,21 @@ MonoBehaviour: - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} FilterEnum: 0 Filter: '*' + - Path: Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png + Address: UI/Common_atlas_mbu9ye + Type: Texture2D + Bundle: main/ui.bundle + Tags: + Group: + Name: UI + Enable: 1 + BundleMode: 0 + AddressMode: 2 + Tags: + Collectors: + - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} + FilterEnum: 0 + Filter: '*' - Path: Assets/ResRaw/Fgui/Common/Common_fui.bytes Address: UI/Common_fui Type: TextAsset @@ -23106,8 +23136,8 @@ MonoBehaviour: Dependencies: [] Tags: - Name: main/item.bundle - Hash: c940c1d62b2fc2adefd9488fde66d412 - Size: 438276177 + Hash: 768629ee5aca8558e6aff5faf8389b71 + Size: 438274914 Assets: - Path: Assets/ResRaw/gfx/baits/black_leech/black_leech.prefab Address: Item/black_leech @@ -40968,8 +40998,8 @@ MonoBehaviour: Dependencies: [] Tags: - Name: main/plyaer.bundle - Hash: e032c081ff79c687c6d4e0e0a50122cf - Size: 393869083 + Hash: 44e8e09453d51e947b7f6f0034ba15d5 + Size: 393873086 Assets: - Path: Assets/ResRaw/Prefabs/chwytak/chwytak.prefab Address: Plyaer/chwytak @@ -41406,8 +41436,23 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/fishingLine.asset - Address: Plyaer/fishingLine + - Path: Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset + Address: Plyaer/FishingRopeLong + Type: ObiRopeBlueprint + Bundle: main/plyaer.bundle + Tags: + Group: + Name: Plyaer + Enable: 1 + BundleMode: 0 + AddressMode: 2 + Tags: + Collectors: + - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} + FilterEnum: 0 + Filter: '*' + - Path: Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset + Address: Plyaer/FishingRopeShort Type: ObiRopeBlueprint Bundle: main/plyaer.bundle Tags: @@ -41436,81 +41481,6 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/rope blueprint.asset - Address: Plyaer/rope blueprint - Type: ObiRopeBlueprint - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_1 1.asset - Address: Plyaer/RopeSegment_1 1 - Type: ObiRopeBlueprint - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset - Address: Plyaer/RopeSegment_1 - Type: ObiRopeBlueprint - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_2.asset - Address: Plyaer/RopeSegment_2 - Type: ObiRopeBlueprint - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_3.asset - Address: Plyaer/RopeSegment_3 - Type: ObiRopeBlueprint - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_4.asset Address: Plyaer/RopeSegment_4 Type: ObiRopeBlueprint @@ -41541,21 +41511,6 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/Tip.prefab - Address: Plyaer/Tip - Type: GameObject - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - Path: Assets/ResRaw/Prefabs/Player/Anim/AnimationClip/CameraCrouch.anim Address: Plyaer/CameraCrouch Type: AnimationClip diff --git a/Assets/Enviro 3 - Sky and Weather/Profiles/Configurations/Default Enviro Configuration 3_3_1.asset b/Assets/Enviro 3 - Sky and Weather/Profiles/Configurations/Default Enviro Configuration 3_3_1.asset index d89011761..a1b0e7caa 100644 --- a/Assets/Enviro 3 - Sky and Weather/Profiles/Configurations/Default Enviro Configuration 3_3_1.asset +++ b/Assets/Enviro 3 - Sky and Weather/Profiles/Configurations/Default Enviro Configuration 3_3_1.asset @@ -18,9 +18,9 @@ MonoBehaviour: settings: useCirrusClouds: 1 cirrusCloudsTex: {fileID: 2800000, guid: 75c66597a85001644b2de40147b8d196, type: 3} - cirrusCloudsAlpha: 0 - cirrusCloudsColorPower: 1.13 - cirrusCloudsCoverage: 0.293 + cirrusCloudsAlpha: 0.518 + cirrusCloudsColorPower: 1.15 + cirrusCloudsCoverage: 0.275 cirrusCloudsColor: serializedVersion: 2 key0: {r: 0, g: 0, b: 0, a: 1} @@ -115,13 +115,13 @@ MonoBehaviour: m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 2 - flatCloudsLightIntensity: 1.014 - flatCloudsAmbientIntensity: 1.05 - flatCloudsShadowIntensity: 0.6 + flatCloudsLightIntensity: 1.05 + flatCloudsAmbientIntensity: 1.8 + flatCloudsShadowIntensity: 1 flatCloudsShadowSteps: 8 flatCloudsHGPhase: 0.8 - flatCloudsCoverage: 1.287 - flatCloudsDensity: 1 + flatCloudsCoverage: 0 + flatCloudsDensity: 1.24 flatCloudsAltitude: 1 flatCloudsTonemapping: 0 flatCloudsBaseTiling: 1 @@ -131,9 +131,9 @@ MonoBehaviour: preset: {fileID: 11400000, guid: 0fcdd472bd6a8ec429fc1e9bc978c4fa, type: 2} showCirrusCloudsControls: 0 show2DCloudsControls: 0 - cloudFlatBaseAnim: {x: 0.39125437, y: 0.7990015} - cloudFlatDetailAnim: {x: -0.2562718, y: 0.51082325} - cirrusAnim: {x: -0.96338534, y: 0.5347988} + cloudFlatBaseAnim: {x: -0.9508978, y: 0.15081745} + cloudFlatDetailAnim: {x: -0.96859133, y: -0.72973555} + cirrusAnim: {x: -0.6344192, y: 0.21070647} --- !u!114 &-6613759932185320841 MonoBehaviour: m_ObjectHideFlags: 0 @@ -174,6 +174,127 @@ MonoBehaviour: localRotationOffset: {x: -90, y: 0, z: 0} emissionRate: 0 maxEmission: 2500 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Rain - Spray + prefab: {fileID: 2894843160301278215, guid: cb7e5bd658a74514282922c5aca62501, type: 3} + localPositionOffset: {x: 0, y: 5, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 250 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Rain - Heavy Animated + prefab: {fileID: 6228027495522602293, guid: 2160ad973fb8b9b479ea52c0dd92d776, type: 3} + localPositionOffset: {x: 0, y: 5, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 500 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Hail - Detailed + prefab: {fileID: 7772587089925939976, guid: 08fe61df7b4a15342b9e1093c3822e1d, type: 3} + localPositionOffset: {x: 0, y: 20, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 500 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Hail - Distant + prefab: {fileID: 20393420208608063, guid: 4ecbe8b790498924281665d00d386303, type: 3} + localPositionOffset: {x: 0, y: 20, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 200 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Mist - Animated + prefab: {fileID: 2369505825402797903, guid: 011bd21d576e9ec42a9fa4ee1b3b2485, type: 3} + localPositionOffset: {x: 0, y: -5, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 100 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Mist - Simple + prefab: {fileID: 4611945792092372246, guid: 3391b636c38129a4387a63bc3e9e3363, type: 3} + localPositionOffset: {x: 0, y: -2, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 100 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Sandstorm - Animated + prefab: {fileID: 1876101198480040169, guid: f7295fdd24af00d45adca3f950c58e21, type: 3} + localPositionOffset: {x: 0, y: 0, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 300 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Sandstorm - Simple + prefab: {fileID: 4612367715966874164, guid: d89bd3d690b73a3409830ab1b5354d49, type: 3} + localPositionOffset: {x: 0, y: 0, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 300 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Snow - Heavy Animated + prefab: {fileID: 8696680525532006569, guid: ccb5242bc3282164da9df10a45d97904, type: 3} + localPositionOffset: {x: 0, y: 20, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 250 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Snow - Light Animated + prefab: {fileID: 8696680525532006569, guid: f330394de90289d45a25233243471a7e, type: 3} + localPositionOffset: {x: 0, y: 5, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 300 + - prefabVFXGraph: {fileID: 0} + localPositionOffsetVFXGraph: {x: 0, y: 0, z: 0} + localRotationOffsetVFXGraph: {x: 0, y: 0, z: 0} + maxEmissionVFXGraph: 0 + mySystem: {fileID: 0} + name: Rain - Light Animated + prefab: {fileID: 2894843160301278215, guid: ce9c12434c621b545bbbe8e6c7f58175, type: 3} + localPositionOffset: {x: 0, y: 10, z: 0} + localRotationOffset: {x: -90, y: 0, z: 0} + emissionRate: 0 + maxEmission: 300 particeEmissionRateModifier: 1 preset: {fileID: 11400000, guid: 59a8076f06e540343b875f850ac3b6a4, type: 2} showSetupControls: 0 @@ -190,7 +311,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b3ccdfb360c52f049bf71126aa74826f, type: 3} m_Name: Weather Module m_EditorClassIdentifier: - showModuleInspector: 0 + showModuleInspector: 1 showSaveLoad: 0 active: 1 Settings: @@ -204,6 +325,26 @@ MonoBehaviour: - {fileID: 11400000, guid: f736e404e0b052942bc41c35c50dccad, type: 2} - {fileID: 11400000, guid: 96eebec6fa78a3c48ba2bc98ac5ab57f, type: 2} - {fileID: 11400000, guid: ebf8ae7a51a5cd342a90c81f5182d8a8, type: 2} + - {fileID: 11400000, guid: dd0462d0319461848b0ee0f24abc60dc, type: 2} + - {fileID: 11400000, guid: a53fcb87f0cf4d64891d42cea884a72a, type: 2} + - {fileID: 11400000, guid: f2d0b06c8f9dc1945834b87442823871, type: 2} + - {fileID: 11400000, guid: 5f97f08a2d9726740b597b742a4859b9, type: 2} + - {fileID: 11400000, guid: 662e523f15e05f249bb207dd78b6a9ee, type: 2} + - {fileID: 11400000, guid: 71ea823bb98c5384b80481569f092587, type: 2} + - {fileID: 11400000, guid: 598bcf409fd13334cabb85ca009d0d18, type: 2} + - {fileID: 11400000, guid: a22a8c05ebe12634bb77ad9c5f45b334, type: 2} + - {fileID: 11400000, guid: 84a247eb82a465a4ebd3aefb2bae3507, type: 2} + - {fileID: 11400000, guid: e114bf833613d9e45b762022813aa001, type: 2} + - {fileID: 11400000, guid: a54dc6deb86f7db4fb19f013c52d21f4, type: 2} + - {fileID: 11400000, guid: 0a4ae9f47758d734781a5d2823292397, type: 2} + - {fileID: 11400000, guid: 9f3d826e482ea664081a62cea2e76260, type: 2} + - {fileID: 11400000, guid: c54c628a955536c49830030a98c605f5, type: 2} + - {fileID: 11400000, guid: 163edba1d167b9844b25eff6f19caf18, type: 2} + - {fileID: 11400000, guid: 10bd3cbf9d8cd3a41b87a5046f0c55b9, type: 2} + - {fileID: 11400000, guid: 7a7cab9ae02aab1499bef62d8f4af4aa, type: 2} + - {fileID: 11400000, guid: 9c1bfd2e648b0924daaced2c2a56d14a, type: 2} + - {fileID: 11400000, guid: fae8bcf053377c04da25682f9b3b8ca5, type: 2} + - {fileID: 11400000, guid: fc61aa537d6b4214794ddd3a01bfd5eb, type: 2} cloudsTransitionSpeed: 1 fogTransitionSpeed: 1 lightingTransitionSpeed: 1 @@ -213,8 +354,8 @@ MonoBehaviour: environmentTransitionSpeed: 1 audioTransitionSpeed: 1 preset: {fileID: 11400000, guid: 8c4e279017d5e44458e3e4663b6ab460, type: 2} - targetWeatherType: {fileID: 11400000, guid: 6c589d06d1746d04a864437f71d0cc30, type: 2} - weatherBlendProgress: 1 + targetWeatherType: {fileID: 11400000, guid: 3e61e22e1ac8ba045a3b0e53c22b3629, type: 2} + weatherBlendProgress: 0 globalAutoWeatherChange: 1 triggerCollider: {fileID: 0} triggerRB: {fileID: 0} @@ -938,11 +1079,11 @@ MonoBehaviour: lightingModule: {fileID: 1121697361819163703} reflectionsModule: {fileID: 3003072118128753163} Sky: {fileID: -1033463005042072443} - fogModule: {fileID: 6137975383063632260} + fogModule: {fileID: 0} volumetricCloudModule: {fileID: 0} flatCloudModule: {fileID: -6856645797116724545} Weather: {fileID: -2780709178333184838} - Aurora: {fileID: 4011421771873438716} + Aurora: {fileID: 0} Audio: {fileID: 2333546472042683326} Effects: {fileID: -6613759932185320841} Lightning: {fileID: 8141577898218642580} @@ -1369,7 +1510,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - directLightIntensityModifier: 1 + directLightIntensityModifier: 1.2 setAmbientLighting: 1 ambientMode: 0 ambientSkyColorGradient: @@ -1510,7 +1651,7 @@ MonoBehaviour: showSaveLoad: 0 active: 1 Settings: - simulate: 0 + simulate: 1 secSerial: 0 minSerial: 0 hourSerial: 7 @@ -1691,7 +1832,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - temperature: 3.1910791 + temperature: 3.191055 temperatureWeatherMod: 0 temperatureCustomMod: 0 temperatureChangingSpeed: 0.1 @@ -1705,9 +1846,9 @@ MonoBehaviour: snowMeltSpeed: 1 snowMeltingTresholdTemperature: 1 windDirectionX: 1 - windDirectionY: -1 - windSpeed: 0.5 - windTurbulence: 0.2 + windDirectionY: 0 + windSpeed: 0.25 + windTurbulence: 0.25 preset: {fileID: 11400000, guid: c2a8d80258fd83a409a05aa912abca80, type: 2} showSeasonControls: 1 showTemperatureControls: 0 @@ -1912,6 +2053,66 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 maxVolume: 1 + - showEditor: 0 + name: Wind_1 + audioClip: {fileID: 8300000, guid: 365e7884a2a08ff44967f27cc11cf86a, type: 3} + audioMixerGroup: {fileID: 0} + playBackType: 0 + myAudioSource: {fileID: 0} + loop: 1 + volume: 0 + volumeCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxVolume: 1 + - showEditor: 0 + name: Wind_2 + audioClip: {fileID: 8300000, guid: ce6404a444c7fdd4eb4aaa44ac9044c0, type: 3} + audioMixerGroup: {fileID: 0} + playBackType: 0 + myAudioSource: {fileID: 0} + loop: 1 + volume: 0 + volumeCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxVolume: 1 + - showEditor: 0 + name: Wind_3 + audioClip: {fileID: 8300000, guid: 30d38840750798640a9f58e759bc1c0b, type: 3} + audioMixerGroup: {fileID: 0} + playBackType: 0 + myAudioSource: {fileID: 0} + loop: 1 + volume: 0 + volumeCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxVolume: 1 + - showEditor: 0 + name: Wind_Rainy + audioClip: {fileID: 8300000, guid: 1723c3badf42ee944a5e3462939ca840, type: 3} + audioMixerGroup: {fileID: 0} + playBackType: 0 + myAudioSource: {fileID: 0} + loop: 1 + volume: 0 + volumeCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxVolume: 1 thunderClips: - showEditor: 1 name: Thunder 1 @@ -2011,7 +2212,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 153c2e7862a6cc74c80438e6d8e45aab, type: 3} m_Name: Reflections Module m_EditorClassIdentifier: - showModuleInspector: 0 + showModuleInspector: 1 showSaveLoad: 0 active: 1 Settings: @@ -2035,685 +2236,6 @@ MonoBehaviour: showReflectionControls: 1 lastReflectionUpdate: 7.025 lastReflectionUpdatePos: {x: 0, y: 24.1, z: 0} ---- !u!114 &4011421771873438716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6910768c241d1924f921a3f44198cfe1, type: 3} - m_Name: Aurora Module - m_EditorClassIdentifier: - showModuleInspector: 0 - showSaveLoad: 0 - active: 1 - Settings: - useAurora: 1 - auroraIntensityModifier: 1 - auroraIntensity: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - auroraColor: {r: 0.1, g: 0.5, b: 0.7, a: 1} - auroraBrightness: 75 - auroraContrast: 10 - auroraHeight: 20000 - auroraScale: 0.01 - auroraSteps: 24 - auroraLayer1Settings: {x: 0.1, y: 0.1, z: 0, w: 0.5} - auroraLayer2Settings: {x: 5, y: 5, z: 0, w: 0.5} - auroraColorshiftSettings: {x: 0.05, y: 0.05, z: 0, w: 5} - auroraSpeed: 0.005 - aurora_layer_1: {fileID: 2800000, guid: 3316634c3fa8231429eb988934de236c, type: 3} - aurora_layer_2: {fileID: 2800000, guid: 25bf6a8e18b4471499e961d75d1777c2, type: 3} - aurora_colorshift: {fileID: 2800000, guid: f99b7b1866c1ab3489d848a4ef3dd81b, type: 3} - preset: {fileID: 11400000, guid: 278933d28004c6b40ace276968b45b9e, type: 2} - showAuroraControls: 0 ---- !u!114 &6137975383063632260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4eacb969ef7bfec4ba69d66b0a873f2f, type: 3} - m_Name: Fog Module - m_EditorClassIdentifier: - showModuleInspector: 0 - showSaveLoad: 1 - active: 1 - Settings: - volumetrics: 1 - steps: 32 - quality: 1 - scattering: 0.28 - scatteringMultiplier: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.29862836 - value: 7.1266994 - inSlope: -7.9367094 - outSlope: -7.9367094 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.1494251 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41374835 - value: 1.9498584 - inSlope: -5.9926996 - outSlope: -5.9926996 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.515421 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - extinction: 0.02 - anistropy: 0.19 - maxRange: 1000 - maxRangePointSpot: 100 - noiseIntensity: 0 - noiseScale: 0 - windDirection: {x: 3.9, y: 0, z: 0} - noise: {fileID: 0} - ditheringTex: {fileID: 2800000, guid: 711e788cbc742bb439b3c7cad60651e3, type: 3} - fog: 1 - fogQualityMode: 0 - floatingPointOriginMod: {x: 0, y: 0, z: 0} - globalFogHeight: 0 - fogDensity: 0.015 - fogHeightFalloff: 0.0121 - fogHeight: 0 - fogDensity2: 0.412 - fogHeightFalloff2: 0.0388 - fogHeight2: 0 - fogMaxOpacity: 1 - startDistance: 0.01 - fogColorBlend: 0.5 - fogColorMod: {r: 1, g: 1, b: 1, a: 1} - blockScattering: 1 - ambientColorGradient: - serializedVersion: 2 - key0: {r: 0.23549305, g: 0.2427107, b: 0.7924528, a: 1} - key1: {r: 0.16073336, g: 0.22812635, b: 0.7924528, a: 1} - key2: {r: 0.35590956, g: 0.44551674, b: 0.5849056, a: 0} - key3: {r: 2.5796902, g: 2.651018, b: 2.8293376, a: 0} - key4: {r: 2.5796902, g: 2.651018, b: 2.8293376, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 29491 - ctime2: 33539 - ctime3: 65535 - ctime4: 65535 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 4 - m_NumAlphaKeys: 2 - unityFog: 0 - unityFogMode: 2 - unityFogDensity: 0.002 - unityFogStartDistance: 0 - unityFogEndDistance: 1000 - unityFogColor: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 0.0146404365, g: 0.019780159, b: 0.066037714, a: 1} - key2: {r: 0.12589, g: 0.15198022, b: 0.38679248, a: 0} - key3: {r: 0.6415094, g: 0.39747813, b: 0.26326096, a: 0} - key4: {r: 0.53266287, g: 0.63567483, b: 0.8490566, a: 0} - key5: {r: 0.82702917, g: 0.8807278, b: 0.990566, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 9830 - ctime2: 23130 - ctime3: 32768 - ctime4: 36430 - ctime5: 65535 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 6 - m_NumAlphaKeys: 2 - preset: {fileID: 11400000, guid: 6625884995235d049bd7f2f1de182577, type: 2} - showFogControls: 1 - showVolumetricsControls: 1 - showUnityFogControls: 0 - fogLights: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - customFogDensityModifer: 1 - fogMat: {fileID: 0} - volumetricsMat: {fileID: 0} - blurMat: {fileID: 0} - blurMat2: {fileID: 0} - volumetricsRenderTexture: {fileID: 0} --- !u!114 &8141577898218642580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2733,7 +2255,7 @@ MonoBehaviour: prefab: {fileID: 8233971941884837668, guid: 3686e34c2aa90c44e8eab718f3bf99b6, type: 3} customLightningEffect: {fileID: 0} lightningStorm: 0 - randomLightingDelay: 10 + randomLightingDelay: 9.6 randomSpawnRange: 5000 randomTargetRange: 5000 cloudsLightningRadius: 2500 diff --git a/Assets/Obvious/Soap/Examples/Content/ScriptableVariables/example_bool_tutorialCompleted.asset b/Assets/Obvious/Soap/Examples/Content/ScriptableVariables/example_bool_tutorialCompleted.asset index db1da2110..4ffcb89e6 100644 --- a/Assets/Obvious/Soap/Examples/Content/ScriptableVariables/example_bool_tutorialCompleted.asset +++ b/Assets/Obvious/Soap/Examples/Content/ScriptableVariables/example_bool_tutorialCompleted.asset @@ -13,22 +13,19 @@ MonoBehaviour: m_Name: example_bool_tutorialCompleted m_EditorClassIdentifier: serializationData: - SerializedFormat: 2 - SerializedBytes: + SerializedFormat: 0 + SerializedBytes: 2d010e000000520065007000610069006e0074005200650071007500650073007400 ReferencedUnityObjects: [] SerializedBytesString: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] - SerializationNodes: - - Name: RepaintRequest - Entry: 6 - Data: + SerializationNodes: [] TagIndex: 0 Description: _guid: 1afe66c634254d647bce4ea62658436e _saveGuid: 0 - _value: 1 + _value: 0 _debugLogEnabled: 0 _saved: 1 _defaultValue: 0 diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas0.png b/Assets/ResRaw/Fgui/Common/Common_atlas0.png index 4f5a9295d..6e3f95cf8 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas0.png and b/Assets/ResRaw/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png new file mode 100644 index 000000000..43ce7edb6 Binary files /dev/null and b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png differ diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta new file mode 100644 index 000000000..63f5c9404 --- /dev/null +++ b/Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 91f05f7801b3e284e9bf6ec0efa4571e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes index 424d6ff87..c09382e96 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_fui.bytes and b/Assets/ResRaw/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/ResRaw/Fgui/Main/Main_atlas0.png b/Assets/ResRaw/Fgui/Main/Main_atlas0.png index 97d59d0ad..9a2b6a96e 100644 Binary files a/Assets/ResRaw/Fgui/Main/Main_atlas0.png and b/Assets/ResRaw/Fgui/Main/Main_atlas0.png differ diff --git a/Assets/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 7edf9c5e7..1ef91f5f1 100644 Binary files a/Assets/ResRaw/Fgui/Main/Main_fui.bytes and b/Assets/ResRaw/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/ResRaw/Maps/Map1/Map1.unity b/Assets/ResRaw/Maps/Map1/Map1.unity index 40fe176f6..d1d9fef6d 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: 183935945} + m_SkyboxMaterial: {fileID: 2032963743} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -387,54 +387,6 @@ MonoBehaviour: _MaximumSpeed: 100 _WarnOnSpeedClamp: 0 _DebugSubsteps: 0 ---- !u!21 &183935945 -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 &211586105 GameObject: m_ObjectHideFlags: 0 @@ -882,7 +834,7 @@ MonoBehaviour: _Sky: 1 _DisablePixelLights: 1 _DisableShadows: 1 - _HDR: 1 + _HDR: 0 _Stencil: 0 _QualitySettingsOverride: _OverrideLodBias: 0 @@ -1024,7 +976,7 @@ MonoBehaviour: customRendering: 0 useFog: 0 bakingCam: {fileID: 0} - renderId: 11157 + renderId: 2 --- !u!215 &878887029 ReflectionProbe: m_ObjectHideFlags: 0 @@ -1487,6 +1439,54 @@ MonoBehaviour: _MaximumSpeed: 100 _WarnOnSpeedClamp: 0 _DebugSubsteps: 0 +--- !u!21 &2032963743 +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 @@ -8216,7 +8216,6 @@ MonoBehaviour: GearNode: {fileID: 6022323663597824692} Water: {fileID: 0} LineRenderer: {fileID: 0} - AzureCoreSystem: {fileID: 0} FPS: 0 updateInterval: 0.2 --- !u!1 &7460703579491896368 @@ -8330,11 +8329,11 @@ MonoBehaviour: Lighting: {fileID: 1121697361819163703, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} Reflections: {fileID: 3003072118128753163, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} Sky: {fileID: -1033463005042072443, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} - Fog: {fileID: 6137975383063632260, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} + Fog: {fileID: 0} VolumetricClouds: {fileID: 0} FlatClouds: {fileID: -6856645797116724545, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} Weather: {fileID: -2780709178333184838, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} - Aurora: {fileID: 4011421771873438716, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} + Aurora: {fileID: 0} Audio: {fileID: 2333546472042683326, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} Effects: {fileID: -6613759932185320841, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} Lightning: {fileID: 8141577898218642580, guid: 59da3fbf5f918234799ed9be3eb0ddba, type: 2} diff --git a/Assets/ResRaw/Prefabs/Player/NewAnim/PlayerAnimator.controller b/Assets/ResRaw/Prefabs/Player/NewAnim/PlayerAnimator.controller index 687453937..cd802d296 100644 --- a/Assets/ResRaw/Prefabs/Player/NewAnim/PlayerAnimator.controller +++ b/Assets/ResRaw/Prefabs/Player/NewAnim/PlayerAnimator.controller @@ -2183,8 +2183,8 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: m_Mirror: 0 - m_BlendParameter: Jump 0 - m_BlendParameterY: JumpLeg + m_BlendParameter: mouthLowerDownRight + m_BlendParameterY: TH m_MinThreshold: 0 m_MaxThreshold: 40 m_UseAutomaticThresholds: 0 diff --git a/Assets/Scenes/StartUp.unity b/Assets/Scenes/StartUp.unity index 437947334..7663fb9b2 100644 --- a/Assets/Scenes/StartUp.unity +++ b/Assets/Scenes/StartUp.unity @@ -1629,8 +1629,8 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.01 - far clip plane: 5000 + near clip plane: 0.1 + far clip plane: 3000 field of view: 60.000004 orthographic: 0 orthographic size: 5 @@ -1784,6 +1784,7 @@ GameObject: - component: {fileID: 1341717235351337375} - component: {fileID: 7388915548948935574} - component: {fileID: 7388915548948935575} + - component: {fileID: 7388915548948935576} m_Layer: 0 m_Name: Init m_TagString: Untagged @@ -1826,6 +1827,24 @@ MonoBehaviour: MoveInput: {x: 0, y: 0} EyeAngle: 0 NextState: 0 +--- !u!114 &7388915548948935576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7388915548948935573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb1abc98a51ad124fa638d080c051ce4, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBC.SoundManager + mixer: {fileID: 24100000, guid: 7a7096d3677868648abe69eb19c512c3, type: 2} + bgmGroup: {fileID: 0} + sfxGroup: {fileID: 0} + uiGroup: {fileID: 0} + ambientGroup: {fileID: 0} + playerGroup: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Common/Common/Attrobites/Attributes.cs b/Assets/Scripts/Common/Common/Attrobites/Attributes.cs index 39b53b8ff..cabd1f3d9 100644 --- a/Assets/Scripts/Common/Common/Attrobites/Attributes.cs +++ b/Assets/Scripts/Common/Common/Attrobites/Attributes.cs @@ -20,9 +20,8 @@ namespace NBF [AttributeUsage(AttributeTargets.Method)] public class UIExtensionAutoBindAttribute : BaseAttribute { - } - + [AttributeUsage(AttributeTargets.Field)] public class InputIconAttribute : BaseAttribute { @@ -74,4 +73,19 @@ namespace NBF Sort = sort; } } + + [AttributeUsage(AttributeTargets.Method)] + public class InputInvokeAttribute : BaseAttribute + { + public string Name; + public string Key; + public bool ShowLeft; + + public InputInvokeAttribute(string name, string key = "", bool showLeft = true) + { + Name = name; + Key = key; + ShowLeft = showLeft; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Common/Common/Services/Input/InputManager.cs b/Assets/Scripts/Common/Common/Services/Input/InputManager.cs index f8acc7901..056c698cd 100644 --- a/Assets/Scripts/Common/Common/Services/Input/InputManager.cs +++ b/Assets/Scripts/Common/Common/Services/Input/InputManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using NBC; // using Rewired; @@ -13,6 +14,12 @@ namespace NBF GamePad = 1 } + public struct UIInputInvoke + { + public object UIObject; + public InputInvokeAttribute InputInvoke; + } + public class InputManager : MonoService { public static bool IsOp1; @@ -237,5 +244,20 @@ namespace NBF OnUIPerformed?.Invoke(actionName); OnUICanceled?.Invoke(actionName); } + + #region UI界面按键管理 + + private readonly Dictionary> _panelActions = + new Dictionary>(); + + public void On(object obj) + { + } + + public void Off(object obj) + { + } + + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/Common/Common/Services/Settings/Base/MultiOption.cs b/Assets/Scripts/Common/Common/Services/Settings/Base/MultiOption.cs index 0a7b88692..2bf766199 100644 --- a/Assets/Scripts/Common/Common/Services/Settings/Base/MultiOption.cs +++ b/Assets/Scripts/Common/Common/Services/Settings/Base/MultiOption.cs @@ -7,6 +7,7 @@ namespace NBF.Setting public interface IMultiOption : IOptionBase { List GetOptionNames(); + bool IsDropdown { get; } } public abstract class MultiOption : OptionBase, IMultiOption @@ -21,6 +22,8 @@ namespace NBF.Setting public List GetOptionNames() => OptionTable.GetNames(); + public virtual bool IsDropdown => false; + protected void SelectOption(T value, int defaultIndex = 0) { diff --git a/Assets/Scripts/Common/Common/Services/Settings/Base/OptionBase.cs b/Assets/Scripts/Common/Common/Services/Settings/Base/OptionBase.cs index 9be244d6b..2da3a906e 100644 --- a/Assets/Scripts/Common/Common/Services/Settings/Base/OptionBase.cs +++ b/Assets/Scripts/Common/Common/Services/Settings/Base/OptionBase.cs @@ -51,13 +51,18 @@ namespace NBF.Setting } public ISettings Root { get; private set; } - - + + public void Initialize(ISettings root) { Root = root; Load(); OnInitialize(); + if (!PlayerPrefs.HasKey(SaveKey)) + { + OnSetDefaultValue(); + } + Apply(); } @@ -85,15 +90,14 @@ namespace NBF.Setting public virtual void Cancel() { - } - + public virtual string GetDisplayString() { return GetValue().ToString(); } - + public virtual int GetValue() { return Value; @@ -109,6 +113,11 @@ namespace NBF.Setting { } + protected virtual void OnSetDefaultValue() + { + Value = DefaultValue; + SaveValue = DefaultValue; + } protected abstract void OnApply(); } diff --git a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs b/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs index b4b52404a..a4de49be2 100644 --- a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs +++ b/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/FullScreenModeSetting.cs @@ -1,4 +1,6 @@ using UnityEngine; +using Unity.Collections; +using System.Collections; namespace NBF.Setting { @@ -20,8 +22,15 @@ namespace NBF.Setting protected override void OnApply() { - // Screen.fullScreenMode = GetSelectedOption(); - // Debug.Log($"FullScreenMode: {Screen.fullScreenMode} value: {GetSelectedOption()}"); + Screen.fullScreenMode = GetSelectedOption(); + if (Screen.fullScreenMode == FullScreenMode.ExclusiveFullScreen) + { + Screen.fullScreen = true; + } + + var nmsl = KeyCode.Alpha0; + + Debug.Log($"FullScreenMode: {Screen.fullScreenMode} value: {GetSelectedOption()}"); } } } \ No newline at end of file diff --git a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs b/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs index ef6a7efc2..8b5297229 100644 --- a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs +++ b/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs @@ -16,19 +16,84 @@ namespace NBF.Setting public override string Group => SettingsDef.Group.Graphic; protected override int DefaultValue => _defaultResolution; public override string Tab => SettingsDef.Tab.Graphic; + public override bool IsDropdown => true; + + + static readonly (int w, int h)[] Classic16_9 = + { + (1280, 720), + (1600, 900), + (1920, 1080), + (2560, 1440), + (3840, 2160), + }; + + static readonly (int w, int h)[] Classic16_10 = + { + (1280, 800), + (1680, 1050), + (1920, 1200), + (2560, 1600), + }; + + static readonly (int w, int h)[] Classic21_9 = + { + (2560, 1080), + (3440, 1440), + (3840, 1600), + }; + + static readonly (int w, int h)[] Classic32_9 = + { + (3840, 1080), + (5120, 1440), + }; protected override void OnInitialize() { - var supportedResolutions = Screen.resolutions - .GroupBy(r => $"{r.width}x{r.height}") // 按宽高分组 - .Select(g => g.OrderByDescending(r => r.refreshRateRatio).First()) - .ToArray(); - foreach (var resolution in supportedResolutions) + var supported = Screen.resolutions + .Select(r => (r.width, r.height)) + .Distinct() + .ToHashSet(); + + var mainWindowDisplayInfo = Screen.mainWindowDisplayInfo; // 主窗口所在显示器的信息 + + float aspect = (float)Screen.currentResolution.width / Screen.currentResolution.height; + + bool Near(float a, float b, float eps = 0.03f) => Mathf.Abs(a - b) <= eps; + + IEnumerable<(int w, int h)> preferred = + Near(aspect, 16f / 9f) ? Classic16_9 : + Near(aspect, 16f / 10f) ? Classic16_10 : + Near(aspect, 21f / 9f) ? Classic21_9 : + Near(aspect, 32f / 9f) ? Classic32_9 : + Classic16_9; // 兜底 + + + var list = preferred.Where(supported.Contains).ToList(); + + // 兜底：保证原生分辨率一定在列表里（尤其是超宽屏） + var native = (Screen.currentResolution.width, Screen.currentResolution.height); + if (!list.Contains(native) && supported.Contains(native)) + list.Add(native); + + // 排序（从小到大或从大到小都行） + list = list.OrderBy(x => x.w * x.h).ToList(); + + + foreach (var resolution in list) { - if (resolution.width < 720 || resolution.height < 720) continue; - AddOption($"{resolution.width}x{resolution.height}", resolution); - Log.Info($"Resolution {resolution.width}x{resolution.height}"); + var w = resolution.w; + var h = resolution.h; + if (w > mainWindowDisplayInfo.width || h > mainWindowDisplayInfo.height) continue; + AddOption($"{w}x{h}", new Resolution() + { + width = w, + height = h, + }); + Log.Info($"Resolution {w}x{h}"); } + TryGetIndex(t => t.width == Screen.currentResolution.width && t.height == Screen.currentResolution.height, @@ -38,7 +103,15 @@ namespace NBF.Setting { _defaultResolution = 0; } + + var n = Value; + var nm = SaveValue; + if (!PlayerPrefs.HasKey(SaveKey)) + { + + } } + protected override void OnApply() { diff --git a/Assets/Scripts/Common/Data/TabListData.cs b/Assets/Scripts/Common/Data/TabListData.cs index bfe19b0bd..bbfea4d1f 100644 --- a/Assets/Scripts/Common/Data/TabListData.cs +++ b/Assets/Scripts/Common/Data/TabListData.cs @@ -10,6 +10,7 @@ namespace NBF public string Key; public string Icon; public bool IsAll; + public string Name; // 条目可以是任意对象类型 public List Items = new List(); diff --git a/Assets/Scripts/Fishing/PlayerInputControl.cs b/Assets/Scripts/Fishing/PlayerInputControl.cs index a50bc383b..191a0e6d2 100644 --- a/Assets/Scripts/Fishing/PlayerInputControl.cs +++ b/Assets/Scripts/Fishing/PlayerInputControl.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.14.2 +// version 1.16.0 // from Assets/PlayerInputControl.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Assets/Scripts/Game.cs b/Assets/Scripts/Game.cs index bc2014b68..51c2a9d57 100644 --- a/Assets/Scripts/Game.cs +++ b/Assets/Scripts/Game.cs @@ -91,6 +91,8 @@ namespace NBF // loadAssemblies.Add(assembly); // } + gameObject.AddComponent(); + // 1. 初始化 Fantasy 框架 await Fantasy.Platform.Unity.Entry.Initialize(); @@ -151,9 +153,6 @@ namespace NBF private void InitUI() { - GRoot.inst.SetContentScaleFactor(UIDef.DefaultScreen.Width, UIDef.DefaultScreen.Height, - UIContentScaler.ScreenMatchMode.MatchWidthOrHeight); - Binder.BindAll(); UIObjectFactory.SetLoaderExtension(typeof(XGLoader)); UIConst.UIPackRootUrl = UIDef.UIRoot; diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index 6bed4c74a..348517165 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -60,7 +60,8 @@ namespace NBF { // await Task.Delay(100); CommonTopPanel.Show(); - LoginPanel.Show(); + SettingPanel.Show(); + // LoginPanel.Show(); // PreviewPanel.Show(); } } diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs index bfa1ebbd5..6b7543dbc 100644 --- a/Assets/Scripts/UI/Binders/CommonBinder.cs +++ b/Assets/Scripts/UI/Binders/CommonBinder.cs @@ -15,6 +15,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList)); UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu)); UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag)); + UIObjectFactory.SetPackageItemExtension(BtnSubMenuLeft.URL, typeof(BtnSubMenuLeft)); UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl)); UIObjectFactory.SetPackageItemExtension(CommonItemList.URL, typeof(CommonItemList)); UIObjectFactory.SetPackageItemExtension(BtnTitleInputControl.URL, typeof(BtnTitleInputControl)); @@ -22,6 +23,7 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(CommonSubMenu.URL, typeof(CommonSubMenu)); UIObjectFactory.SetPackageItemExtension(BtnInputControl.URL, typeof(BtnInputControl)); UIObjectFactory.SetPackageItemExtension(ListTitleItem.URL, typeof(ListTitleItem)); + UIObjectFactory.SetPackageItemExtension(BtnSubMenu.URL, typeof(BtnSubMenu)); UIObjectFactory.SetPackageItemExtension(ModelViewer.URL, typeof(ModelViewer)); } } diff --git a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs index 8a53a5306..63b44317a 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs +++ b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs @@ -39,7 +39,7 @@ namespace NBF if (_panel == null) return; if (!_panel.IsShowing) return; if (!_panel.IsTop) return; - + if (action == InputDef.UI.SubPrev) { OnClickBtnPrev(); @@ -57,7 +57,7 @@ namespace NBF for (int i = 0; i < subItems.Count; i++) { var tabData = subItems[i]; - var tabItem = List.AddItemFromPool().asButton; + var tabItem = List.AddItemFromPool(i == 0 ? BtnSubMenuLeft.URL : BtnSubMenu.URL).asButton; tabItem.SetLanguage(tabData.Key); width += tabItem.width; diff --git a/Assets/Scripts/UI/Common/Menu/item.meta b/Assets/Scripts/UI/Common/Menu/item.meta new file mode 100644 index 000000000..0af5dd5c6 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 21fd308a87b848d7b4a9138f06c4c5f7 +timeCreated: 1769923363 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs new file mode 100644 index 000000000..a9a1fba45 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs @@ -0,0 +1,25 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class BtnSubMenu + { + public const string URL = "ui://6hgkvlauvbojxi"; + + public GImage back; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + back = (GImage)GetChild("back"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs.meta new file mode 100644 index 000000000..09244c78b --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 670c4d5385c0ad741a5381d10fc7dd15 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs new file mode 100644 index 000000000..73bf359b3 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class BtnSubMenu : GButton + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs.meta new file mode 100644 index 000000000..515cc0e0f --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5b6a27e3fa4572443afc883702c768f3 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs new file mode 100644 index 000000000..61d809d79 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs @@ -0,0 +1,25 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class BtnSubMenuLeft + { + public const string URL = "ui://6hgkvlaumbu9y9"; + + public GImage back; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + back = (GImage)GetChild("back"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs.meta new file mode 100644 index 000000000..d32c5e33c --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bfb4ffee7088da54d95a349215186ba6 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs new file mode 100644 index 000000000..6a19a7125 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class BtnSubMenuLeft : GButton + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs.meta new file mode 100644 index 000000000..d94544dbd --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnSubMenuLeft.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5ce6cf183d4b20f4997dd9ca99797135 \ No newline at end of file diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 4e87d8a9a..c53a6cb3f 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -30,13 +30,14 @@ namespace NBF { await LoginHelper.Login(InputAccount.text); - await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); + // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); // await MapHelper.EnterMap(mapId, role.RoomCode); // BagPanel.Show(); // BagSlotPanel.Show(); // FishingShopPanel.Show(); + SettingPanel.Show(); Del(); } diff --git a/Assets/Scripts/UI/Settings/IntroduceTag.Designer.cs b/Assets/Scripts/UI/Settings/IntroduceTag.Designer.cs index 93fa2cb42..3db1f1996 100644 --- a/Assets/Scripts/UI/Settings/IntroduceTag.Designer.cs +++ b/Assets/Scripts/UI/Settings/IntroduceTag.Designer.cs @@ -11,14 +11,12 @@ namespace NBF { public const string URL = "ui://hxr7rc7pe9z89"; - public GTextField TextName; public GTextField TextIntroduce; public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); - TextName = (GTextField)GetChild("TextName"); TextIntroduce = (GTextField)GetChild("TextIntroduce"); OnInited(); UILanguage.TrySetComponentLanguage(this); diff --git a/Assets/Scripts/UI/Settings/SettingItem.Designer.cs b/Assets/Scripts/UI/Settings/SettingItem.Designer.cs index f16bb95e7..ff92ae23f 100644 --- a/Assets/Scripts/UI/Settings/SettingItem.Designer.cs +++ b/Assets/Scripts/UI/Settings/SettingItem.Designer.cs @@ -16,10 +16,12 @@ namespace NBF public GTextField TextName; public GTextField TextInfo; public GSlider Slider; - public BtnInputControl BtnPrev; - public BtnInputControl BtnNext; public GTextField TextSliderValue; public SelectPages Pages; + public GButton BtnPrev; + public GButton BtnNext; + public BtnInputControl BtnControl; + public GComboBox ComboBox; public override void ConstructFromXML(XML xml) { @@ -30,10 +32,12 @@ namespace NBF TextName = (GTextField)GetChild("TextName"); TextInfo = (GTextField)GetChild("TextInfo"); Slider = (GSlider)GetChild("Slider"); - BtnPrev = (BtnInputControl)GetChild("BtnPrev"); - BtnNext = (BtnInputControl)GetChild("BtnNext"); TextSliderValue = (GTextField)GetChild("TextSliderValue"); Pages = (SelectPages)GetChild("Pages"); + BtnPrev = (GButton)GetChild("BtnPrev"); + BtnNext = (GButton)GetChild("BtnNext"); + BtnControl = (BtnInputControl)GetChild("BtnControl"); + ComboBox = (GComboBox)GetChild("ComboBox"); OnInited(); UILanguage.TrySetComponentLanguage(this); } diff --git a/Assets/Scripts/UI/Settings/SettingItem.cs b/Assets/Scripts/UI/Settings/SettingItem.cs index e43cb5d7f..e31d1dfd9 100644 --- a/Assets/Scripts/UI/Settings/SettingItem.cs +++ b/Assets/Scripts/UI/Settings/SettingItem.cs @@ -16,6 +16,7 @@ namespace NBF BtnPrev.onClick.Set(OnPrev); BtnNext.onClick.Set(OnNext); Slider.onChanged.Set(OnSliderChanged); + ComboBox.onChanged.Set(OnComboBoxChanged); } public void SetData(OptionBase option) @@ -24,18 +25,34 @@ namespace NBF if (option is IMultiOption multiOption) { - style.selectedIndex = 0; + if (multiOption.IsDropdown) + { + style.selectedIndex = 2; + if (multiOption.IsDropdown) + { + ComboBox.items = multiOption.GetOptionNames().ToArray(); + ComboBox.selectedIndex = multiOption.GetValue(); + } + } + else + { + style.selectedIndex = 1; + } } else if (option is RangeOption range) { - style.selectedIndex = 1; + style.selectedIndex = 3; //进度类型 Slider.min = range.MinValue; Slider.max = range.MaxValue; Slider.wholeNumbers = true; } else if (option is KeyBoardOption keyBoardOption) { - style.selectedIndex = 2; + style.selectedIndex = 4; //按键类型 + } + else + { + style.selectedIndex = 0; } TextName.SetLanguage(Option.Name); @@ -65,7 +82,8 @@ namespace NBF if (Option is ResolutionSetting resolutionSetting) { var res = Screen.resolutions; - Debug.LogError($"next index={index} count = {multiOption.GetOptionNames().Count} res={res.Length}"); + Debug.LogError( + $"next index={index} count = {multiOption.GetOptionNames().Count} res={res.Length}"); } multiOption.SetValue(index); @@ -137,6 +155,15 @@ namespace NBF } } + private void OnComboBoxChanged() + { + Debug.Log(ComboBox.selectedIndex); + if (Option is IMultiOption multiOption) + { + multiOption.SetValue(ComboBox.selectedIndex); + } + } + private void UpdateValueText() { Pages.visible = false; diff --git a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs index e411704d5..646299706 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs @@ -14,16 +14,14 @@ namespace NBF public override string UIPackName => "Main"; public override string UIResName => "SettingPanel"; - [AutoFind(Name = "Menu")] - public CommonMenu Menu; + [AutoFind(Name = "MenuList")] + public CommonSubMenu MenuList; [AutoFind(Name = "Introduce")] public IntroduceTag Introduce; [AutoFind(Name = "List")] public GList List; [AutoFind(Name = "BottomMenu")] public BottomMenu BottomMenu; - [AutoFind(Name = "BottomLine")] - public GImage BottomLine; [AutoFind(Name = "Mask")] public GLabel Mask; [AutoFind(Name = "InputWait")] diff --git a/Assets/Scripts/UI/Settings/SettingPanel.cs b/Assets/Scripts/UI/Settings/SettingPanel.cs index 2430cdab8..4950dfd02 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.cs @@ -23,27 +23,28 @@ namespace NBF base.OnInit(); IsShowCursor = true; IsDontBack = true; - + //TEXT_SETTINGS_ var groupNames = Settings.Instance.GetAllTabs(); foreach (var group in groupNames) { var tab = new TabItemData { - Key = $"TEXT_SETTINGS_{group}" + Key = $"TEXT_SETTINGS_{group}", + Name = group }; tabList.Add(tab); } - Menu.OnTabChange += ChangeTab; + MenuList.OnTabChange += ChangeTab; List.onClickItem.Set(OnClickListItem); } protected override void OnShow() { + InputManager.Instance.Off(this); Settings.Instance.LoadAllSettings(); - InputManager.OnUICanceled += OnUICanceled; - Menu.SetTabs(tabList); + MenuList.SetTabs(tabList); UseBottomMenu(); } @@ -52,7 +53,7 @@ namespace NBF if (index < 0) return; Log.Info($"Change tab index={index}"); var tabListData = tabList[index]; - _currentTab = tabListData.Key; + _currentTab = tabListData.Name; ResetSettingList(); } @@ -82,35 +83,29 @@ namespace NBF var url = UIPackage.GetItemURL(UIPackName, "SettingSubTitleItem"); + var groupIndex = 0; foreach (var key in groupOptions.Keys) { var value = groupOptions[key]; - if (List.AddItemFromPool(url) is GLabel label) + if (groupIndex > 0) { - label.SetLanguage(key); + if (List.AddItemFromPool(url) is GLabel label) + { + label.SetLanguage(key); + } } foreach (var option in value) { - if (option is InputOption) + if (List.AddItemFromPool() is SettingItem item) { - if (List.AddItemFromPool(SettingInputItem.URL) is SettingInputItem item) - { - item.SetData(option as InputOption); - var index = List.GetChildIndex(item); - _canSelectIndex.Add(index); - } - } - else - { - if (List.AddItemFromPool() is SettingItem item) - { - item.SetData(option); - var index = List.GetChildIndex(item); - _canSelectIndex.Add(index); - } + item.SetData(option); + var index = List.GetChildIndex(item); + _canSelectIndex.Add(index); } } + + groupIndex++; } } @@ -119,16 +114,6 @@ namespace NBF BottomMenu.Use(this); } - private void OnApplySettings() - { - var options = Settings.Instance.GetOptionsByTab(_currentTab); - Log.Info("OnApplySettings"); - foreach (var option in options) - { - option.Apply(); - } - Notices.Success("TEXT_OP_SUCCESS"); - } private void OnResetSettings() { @@ -138,51 +123,10 @@ namespace NBF { option.Reset(); } - - ResetSettingList(); - - Notices.Success("TEXT_OP_SUCCESS"); - } - private void OnUICanceled(string action) - { - if (action == InputDef.UI.SubPrev) - { - if (List.GetChildAt(List.selectedIndex) is SettingItem item) - { - item.OnPrev(); - } - } - else if (action == InputDef.UI.SubNext) - { - if (List.GetChildAt(List.selectedIndex) is SettingItem item) - { - item.OnNext(); - } - } - else if (action == InputDef.UI.Up) - { - ChangeListSelected(); - } - else if (action == InputDef.UI.Down) - { - ChangeListSelected(false); - } - else if (action == InputDef.UI.Back) - { - OnBack(); - } - else if (action == InputDef.UI.Enter) - { - OnApplySettings(); - } - else if (action == InputDef.UI.Reset) - { - MessageBox.Show("是否重置为默认？", (ret) => - { - if (ret) OnResetSettings(); - }); - } + ResetSettingList(); + + Notices.Success("TEXT_OP_SUCCESS"); } @@ -225,12 +169,62 @@ namespace NBF var settingItem = List.GetChildAt(index); if (settingItem is SettingItem item) { - Introduce.TextName.SetLanguage(item.Option.Name); + // Introduce.TextName.SetLanguage(item.Option.Name); Introduce.TextIntroduce.SetLanguage(item.Option.Name); // Introduce. } } + + private void CancelAndBack() + { + var groupNames = Settings.Instance.GetAllTabs(); + foreach (var group in groupNames) + { + var options = Settings.Instance.GetOptionsByTab(group); + foreach (var option in options) + { + if (option.HaveNotApple()) + { + option.Cancel(); + } + } + } + } + + #region Input Evnet + + [InputInvoke(InputDef.UI.SubPrev)] + private void OnSubPrev() + { + if (List.GetChildAt(List.selectedIndex) is SettingItem item) + { + item.OnPrev(); + } + } + + [InputInvoke(InputDef.UI.SubNext)] + private void OnSubNext() + { + if (List.GetChildAt(List.selectedIndex) is SettingItem item) + { + item.OnNext(); + } + } + + [InputInvoke(InputDef.UI.Up)] + private void OnUp() + { + ChangeListSelected(); + } + + [InputInvoke(InputDef.UI.Down)] + private void OnDown() + { + ChangeListSelected(false); + } + + [InputInvoke(InputDef.UI.Back)] private void OnBack() { if (Settings.Instance.HaveNotAppleSettings()) @@ -250,33 +244,40 @@ namespace NBF } } - private void CancelAndBack() + [InputInvoke(InputDef.UI.Enter)] + private void OnApplySettings() { - - var groupNames = Settings.Instance.GetAllTabs(); - foreach (var group in groupNames) + var options = Settings.Instance.GetOptionsByTab(_currentTab); + Log.Info("OnApplySettings"); + foreach (var option in options) { - var options = Settings.Instance.GetOptionsByTab(group); - foreach (var option in options) - { - if (option.HaveNotApple()) - { - option.Cancel(); - } - } + option.Apply(); } + + Notices.Success("TEXT_OP_SUCCESS"); } + [InputInvoke(InputDef.UI.Reset)] + private void OnReset() + { + MessageBox.Show("是否重置为默认？", (ret) => + { + if (ret) OnResetSettings(); + }); + } + + #endregion + protected override void OnHide() { base.OnHide(); - InputManager.OnUICanceled -= OnUICanceled; + InputManager.Instance.Off(this); } protected override void OnDestroy() { base.OnDestroy(); - Menu.OnTabChange -= ChangeTab; + MenuList.OnTabChange -= ChangeTab; } } } \ No newline at end of file diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index d7b5b1f35..491f27cdb 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 - m_MSAA: 8 + m_MSAA: 2 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 diff --git a/FGUIProject/assets/Common/Com/Back/Back1.xml b/FGUIProject/assets/Common/Com/Back/Back1.xml index 3a48d3fa8..9dda3edd9 100644 --- a/FGUIProject/assets/Common/Com/Back/Back1.xml +++ b/FGUIProject/assets/Common/Com/Back/Back1.xml @@ -1,9 +1,15 @@ - - + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml index 95d2c11fc..f05575e83 100644 --- a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml +++ b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml @@ -1,8 +1,8 @@ - + - + -