diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 3042b52..f393e21 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -13777,7 +13777,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2039749201} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 diff --git a/Assets/Scripts/umamusume/CySpringDataContainer.cs b/Assets/Scripts/umamusume/CySpringDataContainer.cs index 5ce4fcf..5c42ded 100644 --- a/Assets/Scripts/umamusume/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/CySpringDataContainer.cs @@ -4,122 +4,125 @@ using UnityEngine; namespace Gallop { - public class CySpringDataContainer:MonoBehaviour + public class CySpringDataContainer : MonoBehaviour { - public List collisionParam; - public List springParam; - public List ConnectedBoneList; - public bool enableVerticalWind; - public bool enableHorizontalWind; - public float centerWindAngleSlow; - public float centerWindAngleFast; - public float verticalCycleSlow; - public float horizontalCycleSlow; - public float verticalAngleWidthSlow; - public float horizontalAngleWidthSlow; - public float verticalCycleFast; - public float horizontalCycleFast; - public float verticalAngleWidthFast; - public float horizontalAngleWidthFast; - public bool IsEnableHipMoveParam; - public float HipMoveInfluenceDistance; - public float HipMoveInfluenceMaxDistance; + public List collisionParam; + public List springParam; + public List ConnectedBoneList; + public bool enableVerticalWind; + public bool enableHorizontalWind; + public float centerWindAngleSlow; + public float centerWindAngleFast; + public float verticalCycleSlow; + public float horizontalCycleSlow; + public float verticalAngleWidthSlow; + public float horizontalAngleWidthSlow; + public float verticalCycleFast; + public float horizontalCycleFast; + public float verticalAngleWidthFast; + public float horizontalAngleWidthFast; + public bool IsEnableHipMoveParam; + public float HipMoveInfluenceDistance; + public float HipMoveInfluenceMaxDistance; private void Start() { - SetPhysics(); - } + SetPhysics(); + } public void SetPhysics() { - List gameObjects = new List(); - Dictionary DynamicBoneColliders = new Dictionary(); - gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren()); - foreach (CySpringCollisionData collider in collisionParam) - { - if (collider._isInner) continue; - - var bone = gameObjects.Find(a => { return a.name == collider._targetObjectName; }); - if (bone) - { - - var child = new GameObject(collider._collisionName); - child.transform.SetParent(bone); - child.transform.localPosition = Vector3.zero; - child.transform.localRotation = Quaternion.identity; - child.transform.localScale = Vector3.one; - - switch (collider._type){ - case CySpringCollisionData.CollisionType.Capsule: - var dynamic = child.AddComponent(); - dynamic.ColliderName = collider._collisionName; - child.transform.localPosition = (collider._offset+ collider._offset2)/2; - child.transform.LookAt(child.transform.TransformPoint(collider._offset2)); - dynamic.m_Direction = DynamicBoneColliderBase.Direction.Z; - dynamic.m_Height = (collider._offset - collider._offset2).magnitude+collider._radius; - dynamic.m_Radius = collider._radius; - dynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - DynamicBoneColliders.Add(collider._collisionName, dynamic); - break; - case CySpringCollisionData.CollisionType.Sphere: - var Spheredynamic = child.AddComponent(); - Spheredynamic.ColliderName = collider._collisionName; - child.transform.localPosition = collider._offset; - Spheredynamic.m_Radius = collider._radius; - Spheredynamic.m_Height = collider._distance; - Spheredynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - DynamicBoneColliders.Add(collider._collisionName, Spheredynamic); - break; - case CySpringCollisionData.CollisionType.Plane: - var planedynamic = child.AddComponent(); - planedynamic.ColliderName = collider._collisionName; - child.transform.localPosition = collider._offset; - planedynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; - DynamicBoneColliders.Add(collider._collisionName, planedynamic); - break; - case CySpringCollisionData.CollisionType.None: - break; - } - } - } - - - foreach (CySpringParamDataElement spring in springParam) + List gameObjects = new List(); + Dictionary DynamicBoneColliders = new Dictionary(); + gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren()); + foreach (CySpringCollisionData collider in collisionParam) { - var bone = gameObjects.Find(a => { return a.name == spring._boneName; }); + if (collider._isInner) continue; + + var bone = gameObjects.Find(a => { return a.name == collider._targetObjectName; }); if (bone) { - var dynamic = bone.gameObject.AddComponent(); - dynamic.m_Root = bone; - dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal; - dynamic.SetupParticles(); - dynamic.m_Gravity = new Vector3(0, -spring._gravity/80000, 0); - dynamic.m_Stiffness = spring._stiffnessForce/8000; - dynamic.m_Elasticity = spring._dragForce/9000; - dynamic.m_Radius = spring._collisionRadius; - foreach (string collisionName in spring._collisionNameList) + + var child = new GameObject(collider._collisionName); + child.transform.SetParent(bone); + child.transform.localPosition = Vector3.zero; + child.transform.localRotation = Quaternion.identity; + child.transform.localScale = Vector3.one; + + switch (collider._type) { - if (DynamicBoneColliders.TryGetValue(collisionName,out DynamicBoneColliderBase val)) - { - dynamic.m_Particles[0].m_Colliders.Add(val); - } + case CySpringCollisionData.CollisionType.Capsule: + var dynamic = child.AddComponent(); + dynamic.ColliderName = collider._collisionName; + child.transform.localPosition = (collider._offset + collider._offset2) / 2; + child.transform.LookAt(child.transform.TransformPoint(collider._offset2)); + dynamic.m_Direction = DynamicBoneColliderBase.Direction.Z; + dynamic.m_Height = (collider._offset - collider._offset2).magnitude + collider._radius; + dynamic.m_Radius = collider._radius; + dynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; + DynamicBoneColliders.Add(collider._collisionName, dynamic); + break; + case CySpringCollisionData.CollisionType.Sphere: + var Spheredynamic = child.AddComponent(); + Spheredynamic.ColliderName = collider._collisionName; + child.transform.localPosition = collider._offset; + Spheredynamic.m_Radius = collider._radius; + Spheredynamic.m_Height = collider._distance; + Spheredynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; + DynamicBoneColliders.Add(collider._collisionName, Spheredynamic); + break; + case CySpringCollisionData.CollisionType.Plane: + var planedynamic = child.AddComponent(); + planedynamic.ColliderName = collider._collisionName; + child.transform.localPosition = collider._offset; + planedynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside; + DynamicBoneColliders.Add(collider._collisionName, planedynamic); + break; + case CySpringCollisionData.CollisionType.None: + break; } - foreach (CySpringParamDataChildElement Childcollision in spring._childElements) - { - var tempParticle = dynamic.m_Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); + } + } + + + foreach (CySpringParamDataElement spring in springParam) + { + var bone = gameObjects.Find(a => { return a.name == spring._boneName; }); + if (bone) + { + var dynamic = bone.gameObject.AddComponent(); + dynamic.m_Root = bone; + dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal; + dynamic.SetupParticles(); + dynamic.m_Gravity = new Vector3(0, -spring._gravity / 80000, 0); + dynamic.m_Stiffness = spring._stiffnessForce / 5000; + dynamic.m_Elasticity = spring._dragForce / 5000; + dynamic.m_Radius = spring._collisionRadius; + foreach (string collisionName in spring._collisionNameList) + { + if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val)) + { + dynamic.m_Particles[0].m_Colliders.Add(val); + } + } + foreach (CySpringParamDataChildElement Childcollision in spring._childElements) + { + var tempParticle = dynamic.m_Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); if (tempParticle != null) { - foreach (string collisionName in Childcollision._collisionNameList) - { - if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val)) - { - tempParticle.m_Colliders.Add(val); - } - } - } - - } - } + tempParticle.m_Stiffness = Childcollision._stiffnessForce / 5000; + tempParticle.m_Elasticity = Childcollision._dragForce / 5000; + tempParticle.m_Radius = Childcollision._collisionRadius; + foreach (string collisionName in Childcollision._collisionNameList) + { + if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val)) + { + tempParticle.m_Colliders.Add(val); + } + } + } + } + } } } - } + } } diff --git a/Assets/Scripts/umamusume/DynamicBone/Demo/Demo1.unity b/Assets/Scripts/umamusume/DynamicBone/Demo/Demo1.unity index bfd970b..406035a 100644 --- a/Assets/Scripts/umamusume/DynamicBone/Demo/Demo1.unity +++ b/Assets/Scripts/umamusume/DynamicBone/Demo/Demo1.unity @@ -148,6 +148,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: baedd976e12657241bf7ff2d1c685342, type: 3} m_Name: m_EditorClassIdentifier: + ColliderName: m_Direction: 1 m_Center: {x: 0, y: -0.2, z: 0} m_Bound: 0 @@ -250,7 +251,6 @@ MonoBehaviour: m_EndOffset: {x: -0.1, y: -0.1, z: 0.3} m_Gravity: {x: 0, y: 0, z: 0} m_Force: {x: 0, y: 0, z: 0} - m_Colliders: [] m_Exclusions: [] m_FreezeAxis: 0 m_DistantDisable: 0 @@ -326,8 +326,6 @@ MonoBehaviour: m_EndOffset: {x: 0.1, y: -0.1, z: 0.3} m_Gravity: {x: 0, y: 0, z: 0} m_Force: {x: 0, y: 0, z: 0} - m_Colliders: - - {fileID: 789765167} m_Exclusions: [] m_FreezeAxis: 0 m_DistantDisable: 0 @@ -412,10 +410,6 @@ MonoBehaviour: m_EndOffset: {x: 0, y: 0, z: 0} m_Gravity: {x: 0, y: -0.002, z: 0} m_Force: {x: 0, y: 0, z: 0} - m_Colliders: - - {fileID: 94102370} - - {fileID: 838898607} - - {fileID: 789765167} m_Exclusions: [] m_FreezeAxis: 0 m_DistantDisable: 0 @@ -554,119 +548,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba128457d0ea5e3439dbe4a53b9d1273, type: 3} ---- !u!1 &789765166 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 789765171} - - component: {fileID: 789765170} - - component: {fileID: 789765169} - - component: {fileID: 789765168} - - component: {fileID: 789765167} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &789765167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 789765166} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: baedd976e12657241bf7ff2d1c685342, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} - m_Bound: 0 - m_Radius: 0.5 - m_Height: 0 ---- !u!135 &789765168 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 789765166} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &789765169 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 789765166} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &789765170 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 789765166} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &789765171 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 789765166} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.189, y: 1.083, z: -0.69718814} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &838898605 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100140, guid: ba128457d0ea5e3439dbe4a53b9d1273, @@ -685,6 +566,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: baedd976e12657241bf7ff2d1c685342, type: 3} m_Name: m_EditorClassIdentifier: + ColliderName: m_Direction: 1 m_Center: {x: 0, y: -0.2, z: 0} m_Bound: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..e00ebb5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Version2.unity + guid: 0befbf05b89507042b07ce8939206165 m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e00d190..0bd0239 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -41,6 +41,12 @@ PlayerSettings: height: 1 m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} + m_ShowUnitySplashAds: 0 + m_AdsAndroidGameId: + m_AdsIosGameId: + m_ShowSplashAdsSlogan: 0 + m_SloganImage: {fileID: 0} + m_SloganHeight: 150 m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 720 defaultScreenHeight: 720 @@ -85,6 +91,11 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + autoStreaming: 0 + useAnimationStreaming: 0 + useFontStreaming: 0 + autoStreamingId: + instantGameAppId: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -150,6 +161,7 @@ PlayerSettings: m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -291,6 +303,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetSecurityBuild: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -501,7 +514,9 @@ PlayerSettings: switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -602,7 +617,7 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Standalone: 1 + Standalone: 0 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} @@ -646,6 +661,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: