diff --git a/Assets/Doc/动画状态说明.md b/Assets/Doc/动画状态说明.md
index fdd29a8ab..a76bcd875 100644
--- a/Assets/Doc/动画状态说明.md
+++ b/Assets/Doc/动画状态说明.md
@@ -17,7 +17,7 @@
HandRodPowerup : 结束帧OnRodPowerUp
-HandRodThrown: 抛竿开始 OnRodThrowStart 抛竿结束 OnRodThrownEnd
+HandRodThrown : 抛竿开始 OnRodThrowStart 抛竿结束 OnRodThrownEnd
RodIdle : 357 60 0
diff --git a/Assets/Gaia User Data.meta b/Assets/Gaia User Data.meta
deleted file mode 100644
index 6878426a2..000000000
--- a/Assets/Gaia User Data.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 396b1a3ce02fe2e40be1476c656793a1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions.meta b/Assets/Gaia User Data/Sessions.meta
deleted file mode 100644
index d913253db..000000000
--- a/Assets/Gaia User Data/Sessions.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d3a120cd69656f468963a7b399a2f3b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset
deleted file mode 100644
index db9ca707e..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset
+++ /dev/null
@@ -1,35 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: e251860fcd970734c9f14ebd98a146c3, type: 3}
- m_Name: GS-20260228 - 171840
- m_EditorClassIdentifier: GaiaCore::Gaia.GaiaSession
- m_name: Session 20260228-171840
- m_description: 'Rocking out at Creativity Central!
-
-
- If you like Gaia please
- consider rating it :)'
- m_previewImage: {fileID: 0}
- m_dateCreated: 2026/2/28 17:18:40
- m_terrainWidth: 1024
- m_terrainDepth: 1024
- m_terrainHeight: 1024
- m_seaLevel: 25
- m_spawnDensity: 0.8
- m_isLocked: 0
- m_previewImageBytes:
- m_previewImageWidth: 0
- m_previewImageHeight: 0
- m_operations: []
- m_terrainMinMaxCache: []
- m_bakedMaskCacheEntries: []
- m_worldBiomeMaskSettings: {fileID: 0}
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset.meta b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset.meta
deleted file mode 100644
index a3bac4677..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a8eda7ecde0aa9d4994993b532ba21ae
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.meta b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.meta
deleted file mode 100644
index 1f5d90192..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 743e8db08f1a57f49b2057d04785e337
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset
deleted file mode 100644
index eae91f77f..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset
+++ /dev/null
@@ -1,63 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!850595691 &4890085278179872738
-LightingSettings:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Gaia Lighting Settings
- serializedVersion: 9
- m_EnableBakedLightmaps: 0
- m_EnableRealtimeLightmaps: 0
- m_RealtimeEnvironmentLighting: 1
- m_BounceScale: 1
- m_AlbedoBoost: 1
- m_IndirectOutputScale: 1
- m_UsingShadowmask: 1
- m_BakeBackend: 1
- m_LightmapMaxSize: 1024
- m_LightmapSizeFixed: 0
- m_UseMipmapLimits: 1
- m_BakeResolution: 40
- m_Padding: 2
- m_LightmapCompression: 3
- m_AO: 0
- m_AOMaxDistance: 1
- m_CompAOExponent: 1
- m_CompAOExponentDirect: 0
- m_ExtractAO: 0
- m_MixedBakeMode: 2
- m_LightmapsBakeMode: 1
- m_FilterMode: 1
- m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
- m_ExportTrainingData: 0
- m_EnableWorkerProcessBaking: 1
- m_TrainingDataDestination: TrainingData
- m_RealtimeResolution: 2
- m_ForceWhiteAlbedo: 0
- m_ForceUpdates: 0
- m_PVRCulling: 1
- m_PVRSampling: 1
- m_PVRDirectSampleCount: 32
- m_PVRSampleCount: 512
- m_PVREnvironmentSampleCount: 256
- m_PVREnvironmentReferencePointCount: 2048
- m_LightProbeSampleCountMultiplier: 4
- m_PVRBounces: 2
- m_PVRMinBounces: 2
- m_PVREnvironmentImportanceSampling: 1
- m_PVRFilteringMode: 1
- m_PVRDenoiserTypeDirect: 1
- m_PVRDenoiserTypeIndirect: 1
- m_PVRDenoiserTypeAO: 1
- m_PVRFilterTypeDirect: 0
- m_PVRFilterTypeIndirect: 0
- m_PVRFilterTypeAO: 0
- m_PVRFilteringGaussRadiusDirect: 1
- m_PVRFilteringGaussRadiusIndirect: 1
- m_PVRFilteringGaussRadiusAO: 1
- m_PVRFilteringAtrousPositionSigmaDirect: 0.5
- m_PVRFilteringAtrousPositionSigmaIndirect: 2
- m_PVRFilteringAtrousPositionSigmaAO: 1
- m_RespectSceneVisibilityWhenBakingGI: 0
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset.meta b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset.meta
deleted file mode 100644
index f0dbdc325..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Gaia Lighting Settings.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6f2a358d6ae67644f8c199d940dadd27
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4890085278179872738
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Terrain Scenes.meta b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Terrain Scenes.meta
deleted file mode 100644
index ef8a5aec8..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/Terrain Scenes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7f56f90b57af5a9448a3fb8ca3f1f2a6
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset
deleted file mode 100644
index c45120edd..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset
+++ /dev/null
@@ -1,38 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: da50733ca13d24f45a2980dcd5a56ed5, type: 3}
- m_Name: TerrainScenes
- m_EditorClassIdentifier: GaiaCore::Gaia.TerrainSceneStorage
- m_terrainLoadingEnabled: 1
- m_showTerrainLoadingDisabledWarning: 1
- m_useAddressables: 0
- m_preloadAddressablesWithImpostors: 1
- m_colliderOnlyLoading: 0
- m_terrainTilesX: 1
- m_terrainTilesZ: 1
- m_terrainTilesSize: 0
- m_useFloatingPointFix: 0
- m_hasWorldMap: 0
- m_worldMaprelativeSize: 0.5
- m_worldMapRelativeHeightmapPixels: 1
- m_worldMapPreviewHeightmapResolution: 2049
- m_worldMapPreviewRange: 1024
- m_worldMapPreviewTerrainHeight: 1024
- m_terrainScenes: []
- m_deactivateRuntimePlayer: 0
- m_deactivateRuntimeLighting: 0
- m_deactivateRuntimeAudio: 0
- m_deactivateRuntimeWeather: 0
- m_deactivateRuntimeWater: 0
- m_deactivateRuntimeScreenShotter: 0
- m_pos00X: -1.7976931348623157e+308
- m_pos00Z: -1.7976931348623157e+308
diff --git a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset.meta b/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset.meta
deleted file mode 100644
index 3ea694b6c..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260228 - 171840/TerrainScenes.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2e2428c1e05a106448aeb4c7e59def5d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset
deleted file mode 100644
index b210b1019..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset
+++ /dev/null
@@ -1,35 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: e251860fcd970734c9f14ebd98a146c3, type: 3}
- m_Name: GS-20260326 - 090912
- m_EditorClassIdentifier: GaiaCore::Gaia.GaiaSession
- m_name: Session 20260326-090909
- m_description: 'Rocking out at Creativity Central!
-
-
- If you like Gaia please
- consider rating it :)'
- m_previewImage: {fileID: 0}
- m_dateCreated: 2026/3/26 9:09:09
- m_terrainWidth: 1024
- m_terrainDepth: 1024
- m_terrainHeight: 1024
- m_seaLevel: 25
- m_spawnDensity: 0.8
- m_isLocked: 0
- m_previewImageBytes:
- m_previewImageWidth: 0
- m_previewImageHeight: 0
- m_operations: []
- m_terrainMinMaxCache: []
- m_bakedMaskCacheEntries: []
- m_worldBiomeMaskSettings: {fileID: 0}
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset.meta b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset.meta
deleted file mode 100644
index a693ada57..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: abd882155b5099848a01e4e11deec20a
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.meta b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.meta
deleted file mode 100644
index 604b5104c..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 79b9bfed09a469f45866715ca7258462
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/Terrain Scenes.meta b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/Terrain Scenes.meta
deleted file mode 100644
index f0b1c7db2..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/Terrain Scenes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7b9ddbf5e03f54d4cbaf93419d47f371
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset
deleted file mode 100644
index c45120edd..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset
+++ /dev/null
@@ -1,38 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: da50733ca13d24f45a2980dcd5a56ed5, type: 3}
- m_Name: TerrainScenes
- m_EditorClassIdentifier: GaiaCore::Gaia.TerrainSceneStorage
- m_terrainLoadingEnabled: 1
- m_showTerrainLoadingDisabledWarning: 1
- m_useAddressables: 0
- m_preloadAddressablesWithImpostors: 1
- m_colliderOnlyLoading: 0
- m_terrainTilesX: 1
- m_terrainTilesZ: 1
- m_terrainTilesSize: 0
- m_useFloatingPointFix: 0
- m_hasWorldMap: 0
- m_worldMaprelativeSize: 0.5
- m_worldMapRelativeHeightmapPixels: 1
- m_worldMapPreviewHeightmapResolution: 2049
- m_worldMapPreviewRange: 1024
- m_worldMapPreviewTerrainHeight: 1024
- m_terrainScenes: []
- m_deactivateRuntimePlayer: 0
- m_deactivateRuntimeLighting: 0
- m_deactivateRuntimeAudio: 0
- m_deactivateRuntimeWeather: 0
- m_deactivateRuntimeWater: 0
- m_deactivateRuntimeScreenShotter: 0
- m_pos00X: -1.7976931348623157e+308
- m_pos00Z: -1.7976931348623157e+308
diff --git a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset.meta b/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset.meta
deleted file mode 100644
index 764f067b8..000000000
--- a/Assets/Gaia User Data/Sessions/GS-20260326 - 090912/TerrainScenes.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 59abecf72584deb47bace0cae0ef956a
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings.meta b/Assets/Gaia User Data/Settings.meta
deleted file mode 100644
index a5cd1b1b7..000000000
--- a/Assets/Gaia User Data/Settings.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 667a46c4605fb194494b7516d92227f1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/AddressableConfig.asset b/Assets/Gaia User Data/Settings/AddressableConfig.asset
deleted file mode 100644
index d3756a10a..000000000
--- a/Assets/Gaia User Data/Settings/AddressableConfig.asset
+++ /dev/null
@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: e30d1b089a5885944a11d6bb9e99587a, type: 3}
- m_Name: AddressableConfig
- m_EditorClassIdentifier: GaiaCore::ProceduralWorlds.Addressables1.PWAddressablesConfig
- m_addressableIncludeImpostors: 1
- m_addressableIncludeServerScene: 1
- m_addressableMode: 0
- m_addressableServerURL: https://
- m_addressableBuildRemoteCatalog: 1
- m_currentAddressableBinFile: {fileID: 0}
- m_customAddressableFolderPath:
- m_terrainAssetGroupAssociations: []
- m_lastCatalogURL:
- m_lastMasterSceneAddress:
- m_currentCDNBucketIndex: 0
- m_rebuildConfig: 0
diff --git a/Assets/Gaia User Data/Settings/AddressableConfig.asset.meta b/Assets/Gaia User Data/Settings/AddressableConfig.asset.meta
deleted file mode 100644
index 9f4a5c505..000000000
--- a/Assets/Gaia User Data/Settings/AddressableConfig.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 00ff33d49d86a094f81654df0e13aa59
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/BuildConfig.asset b/Assets/Gaia User Data/Settings/BuildConfig.asset
deleted file mode 100644
index 88baa1f06..000000000
--- a/Assets/Gaia User Data/Settings/BuildConfig.asset
+++ /dev/null
@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: a15f4e570de326e478a0a9897f0f4343, type: 3}
- m_Name: BuildConfig
- m_EditorClassIdentifier: GaiaCore::Gaia.BuildConfig
- m_publicationType: 1
- m_sceneBuildEntries: []
- m_buildHistory: []
diff --git a/Assets/Gaia User Data/Settings/BuildConfig.asset.meta b/Assets/Gaia User Data/Settings/BuildConfig.asset.meta
deleted file mode 100644
index f4392af6b..000000000
--- a/Assets/Gaia User Data/Settings/BuildConfig.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 961edbb725d3a584190a1202a4941e82
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings.meta
deleted file mode 100644
index 9b6f34faf..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 93fcd6bf286568146b95137b497535f4
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset
deleted file mode 100644
index 7353a357a..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset
+++ /dev/null
@@ -1,28 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 58680399239671a4c9ac33d265ca999d, type: 3}
- m_Name: GRCControllerSupport
- m_EditorClassIdentifier: Assembly-CSharp::Gaia.GRCControllerSupport
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
- m_selectedControllerType: 0
- m_activateTouchUI: 0
- m_addLocationSystem: 0
- m_addAudioManager: 0
- m_customAdjustDrawDistance: 1
- m_customSetupPostProcessing: 1
- m_addVFXManager: 0
- m_drawDistance: 250000
- m_customCharacter: {fileID: 0}
- m_customCamera: {fileID: 0}
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset.meta
deleted file mode 100644
index 071cdfc3f..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRCControllerSupport.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 306f82840e8f07545a0622212b0bf7ee
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset
deleted file mode 100644
index ad0551ab7..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset
+++ /dev/null
@@ -1,21 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 7f9d5fab14f7242db80be581a62d53c9, type: 3}
- m_Name: GRC_Crest
- m_EditorClassIdentifier: WaveHarmonic.Crest.Integration.Gaia::WaveHarmonic.Crest.GRC_Crest
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 210
- _Wind: 1
- _Swell: 1
- _ShallowWater: 1
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset.meta
deleted file mode 100644
index b7748a829..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Crest.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0856239bc0122f1428f9dd9506f15464
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset
deleted file mode 100644
index b719aaf53..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset
+++ /dev/null
@@ -1,23 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 0d78c7647be1c844cb1c2d5868da786f, type: 3}
- m_Name: GRC_LightingPresets
- m_EditorClassIdentifier: Assembly-CSharp::Gaia.GRC_LightingPresets
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
- m_addPPLayertoCamera: 1
- m_addDynamicDepthOfField: 0
- m_camera: {fileID: 0}
- m_quickBakeLighting: 1
- m_HDRPHeightAdjustFog: 1
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset.meta
deleted file mode 100644
index d48a368f9..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_LightingPresets.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c7195abb124288541be690d3416a7d9a
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset
deleted file mode 100644
index 6fe6554a2..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: f3d40b695799e6a4a886843c7bb9e7bf, type: 3}
- m_Name: GRC_PWSky
- m_EditorClassIdentifier: Assembly-CSharp::Gaia.GRC_PWSky
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset.meta
deleted file mode 100644
index 488fb9b5c..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_PWSky.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0fe896124fe93db469cddae5970a04b0
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset
deleted file mode 100644
index dc751ee11..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 946c379be64082d45bc680313a941599, type: 3}
- m_Name: GRC_UnityURPWater
- m_EditorClassIdentifier: Assembly-CSharp::Gaia.GRC_UnityURPWater
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
- m_AddUnderWaterEffects: 1
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset.meta
deleted file mode 100644
index ea47ec93c..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_UnityURPWater.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 29621212e332a23458a6136521dbecc0
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset
deleted file mode 100644
index 6ade5aec3..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset
+++ /dev/null
@@ -1,22 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 06fd6dcc0d22d43459bf0e2464da2b75, type: 3}
- m_Name: GRC_Utilities
- m_EditorClassIdentifier: GaiaCore::Gaia.GRC_Utilities
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
- m_addWind: 1
- m_addScreenshotter: 1
- m_addLoadingScreen: 1
- m_windType: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset.meta
deleted file mode 100644
index 06a914849..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Utilities.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 76b4964e9c8275d48bf41b70faae2f18
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset
deleted file mode 100644
index 2a3ae7a0a..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset
+++ /dev/null
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: d5e52c022ce9fc44692474353c2ad61e, type: 3}
- m_Name: GRC_Water
- m_EditorClassIdentifier: Assembly-CSharp::Gaia.GRC_Water
- m_unfolded: 0
- m_isActive: 1
- m_helpEnabled: 0
- m_orderNumber: 2147483647
- m_VRShaderInitialized: 0
- m_useVRWaterShader: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset.meta b/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset.meta
deleted file mode 100644
index 84bd0075a..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Runtime Settings/GRC_Water.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 708abb2c1aea85e4e8c757d1dbeaa0b4
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings.meta
deleted file mode 100644
index 6cc8760a8..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 464bc2452b1230740954f7d1f2d89c13
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset
deleted file mode 100644
index 27ba9a820..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: b4412ac9167a3114b8a561b0b6ea44ea, type: 3}
- m_Name: GWS_ColorSpace
- m_EditorClassIdentifier: GaiaCore::Gaia.GWS_ColorSpace
- m_foldedOut: 0
- m_wasFixed: 0
- m_canAutoFix: 1
- m_ignored: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset.meta
deleted file mode 100644
index 6c7784877..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ColorSpace.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 92f03b0d81a8c6248881c6a9cc08024f
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset
deleted file mode 100644
index ef8fca4cb..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: b0576615e6efdea44b174ae9975de5b9, type: 3}
- m_Name: GWS_InputSystem
- m_EditorClassIdentifier: GaiaCore::Gaia.GWS_InputSystem
- m_foldedOut: 0
- m_wasFixed: 0
- m_canAutoFix: 0
- m_ignored: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset.meta
deleted file mode 100644
index 43f6c4d54..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_InputSystem.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7b591c4a01ad55c49a627883d02b826b
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset
deleted file mode 100644
index e046341c7..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 27657a00eff9fd9489550840a7516763, type: 3}
- m_Name: GWS_ShaderVariantLimit
- m_EditorClassIdentifier: GaiaCore::Gaia.GWS_ShaderVariantLimit
- m_foldedOut: 0
- m_wasFixed: 0
- m_canAutoFix: 0
- m_ignored: 0
- m_originalVariantSetting: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset.meta
deleted file mode 100644
index f55133d88..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_ShaderVariantLimit.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2fb82e01ff50cb646b6c9ae2d1d39263
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset
deleted file mode 100644
index 5701f5592..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset
+++ /dev/null
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 2e32bb18dde833840b6f6bdcc3db7e92, type: 3}
- m_Name: GWS_URPShadowDistance
- m_EditorClassIdentifier: GaiaCore::Gaia.GWS_URPShadowDistance
- m_foldedOut: 0
- m_wasFixed: 0
- m_canAutoFix: 1
- m_ignored: 0
- m_originalShadowDistanceValue: 500
- m_originalShadowResolutionValue: 4096
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset.meta
deleted file mode 100644
index d9622d68b..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_URPShadowDistance.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ec075abd4fa0ed4db0780ed7723edf7
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset
deleted file mode 100644
index db6242c2d..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset
+++ /dev/null
@@ -1,18 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 60eea5d2e449589428e45cbcc7dc6adc, type: 3}
- m_Name: GWS_VerifySavingAssets
- m_EditorClassIdentifier: GaiaCore::Gaia.GWS_VerifySavingAssets
- m_foldedOut: 0
- m_wasFixed: 0
- m_canAutoFix: 1
- m_ignored: 0
diff --git a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset.meta b/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset.meta
deleted file mode 100644
index bad821b56..000000000
--- a/Assets/Gaia User Data/Settings/Gaia Wizard Settings/GWS_VerifySavingAssets.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b02353c8234c9c1409d0eac84f5574b7
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/Package Config Settings.asset b/Assets/Gaia User Data/Settings/Package Config Settings.asset
deleted file mode 100644
index 2d0f5d926..000000000
--- a/Assets/Gaia User Data/Settings/Package Config Settings.asset
+++ /dev/null
@@ -1,87 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 3ec960e7dee79fb4495593dba6bc4cba, type: 3}
- m_Name: Package Config Settings
- m_EditorClassIdentifier: Assembly-CSharp::ProceduralWorlds.Setup.PWPackageConfigSettings
- m_pWPackageConfigs:
- - m_packageID: Gaia
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772243972692
- - m_packageID: AssetSamples
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244058503
- - m_packageID: AssetSamplesSyntyStudios
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244075222
- - m_packageID: GaiaProAssetsandBiomes
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244492117
- - m_packageID: Stamps
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244518063
- - m_packageID: RuntimeControllerSupport
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244547407
- - m_packageID: GaiaWater
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244590636
- - m_packageID: ProceduralWorldsSky
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244644088
- - m_packageID: SkyLightingPresets
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244774326
- - m_packageID: UnityHDRPWater
- m_lastAction: 3
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 0
- - m_packageID: UnityURPWater
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772244826044
- - m_packageID: GTS
- m_lastAction: 4
- m_majorVersion: 4
- m_minorVersion: 2
- m_patchVersion: 2
- m_installTimeStamp: 1772245052125
diff --git a/Assets/Gaia User Data/Settings/Package Config Settings.asset.meta b/Assets/Gaia User Data/Settings/Package Config Settings.asset.meta
deleted file mode 100644
index 8ca4ca532..000000000
--- a/Assets/Gaia User Data/Settings/Package Config Settings.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 97a832f39a53b9d44b54aee0ebd56372
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Settings/UserFiles.asset b/Assets/Gaia User Data/Settings/UserFiles.asset
deleted file mode 100644
index 212996303..000000000
--- a/Assets/Gaia User Data/Settings/UserFiles.asset
+++ /dev/null
@@ -1,88 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: f8de3696d9750f843be255e541faa3f9, type: 3}
- m_Name: UserFiles
- m_EditorClassIdentifier: GaiaCore::Gaia.UserFiles
- m_autoAddNewFiles: 1
- m_updateFilesWithGaiaUpdate: 1
- m_sortBiomesBy: 0
- m_gaiaManagerBiomePresets:
- - {fileID: 11400000, guid: 3a7ef5ae4c2683b41a447fc543158d2b, type: 2}
- - {fileID: 11400000, guid: 72e4a992aaee441498506805656475e0, type: 2}
- - {fileID: 11400000, guid: cd39f81994d657543aef1a90456ab2f8, type: 2}
- - {fileID: 11400000, guid: 478b1d8831da6e04a816650905261559, type: 2}
- - {fileID: 11400000, guid: a23c1a713f25398419877498413d891f, type: 2}
- - {fileID: 11400000, guid: 94567904bf7d1a946a22315e5185e453, type: 2}
- m_gaiaManagerSpawnerSettings:
- - {fileID: 11400000, guid: c3867a1dc5d61694b9ade5a115ae2658, type: 2}
- - {fileID: 11400000, guid: 876bca8d42cf0ac4aa2b646da5357afd, type: 2}
- - {fileID: 11400000, guid: 217233c9205c20e489541b22ca7b7868, type: 2}
- - {fileID: 11400000, guid: 1c13e8da020868e45a1e6704e198303b, type: 2}
- - {fileID: 11400000, guid: 76f07dd99e8eed643bc6dc110ac3b34f, type: 2}
- - {fileID: 11400000, guid: 19e5d8869512147439106806e7c45156, type: 2}
- - {fileID: 11400000, guid: 4dda95930422a9f469c0c99505aff15e, type: 2}
- - {fileID: 11400000, guid: 29314e3030f02404ea363aa54072ed20, type: 2}
- - {fileID: 11400000, guid: 42783e224555be04a8da9de392846bec, type: 2}
- - {fileID: 11400000, guid: 24fce1bf04835304c8d56131037b6d87, type: 2}
- - {fileID: 11400000, guid: 5a895c103d05c744891ffe6eba7d276d, type: 2}
- - {fileID: 11400000, guid: 9fbafd03df244514284cb5590d82c699, type: 2}
- - {fileID: 11400000, guid: 0e1586b8863570048942e9493106d5e8, type: 2}
- - {fileID: 11400000, guid: 94bc9871295e8c9479ed334f9c8c01c2, type: 2}
- - {fileID: 11400000, guid: 406154f0c85b1544cb4a4c38afe9f190, type: 2}
- - {fileID: 11400000, guid: 5d67dcaf933cf3d4e8edae39bb3951b1, type: 2}
- - {fileID: 11400000, guid: 41ed9b207ce1ff347b84fecff54f857e, type: 2}
- - {fileID: 11400000, guid: 534fd92567de8714c91a6ff6438f6e78, type: 2}
- - {fileID: 11400000, guid: f1ea5361521a58e4bbfb6d7264e82b1f, type: 2}
- - {fileID: 11400000, guid: c451d9a08124d3f4f99001825979727f, type: 2}
- - {fileID: 11400000, guid: a4643a9406d287e45a9505f813997086, type: 2}
- - {fileID: 11400000, guid: b0c2bc14ce5ea6d4aab2bc8d3b1b874e, type: 2}
- - {fileID: 11400000, guid: b6cfb189c3611fb40b0a167081f1ab97, type: 2}
- - {fileID: 11400000, guid: b70ff2238fa761d45972eec9c6f1d5aa, type: 2}
- - {fileID: 11400000, guid: f402506cf81eade4db78bf3a9424c0c9, type: 2}
- - {fileID: 11400000, guid: f85557db875af4849b292543407ea898, type: 2}
- - {fileID: 11400000, guid: 7722acf9c4dbfb14cabee545865ad0ab, type: 2}
- - {fileID: 11400000, guid: 37acf57db6e69424fb7cb8b5727c8858, type: 2}
- - {fileID: 11400000, guid: 00c3de748a615d44cbf5b1dbb805f31a, type: 2}
- - {fileID: 11400000, guid: 7bd1fa2d61711a740a0cf61873b7f0f6, type: 2}
- - {fileID: 11400000, guid: 77ba2ce7e0fb98840ac592e5c3e1799e, type: 2}
- - {fileID: 11400000, guid: 6c6b708afc4a0eb4a9b8f589f687dda5, type: 2}
- - {fileID: 11400000, guid: be45de93ac1acaa4bbba541897d92a84, type: 2}
- - {fileID: 11400000, guid: e574ae7c26e4cf94fa4fb71b50a53719, type: 2}
- - {fileID: 11400000, guid: 92014ebc238c9b042b8ebd03ede0ae6c, type: 2}
- - {fileID: 11400000, guid: c0afb538dc1aaed4aa4f1c5f21a5b381, type: 2}
- - {fileID: 11400000, guid: 842981c28b406bf4facaca0bfe512783, type: 2}
- - {fileID: 11400000, guid: ff63b1be1527e604798843e16cab5efd, type: 2}
- - {fileID: 11400000, guid: 78c570415aea89244a783b7bf69dc1d2, type: 2}
- - {fileID: 11400000, guid: fbdd6a1cd31d09241912cfbb842eb1fb, type: 2}
- - {fileID: 11400000, guid: 8366d1e16a7dc6e4da32fed5c55a62b0, type: 2}
- - {fileID: 11400000, guid: f522027794b0b314fa0b5592833ca1c8, type: 2}
- - {fileID: 11400000, guid: 0d63c1cf06ac42c4283d127ba47fe13c, type: 2}
- - {fileID: 11400000, guid: 5af6d625620ab2e4d8bfb0c3e7b1b1f3, type: 2}
- - {fileID: 11400000, guid: 8f83fc3f3be4f0749b1018374b595e5e, type: 2}
- - {fileID: 11400000, guid: 0a3d043b8ec7486439b5f0fa5a23b908, type: 2}
- - {fileID: 11400000, guid: 0fd77066cfeed6646b683bcb213f6410, type: 2}
- - {fileID: 11400000, guid: 3cb5ba57ef5e1f4448794c75d4f8f503, type: 2}
- - {fileID: 11400000, guid: 244cb773a7af32046ba2090c798f9dea, type: 2}
- - {fileID: 11400000, guid: 489f60e09c654364e9f81abf31a0e717, type: 2}
- - {fileID: 11400000, guid: b8eb2d63fe6dbfa45ad853c42a3828a3, type: 2}
- - {fileID: 11400000, guid: 05875a09422a6bc4ab7a7bcc5a47ba76, type: 2}
- - {fileID: 11400000, guid: 3feb8fecc85ecdb4baec2a56722b0121, type: 2}
- - {fileID: 11400000, guid: 9863d688ef052de49995c7095117b43e, type: 2}
- - {fileID: 11400000, guid: 436a6667ec945a14d9092d3eb4b67d48, type: 2}
- m_exportTerrainSettings:
- - {fileID: 11400000, guid: e2f4c9ca1bbf7e14f8cf0968afef1545, type: 2}
- - {fileID: 11400000, guid: 4df53086319f20747ae21f39ef7a76aa, type: 2}
- - {fileID: 11400000, guid: 65c0c2833db87df438d47045dd231313, type: 2}
- - {fileID: 11400000, guid: cc06154844ca0b046ae05c9f8deafc43, type: 2}
- - {fileID: 11400000, guid: 30a3d936c0eeeb340801be8605086462, type: 2}
- - {fileID: 11400000, guid: 67d221bf2a66c634b844b4ffaecbe82b, type: 2}
- m_scanForBiomesAfterAssetImport: 1
diff --git a/Assets/Gaia User Data/Settings/UserFiles.asset.meta b/Assets/Gaia User Data/Settings/UserFiles.asset.meta
deleted file mode 100644
index 98f540701..000000000
--- a/Assets/Gaia User Data/Settings/UserFiles.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a2297e46c3b33f41939c0e310d1ebe3
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 11400000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Gaia User Data/Stamps.meta b/Assets/Gaia User Data/Stamps.meta
deleted file mode 100644
index 4149897d8..000000000
--- a/Assets/Gaia User Data/Stamps.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ed3d8d94bfd55054cbdd0c355641f6ee
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/ResRaw/gfx/rods/syberia/tele_10037/tele_10037_t13.prefab b/Assets/ResRaw/gfx/rods/syberia/tele_10037/tele_10037_t13.prefab
index 6e7737a11..fa6351c89 100644
--- a/Assets/ResRaw/gfx/rods/syberia/tele_10037/tele_10037_t13.prefab
+++ b/Assets/ResRaw/gfx/rods/syberia/tele_10037/tele_10037_t13.prefab
@@ -270,320 +270,311 @@ MonoBehaviour:
XY: 0
bones:
- transform: {fileID: 4264503404293114}
- weight: 1
+ weight: 0.097500004
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.16024023}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.14810172
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.14810172}
- transform: {fileID: 4282569654401586}
- weight: 1
+ weight: 0.10969043
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.14810167}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.14073145
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.14073145}
- transform: {fileID: 4709274007870657}
- weight: 1
+ weight: 0.14009723
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.14073147}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.13549328
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.13549328}
- transform: {fileID: 4743360754547155}
- weight: 1
+ weight: 0.1794734
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.13549331}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.1314601
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.1314601}
- transform: {fileID: 4735532663558251}
- weight: 1
+ weight: 0.21857226
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.13146012}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.12819827
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.12819827}
- transform: {fileID: 4193127433785967}
- weight: 1
+ weight: 0.2481468
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.1281982}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.1254704
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.1254704}
- transform: {fileID: 4529069058389956}
- weight: 1
+ weight: 0.25906968
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.1254704}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.1231333
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.1231333}
- transform: {fileID: 4265251612189660}
- weight: 1
+ weight: 0.27874288
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.12313326}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.12109351
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.12109351}
- transform: {fileID: 4845133484702059}
- weight: 1
+ weight: 0.32597947
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.12109355}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.11928749
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.11928749}
- transform: {fileID: 4890716955578569}
- weight: 1
+ weight: 0.39005414
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.119287476}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.117669344
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.117669344}
- transform: {fileID: 4409517404046090}
- weight: 1
+ weight: 0.46024224
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.11766949}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.11620617
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.11620617}
- transform: {fileID: 4519195959540081}
- weight: 1
+ weight: 0.5258184
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.11620597}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.11487126
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.11487126}
- transform: {fileID: 4259534956000996}
- weight: 1
+ weight: 0.576058
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.11487142}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.11364603
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.11364603}
- transform: {fileID: 4741822799264773}
- weight: 1
+ weight: 0.60023564
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.11364611}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.112514496
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.112514496}
- transform: {fileID: 4759345475687776}
- weight: 1
+ weight: 0.6062823
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.112514414}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.111463785
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.111463785}
- transform: {fileID: 4499484673073481}
- weight: 1
+ weight: 0.62583846
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.11146379}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.110484004
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.110484004}
- transform: {fileID: 4134434969130588}
- weight: 1
+ weight: 0.6564974
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.110484004}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10956645
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10956645}
- transform: {fileID: 4091795145151736}
- weight: 1
+ weight: 0.69473433
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10956663}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10870457
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10870457}
- transform: {fileID: 4233698570999090}
- weight: 1
+ weight: 0.73702466
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10870461}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.107892275
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.107892275}
- transform: {fileID: 4872565204207028}
- weight: 1
+ weight: 0.77984375
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.107892014}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10712361
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10712361}
- transform: {fileID: 4840622961930457}
- weight: 1
+ weight: 0.81966686
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10712379}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10639572
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10639572}
- transform: {fileID: 4622803555992466}
- weight: 1
+ weight: 0.8529693
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10639562}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10570359
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10570359}
- transform: {fileID: 4954845671354750}
- weight: 1
+ weight: 0.87622637
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10570375}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10504484
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10504484}
- transform: {fileID: 4089614810615072}
- weight: 1
+ weight: 0.8859134
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10504496}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10441637
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10441637}
- transform: {fileID: 4846039005711571}
- weight: 1
+ weight: 0.8886552
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.1044164}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.103815556
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.103815556}
- transform: {fileID: 4464869248824151}
- weight: 1
+ weight: 0.8969852
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10381557}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10324049
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10324049}
- transform: {fileID: 4286961659913369}
- weight: 1
+ weight: 0.9096153
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10324028}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10268831
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10268831}
- transform: {fileID: 4795035284681624}
- weight: 1
+ weight: 0.9251357
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10268856}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.102158785
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.102158785}
- transform: {fileID: 4267898020867736}
- weight: 1
+ weight: 0.94213635
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.102158666}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.101649046
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.101649046}
- transform: {fileID: 4685211301170154}
- weight: 1
+ weight: 0.9592076
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.101649046}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10115838
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10115838}
- transform: {fileID: 4792065388799116}
- weight: 1
+ weight: 0.97493947
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10115829}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10068512
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10068512}
- transform: {fileID: 4759266348702651}
- weight: 1
+ weight: 0.9879221
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10068515}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.10022855
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.10022855}
- transform: {fileID: 4237574787103189}
- weight: 1
+ weight: 0.9967455
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
+ defaultLocalPosition: {x: -0, y: 0, z: 0.10022845}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ length: 0.099787235
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 0.099787235}
- transform: {fileID: 4374690866328985}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
+ defaultLocalPosition: {x: -0, y: 0, z: 0.09978717}
+ defaultLocalRotation: {x: 0, y: -0, z: -0, w: 1}
length: 0
sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
- - transform: {fileID: 4428084982420773}
- weight: 1
- solverPosition: {x: 0, y: 0, z: 0}
- solverRotation: {x: 0, y: 0, z: 0, w: 1}
- defaultLocalPosition: {x: 0, y: 0, z: 0}
- defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
- length: 0
- sqrMag: 0
- axis: {x: -1, y: -0, z: -0}
+ axis: {x: 0, y: 0, z: 3.7400835}
--- !u!1 &1064201959539019
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs b/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs
new file mode 100644
index 000000000..23d591a0e
--- /dev/null
+++ b/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs
@@ -0,0 +1,194 @@
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEngine;
+using RootMotion.FinalIK;
+
+public static class CCDIKRodWeightEditor
+{
+ // 默认鱼竿权重曲线:
+ // 根部硬,末端软
+ private static readonly AnimationCurve DefaultRodCurve = new AnimationCurve(
+ new Keyframe(0.00f, 1.00f),
+ new Keyframe(0.30f, 0.88f),
+ new Keyframe(0.60f, 0.58f),
+ new Keyframe(0.82f, 0.22f),
+ new Keyframe(1.00f, 0.05f)
+ );
+
+ ///
+ /// 对当前选中物体上的 CCDIK 应用默认鱼竿权重
+ ///
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights (Selected)")]
+ public static void ApplyRodWeightsToSelected()
+ {
+ var go = Selection.activeGameObject;
+ if (go == null)
+ {
+ Debug.LogWarning("没有选中任何 GameObject。");
+ return;
+ }
+
+ var ccdik = go.GetComponent();
+ if (ccdik == null)
+ {
+ Debug.LogWarning($"选中的物体 [{go.name}] 上没有 CCDIK 组件。");
+ return;
+ }
+
+ ApplyWeights(ccdik, DefaultRodCurve, 0.05f, 1.0f, true);
+ }
+
+ ///
+ /// 稍微软一点的版本
+ ///
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights Soft (Selected)")]
+ public static void ApplyRodWeightsSoftToSelected()
+ {
+ var go = Selection.activeGameObject;
+ if (go == null)
+ {
+ Debug.LogWarning("没有选中任何 GameObject。");
+ return;
+ }
+
+ var ccdik = go.GetComponent();
+ if (ccdik == null)
+ {
+ Debug.LogWarning($"选中的物体 [{go.name}] 上没有 CCDIK 组件。");
+ return;
+ }
+
+ var softCurve = new AnimationCurve(
+ new Keyframe(0.00f, 1.00f),
+ new Keyframe(0.25f, 0.92f),
+ new Keyframe(0.50f, 0.72f),
+ new Keyframe(0.75f, 0.35f),
+ new Keyframe(1.00f, 0.10f)
+ );
+
+ ApplyWeights(ccdik, softCurve, 0.10f, 1.0f, true);
+ }
+
+ ///
+ /// 更硬的版本
+ ///
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights Stiff (Selected)")]
+ public static void ApplyRodWeightsStiffToSelected()
+ {
+ var go = Selection.activeGameObject;
+ if (go == null)
+ {
+ Debug.LogWarning("没有选中任何 GameObject。");
+ return;
+ }
+
+ var ccdik = go.GetComponent();
+ if (ccdik == null)
+ {
+ Debug.LogWarning($"选中的物体 [{go.name}] 上没有 CCDIK 组件。");
+ return;
+ }
+
+ var stiffCurve = new AnimationCurve(
+ new Keyframe(0.00f, 1.00f),
+ new Keyframe(0.35f, 0.94f),
+ new Keyframe(0.65f, 0.65f),
+ new Keyframe(0.88f, 0.18f),
+ new Keyframe(1.00f, 0.03f)
+ );
+
+ ApplyWeights(ccdik, stiffCurve, 0.03f, 1.0f, true);
+ }
+
+ ///
+ /// 核心逻辑:
+ /// 第0个bone = 杆尾(高权重)
+ /// 最后一个bone = 竿稍(低权重)
+ ///
+ public static void ApplyWeights(CCDIK ccdik, AnimationCurve curve, float minWeight, float maxWeight, bool logResult)
+ {
+ if (ccdik == null)
+ {
+ Debug.LogWarning("CCDIK 为空。");
+ return;
+ }
+
+ var solver = ccdik.solver;
+ if (solver == null)
+ {
+ Debug.LogWarning("CCDIK.solver 为空。");
+ return;
+ }
+
+ if (solver.bones == null || solver.bones.Length == 0)
+ {
+ Debug.LogWarning($"[{ccdik.name}] 的 solver.bones 为空,请先正确配置 CCDIK Chain。");
+ return;
+ }
+
+ Undo.RecordObject(ccdik, "Apply CCDIK Rod Weights");
+
+ int count = solver.bones.Length;
+
+ if (count == 1)
+ {
+ solver.bones[0].weight = maxWeight;
+ EditorUtility.SetDirty(ccdik);
+ Debug.Log($"[{ccdik.name}] 只有 1 根 bone,已设置 weight = {maxWeight:F3}");
+ return;
+ }
+
+ for (int i = 0; i < count; i++)
+ {
+ // 0 = 杆尾,1 = 竿稍
+ float t = 1f - (i / (float)(count - 1));
+
+ // 曲线前高后低
+ float curveValue = curve.Evaluate(t);
+
+ // 限制范围
+ float weight = Mathf.Lerp(minWeight, maxWeight, curveValue);
+ weight = Mathf.Clamp(weight, minWeight, maxWeight);
+
+ solver.bones[i].weight = weight;
+ }
+
+ EditorUtility.SetDirty(ccdik);
+
+ if (logResult)
+ {
+ Debug.Log(BuildWeightLog(ccdik));
+ }
+ }
+
+ private static string BuildWeightLog(CCDIK ccdik)
+ {
+ if (ccdik == null || ccdik.solver == null || ccdik.solver.bones == null)
+ return "CCDIK 或 bones 无效。";
+
+ var bones = ccdik.solver.bones;
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ sb.AppendLine($"[{ccdik.name}] CCDIK Rod Weights Applied");
+ sb.AppendLine($"Bone Count = {bones.Length}");
+ sb.AppendLine("Index 0 = 杆尾,Last = 竿稍");
+ sb.AppendLine("--------------------------------");
+
+ for (int i = 0; i < bones.Length; i++)
+ {
+ string boneName = bones[i].transform != null ? bones[i].transform.name : "NULL";
+ sb.AppendLine($"[{i}] {boneName} weight = {bones[i].weight:F3}");
+ }
+
+ return sb.ToString();
+ }
+
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights (Selected)", true)]
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights Soft (Selected)", true)]
+ [MenuItem("Tools/FinalIK/CCDIK/Apply Rod Weights Stiff (Selected)", true)]
+ private static bool ValidateApplyRodWeights()
+ {
+ return Selection.activeGameObject != null &&
+ Selection.activeGameObject.GetComponent() != null;
+ }
+}
+#endif
\ No newline at end of file
diff --git a/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs.meta b/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs.meta
new file mode 100644
index 000000000..d0bc55678
--- /dev/null
+++ b/Assets/Scripts/Editor/Fix/CCDIKRodWeightEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4b74c53bf2b849e3a899b34a5dbc348b
+timeCreated: 1775056514
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing/BobberController.cs b/Assets/Scripts/Fishing/BobberController.cs
index d5b7c6e4b..f86729054 100644
--- a/Assets/Scripts/Fishing/BobberController.cs
+++ b/Assets/Scripts/Fishing/BobberController.cs
@@ -10,6 +10,8 @@ namespace NBF
// [SerializeField] private Buoyancy _buoyancy;
public Rigidbody rbody => _rbody;
+ public Rigidbody JointRb => joint.connectedBody;
+
public void SetJoint(Rigidbody rb)
{
joint = joint == null ? GetComponent() : joint;
diff --git a/Assets/Scripts/Fishing/New/Data/Item/PlayerItem.cs b/Assets/Scripts/Fishing/New/Data/Item/PlayerItem.cs
index b7cfc3c3d..4d2238e6a 100644
--- a/Assets/Scripts/Fishing/New/Data/Item/PlayerItem.cs
+++ b/Assets/Scripts/Fishing/New/Data/Item/PlayerItem.cs
@@ -88,10 +88,10 @@ namespace NBF
_tension = value;
}
- Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent
- {
- Item = this
- });
+ // Scene.EventComponent.Publish(new PlayerItemRodLingChangeEvent
+ // {
+ // Item = this
+ // });
}
}
diff --git a/Assets/Scripts/Fishing/New/View/Player/Tackle/FLine.cs b/Assets/Scripts/Fishing/New/View/Player/Tackle/FLine.cs
index 91ebde4e3..e08c83bd1 100644
--- a/Assets/Scripts/Fishing/New/View/Player/Tackle/FLine.cs
+++ b/Assets/Scripts/Fishing/New/View/Player/Tackle/FLine.cs
@@ -22,15 +22,24 @@ namespace NBF
[SerializeField] private bool isLureConnect;
[SerializeField] private RodLine rodLine;
+
+ ///
+ /// 主线
+ ///
[SerializeField] private Rope fishingRope;
+
+ ///
+ /// 浮漂和鱼钩线
+ ///
[SerializeField] private Rope bobberRope;
+
public LureController Lure;
public BobberController Bobber;
-
+
public JointPinchController PinchController;
- // public event Action OnLinePulled;
+ public float LinelenghtDiferent;
protected override void OnInit()
{
@@ -112,8 +121,6 @@ namespace NBF
Lure.RBody.useGravity = true;
}
-
-
public void SetTargetLength(float value)
{
Log.Error($"SetObiRopeStretch={value}");
@@ -121,13 +128,44 @@ namespace NBF
{
// value -= 0.2f;
}
+
fishingRope.SetTargetLength(value);
}
-
+
public void SetLureLength(float value)
{
Log.Error($"SetObiRopeStretch={value}");
bobberRope.SetTargetLength(value);
}
+
+
+ private void Update()
+ {
+ LinelenghtDiferent = GetLineDistance();
+
+ //非钓鱼状态
+ Rod.PlayerItem.Tension = Mathf.Clamp(LinelenghtDiferent, 0f, 0.05f);
+ }
+
+ #region Tension
+
+ private float GetLineDistance()
+ {
+ if (!Bobber.JointRb)
+ {
+ return 0;
+ }
+
+ //第一个节点到竿稍的位置-第一段鱼线长度
+ return Vector3.Distance(Bobber.transform.position, Bobber.JointRb.transform.position) -
+ fishingRope.GetCurrentLength();
+ }
+
+ public float GetTension(float weight)
+ {
+ return weight * GetLineDistance();
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs b/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
index cb317ba46..26c9c54ef 100644
--- a/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
+++ b/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using Fantasy;
using Fantasy.Async;
using NBC.Asset;
@@ -40,8 +41,14 @@ namespace NBF
Asset = GetComponent();
}
+ private void Start()
+ {
+ Asset.CCDIK.enabled = true;
+ }
+
private void Update()
{
+ BendControl();
// if (Input.GetKeyDown(KeyCode.Alpha0))
// {
// SetLineLength(lineLength);
@@ -68,7 +75,8 @@ namespace NBF
Line.Lure.SetJointDistance(PlayerItem.LineLength);
if (PlayerItem.StretchRope)
{
- Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength);
+ // Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength);
+ Line.SetTargetLength(PlayerItem.LineLength);
}
}
else
@@ -78,7 +86,8 @@ namespace NBF
Line.Bobber.SetJointDistance(PlayerItem.LineLength - PlayerItem.FloatLength);
if (PlayerItem.StretchRope)
{
- Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength - PlayerItem.FloatLength);
+ // Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength - PlayerItem.FloatLength);
+ Line.SetTargetLength(PlayerItem.LineLength - PlayerItem.FloatLength);
Line.SetLureLength(PlayerItem.FloatLength);
}
}
@@ -115,8 +124,6 @@ namespace NBF
var obj = new GameObject($"rod_{ConfigId}");
obj.transform.SetParent(SceneSettings.Instance.GearNode);
- // obj.transform.SetParent(player.transform);
- // obj.transform.localPosition = Vector3.zero;
obj.transform.position = playerViewUnity.transform.position;
obj.transform.rotation = playerViewUnity.transform.rotation;
obj.transform.localScale = Vector3.one;
@@ -124,8 +131,6 @@ namespace NBF
var parent = GearRoot;
- // List children = RoleModel.Instance.GetBindItems(itemInfo.Id);
-
CreateFishingHandler();
await FTask.WaitFrame(playerView.Scene); //等待1帧
// children.Sort();
@@ -301,6 +306,46 @@ namespace NBF
rings = list.ToArray();
}
+
+ #region 鱼竿弯曲
+
+ private List previousWeights = Enumerable.Repeat(0f, 10).ToList();
+ private float bendSmooth = 1f;
+
+ private void BendControl()
+ {
+ // Vector3 vector = (FishEntity.CurrentFishInFight
+ // ? FishEntity.CurrentFishInFight.transform.position
+ // : fishingLine.currentLineHandler.LineConnector_1.transform.position);
+
+ var ccdik = Asset.CCDIK;
+
+ Vector3 vector = Line.Bobber.transform.position;
+ // float num = Vector3.Distance(ccdik.solver.bones.Last().transform.position, vector);
+ float num2 = 0.05f;
+
+ float num6 = 0.3f;
+ // if (isThrowing)
+ // {
+ // num6 = 0.1f;
+ // }
+ // else if (!FishEntity.CurrentFishInFight)
+ // {
+ // num6 = 0.2f;
+ // }
+
+ float target = num2 * num6;
+ float item = Mathf.MoveTowards(ccdik.solver.IKPositionWeight, target, Time.deltaTime * bendSmooth);
+ previousWeights.RemoveAt(0);
+ previousWeights.Add(item);
+ float num7 = previousWeights.Average();
+
+ ccdik.solver.SetIKPosition(vector);
+ ccdik.solver.SetIKPositionWeight(num7);
+ }
+
+ #endregion
+
private void Test()
{
// var root = Player.ModelAsset.RodRoot;
diff --git a/Assets/Scripts/Fishing/Rope/Rope.cs b/Assets/Scripts/Fishing/Rope/Rope.cs
index 0b26d36e6..03a9cf3a8 100644
--- a/Assets/Scripts/Fishing/Rope/Rope.cs
+++ b/Assets/Scripts/Fishing/Rope/Rope.cs
@@ -561,7 +561,7 @@ public class Rope : MonoBehaviour
LockAnchorsHard();
}
- private void LateUpdate()
+ private void Update()
{
if (!startAnchor || !endAnchor || _pCurr == null || _physicsNodes < 2) return;
diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user
index 52cdfa741..02353077e 100644
--- a/Fishing2.sln.DotSettings.user
+++ b/Fishing2.sln.DotSettings.user
@@ -1,5 +1,6 @@
False
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 17049aaa0..76ffae433 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,34 +9,34 @@ EditorUserSettings:
value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
flags: 0
RecentlyUsedSceneGuid-0:
- value: 5a035755520650595b5b5f2345740e4447154a73742d70632b7d4b65e4e66d69
- flags: 0
- RecentlyUsedSceneGuid-1:
- value: 5409030052070d0d095a5c7412745e444216417c2e7a23642b7e1832bab9363e
- flags: 0
- RecentlyUsedSceneGuid-2:
- value: 5606515f5605500b0e5c5c2615760a444615487c2a2a2467297d1932b7e4673a
- flags: 0
- RecentlyUsedSceneGuid-3:
- value: 0608045752515c5d54580e7b167306444e4e1a7e2e7b71357c2d4b36e0b9656c
- flags: 0
- RecentlyUsedSceneGuid-4:
- value: 00050c5150005f5f54560f2640270d4410161c28282b72357e7c4835e4b63760
- flags: 0
- RecentlyUsedSceneGuid-5:
- value: 5302035e5c530f0b5c0c557416270d44134e4d28787c76332f7e1f6bb1b76169
- flags: 0
- RecentlyUsedSceneGuid-6:
value: 0508070250545c58585e0924437b5d444f4e4b7f7d7a71627f794c64b2e5633a
flags: 0
- RecentlyUsedSceneGuid-7:
+ RecentlyUsedSceneGuid-1:
value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
flags: 0
+ RecentlyUsedSceneGuid-2:
+ value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d
+ flags: 0
+ RecentlyUsedSceneGuid-3:
+ value: 07090c5651005b0c0c5c5f7543265d44474f1d727d7a746729284431e1e66c39
+ flags: 0
+ RecentlyUsedSceneGuid-4:
+ value: 015305005d015f580808087242770f424f154e287b79706575784561b7e1623b
+ flags: 0
+ RecentlyUsedSceneGuid-5:
+ value: 55540305570d0f0e0c5e5e2115710d44174e4e2b7b7e77662f2d1c61b5b06069
+ flags: 0
+ RecentlyUsedSceneGuid-6:
+ value: 5452500303515f0a5f5b5a7445775e46401519787c717f677d784860e3b1676c
+ flags: 0
+ RecentlyUsedSceneGuid-7:
+ value: 050402550007590a0f565f2714200c44144e492f2f70753175711f66e0b8303c
+ flags: 0
RecentlyUsedSceneGuid-8:
- value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
+ value: 06070c5f5c075c5e5e085476427a0a44474e1c2f7f7a73362f2d4d36b5b1633d
flags: 0
RecentlyUsedSceneGuid-9:
- value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d
+ value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9afeffa9ffff8e85dd8390e2969e8899daa7