diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 93048f8..cecd6a9 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -281,7 +281,7 @@ RectTransform: m_Children: - {fileID: 820679287} m_Father: {fileID: 1704906816} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1530,6 +1530,82 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &154309965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 154309966} + - component: {fileID: 154309968} + - component: {fileID: 154309967} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &154309966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154309965} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1785581618} + m_Father: {fileID: 845364685} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 35.3, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &154309967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154309965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &154309968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154309965} + m_CullTransparentMesh: 1 --- !u!1 &159042496 GameObject: m_ObjectHideFlags: 0 @@ -4372,6 +4448,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} +--- !u!1 &482905333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482905334} + - component: {fileID: 482905336} + - component: {fileID: 482905335} + m_Layer: 5 + m_Name: DynamicBone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &482905334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482905333} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 845364685} + m_Father: {fileID: 1704906816} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &482905335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482905333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.19607843} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &482905336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482905333} + m_CullTransparentMesh: 1 --- !u!1 &494042606 GameObject: m_ObjectHideFlags: 0 @@ -4797,7 +4949,7 @@ RectTransform: m_Children: - {fileID: 271446360} m_Father: {fileID: 1704906816} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7177,7 +7329,7 @@ RectTransform: m_Children: - {fileID: 1323454211} m_Father: {fileID: 1704906816} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7222,6 +7374,104 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 842158911} m_CullTransparentMesh: 1 +--- !u!1 &845364684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 845364685} + - component: {fileID: 845364686} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &845364685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845364684} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 154309966} + - {fileID: 1677453985} + m_Father: {fileID: 482905334} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -27.2, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &845364686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845364684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 154309967} + toggleTransition: 1 + graphic: {fileID: 1785581619} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, Assembly-CSharp + m_MethodName: SetDynamicBoneEnable + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 1 --- !u!1 &858700654 GameObject: m_ObjectHideFlags: 0 @@ -8718,7 +8968,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.7527675 + m_Size: 0.7058824 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8792,7 +9042,7 @@ RectTransform: m_Children: - {fileID: 494042607} m_Father: {fileID: 1704906816} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9830,7 +10080,7 @@ RectTransform: m_Children: - {fileID: 1104495875} m_Father: {fileID: 1704906816} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10555,7 +10805,7 @@ RectTransform: m_Children: - {fileID: 787741672} m_Father: {fileID: 1704906816} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10819,7 +11069,7 @@ RectTransform: m_Children: - {fileID: 1919663482} m_Father: {fileID: 1704906816} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11368,7 +11618,142 @@ MonoBehaviour: ShaderList: [] TransMaterialCharas: {fileID: 2100000, guid: 822a9b0732637f04b88e39818d097a19, type: 2} TransMaterialProps: {fileID: 2100000, guid: 59dfbb3f0a697874c81bba8ff758c891, type: 2} + CurrentContainer: {fileID: 0} OverrideController: {fileID: 22100000, guid: 130057757529b0f40a4fdc08bf0861ef, type: 2} +--- !u!1 &1576308332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1576308333} + - component: {fileID: 1576308335} + - component: {fileID: 1576308334} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1576308333 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576308332} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1810564998} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1576308334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576308332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: DynamicBone + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1576308335 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1576308332} + m_CullTransparentMesh: 1 --- !u!1 &1590756439 GameObject: m_ObjectHideFlags: 0 @@ -11401,7 +11786,7 @@ RectTransform: m_Children: - {fileID: 248521854} m_Father: {fileID: 1704906816} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12281,6 +12666,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1656599273} m_CullTransparentMesh: 1 +--- !u!1 &1677453984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1677453985} + - component: {fileID: 1677453987} + - component: {fileID: 1677453986} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1677453985 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677453984} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 845364685} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.00024414062, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1677453986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677453984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Enable + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1677453987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677453984} + m_CullTransparentMesh: 1 --- !u!1 &1684693613 GameObject: m_ObjectHideFlags: 0 @@ -12591,6 +13110,8 @@ RectTransform: - {fileID: 1705149250} - {fileID: 991136000} - {fileID: 6878219666121841224} + - {fileID: 1810564998} + - {fileID: 482905334} - {fileID: 1340983837} - {fileID: 2134049658} - {fileID: 1198130885} @@ -13057,6 +13578,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1785581617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1785581618} + - component: {fileID: 1785581620} + - component: {fileID: 1785581619} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1785581618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785581617} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 154309966} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1785581619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785581617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1785581620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785581617} + m_CullTransparentMesh: 1 --- !u!1 &1801886076 GameObject: m_ObjectHideFlags: 0 @@ -13183,6 +13779,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801886076} m_CullTransparentMesh: 1 +--- !u!1 &1810564997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1810564998} + - component: {fileID: 1810565000} + - component: {fileID: 1810564999} + m_Layer: 5 + m_Name: --DynamicBone-- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1810564998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1810564997} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1576308333} + m_Father: {fileID: 1704906816} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1810564999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1810564997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1810565000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1810564997} + m_CullTransparentMesh: 1 --- !u!1 &1817194911 GameObject: m_ObjectHideFlags: 0 @@ -13475,7 +14147,7 @@ RectTransform: m_Children: - {fileID: 1625876557} m_Father: {fileID: 1704906816} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -14572,7 +15244,6 @@ GameObject: - component: {fileID: 2039749204} - component: {fileID: 2039749203} - component: {fileID: 2039749202} - - component: {fileID: 2039749206} m_Layer: 0 m_Name: box m_TagString: Untagged @@ -14656,72 +15327,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2039749206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2039749201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9ac8d30c6a0d9642a11e5be4c440740, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Root: {fileID: 0} - m_UpdateRate: 60 - m_UpdateMode: 3 - m_Damping: 0.1 - m_DampingDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Elasticity: 0.1 - m_ElasticityDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Stiffness: 0.1 - m_StiffnessDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Inert: 0 - m_InertDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Friction: 0 - m_FrictionDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_Radius: 0 - m_RadiusDistrib: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_EndLength: 0 - m_EndOffset: {x: 0, y: 0, z: 0} - m_Gravity: {x: 0, y: 0, z: 0} - m_Force: {x: 0, y: 0, z: 0} - m_Exclusions: [] - m_FreezeAxis: 0 - m_DistantDisable: 0 - m_ReferenceObject: {fileID: 0} - m_DistanceToObject: 20 --- !u!1 &2043122521 GameObject: m_ObjectHideFlags: 0 @@ -14867,7 +15472,7 @@ RectTransform: m_Children: - {fileID: 269053644} m_Father: {fileID: 1704906816} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15035,7 +15640,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1704906816} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15137,7 +15742,7 @@ RectTransform: m_Children: - {fileID: 561218096} m_Father: {fileID: 1704906816} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 4f30a1d..e764436 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -18,7 +18,7 @@ public class UmaViewerBuilder : MonoBehaviour public List ShaderList = new List(); public Material TransMaterialCharas; public Material TransMaterialProps; - private UmaContainer CurrentContainer; + public UmaContainer CurrentContainer; public AnimatorOverrideController OverrideController; @@ -631,8 +631,11 @@ public class UmaViewerBuilder : MonoBehaviour case "Gallop/3D/Chara/ToonHair/TSER": m.shader = Shader.Find("Nars/UmaMusume/Body"); break; + case "Gallop/3D/Chara/ToonHair/TSEREm": + m.shader = Shader.Find("Nars/UmaMusume/Body"); + break; default: - Debug.LogError(m.shader.name); + Debug.Log(m.shader.name); // m.shader = Shader.Find("Nars/UmaMusume/Body"); break; } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index e622e09..738d119 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -357,4 +357,16 @@ public class UmaViewerUI : MonoBehaviour,FaceLoadCallBack { LoadFacialPanels(target); } + + public void SetDynamicBoneEnable(bool isOn) + { + if (Builder.CurrentContainer) + { + foreach(CySpringDataContainer cySpring in Builder.CurrentContainer.GetComponentsInChildren()) + { + cySpring.EnablePhysics(isOn); + } + + } + } } diff --git a/Assets/Scripts/umamusume/CySpringDataContainer.cs b/Assets/Scripts/umamusume/CySpringDataContainer.cs index 9b303d6..c6a22ad 100644 --- a/Assets/Scripts/umamusume/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/CySpringDataContainer.cs @@ -25,14 +25,16 @@ namespace Gallop public float HipMoveInfluenceDistance; public float HipMoveInfluenceMaxDistance; - private void Start() + public List DynamicBones = new List(); + + private void Awake() { - SetPhysics(); + InitializePhysics(); } - public void SetPhysics() + public void InitializePhysics() { + DynamicBones.Clear(); List gameObjects = new List(); - Dictionary DynamicBoneColliders = new Dictionary(); gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren()); foreach (CySpringCollisionData collider in collisionParam) { @@ -59,7 +61,6 @@ namespace Gallop 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(); @@ -68,14 +69,12 @@ namespace Gallop 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; @@ -83,7 +82,8 @@ namespace Gallop } } - + gameObjects.Clear(); + gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren()); foreach (CySpringParamDataElement spring in springParam) { var bone = gameObjects.Find(a => { return a.name == spring._boneName; }); @@ -92,39 +92,52 @@ namespace Gallop var dynamic = 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_Gravity = new Vector3(0, Mathf.Clamp01(-spring._gravity / 80000), 0); dynamic.m_Damping = 0.2f; - dynamic.m_Stiffness = spring._stiffnessForce / 1000; - dynamic.m_Elasticity = spring._dragForce / 4000; + dynamic.m_Stiffness = Mathf.Clamp01(spring._stiffnessForce / 900); + dynamic.m_Elasticity = Mathf.Clamp01(spring._dragForce / 4000); dynamic.m_Radius = spring._collisionRadius; + dynamic.SetupParticles(); + DynamicBones.Add(dynamic); + foreach (string collisionName in spring._collisionNameList) { - if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val)) + var tmp = gameObjects.Find(a => { return a.name == collisionName; }); + if (tmp) { - dynamic.m_Particles[0].m_Colliders.Add(val); + dynamic.Particles[0].m_Colliders.Add(tmp.GetComponent()); } } foreach (CySpringParamDataChildElement Childcollision in spring._childElements) { - var tempParticle = dynamic.m_Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); + var tempParticle = dynamic.Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); if (tempParticle != null) { tempParticle.m_Damping = 0.2f; - tempParticle.m_Stiffness = Childcollision._stiffnessForce / 1000; - tempParticle.m_Elasticity = Childcollision._dragForce / 4000; + tempParticle.m_Stiffness = Mathf.Clamp01(Childcollision._stiffnessForce / 900); + tempParticle.m_Elasticity = Mathf.Clamp01(Childcollision._dragForce / 4000); tempParticle.m_Radius = Childcollision._collisionRadius; foreach (string collisionName in Childcollision._collisionNameList) { - if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val)) + var tmp = gameObjects.Find(a => { return a.name == collisionName; }); + if (tmp) { - tempParticle.m_Colliders.Add(val); + tempParticle.m_Colliders.Add(tmp.GetComponent()); } } } } + } } } + + public void EnablePhysics(bool isOn) + { + foreach(DynamicBone dynamic in DynamicBones) + { + dynamic.enabled = isOn; + } + } } } diff --git a/Assets/Scripts/umamusume/DynamicBone/Scripts/DynamicBone.cs b/Assets/Scripts/umamusume/DynamicBone/Scripts/DynamicBone.cs index cc5c6a0..45a9d1d 100644 --- a/Assets/Scripts/umamusume/DynamicBone/Scripts/DynamicBone.cs +++ b/Assets/Scripts/umamusume/DynamicBone/Scripts/DynamicBone.cs @@ -106,7 +106,7 @@ public class DynamicBone : MonoBehaviour public bool m_DistantDisable = false; public Transform m_ReferenceObject = null; public float m_DistanceToObject = 20; - public List m_Particles = new List(); + public List Particles = new List(); Vector3 m_LocalGravity = Vector3.zero; Vector3 m_ObjectMove = Vector3.zero; @@ -117,7 +117,6 @@ public class DynamicBone : MonoBehaviour float m_Weight = 1.0f; bool m_DistantDisabled = false; - public class Particle { public List m_Colliders = new List(); @@ -237,12 +236,12 @@ public class DynamicBone : MonoBehaviour } Gizmos.color = Color.white; - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; if (p.m_ParentIndex >= 0) { - Particle p0 = m_Particles[p.m_ParentIndex]; + Particle p0 = Particles[p.m_ParentIndex]; Gizmos.DrawLine(p.m_Position, p0.m_Position); } if (p.m_Radius > 0) @@ -329,7 +328,7 @@ public class DynamicBone : MonoBehaviour public void SetupParticles() { - m_Particles.Clear(); + Particles.Clear(); if (m_Root == null) return; @@ -355,7 +354,7 @@ public class DynamicBone : MonoBehaviour } else // end bone { - Transform pb = m_Particles[parentIndex].m_Transform; + Transform pb = Particles[parentIndex].m_Transform; if (m_EndLength > 0) { Transform ppb = pb.parent; @@ -373,13 +372,13 @@ public class DynamicBone : MonoBehaviour if (parentIndex >= 0) { - boneLength += (m_Particles[parentIndex].m_Transform.position - p.m_Position).magnitude; + boneLength += (Particles[parentIndex].m_Transform.position - p.m_Position).magnitude; p.m_BoneLength = boneLength; m_BoneTotalLength = Mathf.Max(m_BoneTotalLength, boneLength); } - int index = m_Particles.Count; - m_Particles.Add(p); + int index = Particles.Count; + Particles.Add(p); if (b != null) { @@ -409,9 +408,9 @@ public class DynamicBone : MonoBehaviour m_LocalGravity = m_Root.InverseTransformDirection(m_Gravity); - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; p.m_Damping = m_Damping; p.m_Elasticity = m_Elasticity; p.m_Stiffness = m_Stiffness; @@ -447,9 +446,9 @@ public class DynamicBone : MonoBehaviour void InitTransforms() { - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; if (p.m_Transform != null) { p.m_Transform.localPosition = p.m_InitLocalPosition; @@ -458,18 +457,18 @@ public class DynamicBone : MonoBehaviour } } - void ResetParticlesPosition() + public void ResetParticlesPosition() { - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; if (p.m_Transform != null) { p.m_Position = p.m_PrevPosition = p.m_Transform.position; } else // end bone { - Transform pb = m_Particles[p.m_ParentIndex].m_Transform; + Transform pb = Particles[p.m_ParentIndex].m_Transform; p.m_Position = p.m_PrevPosition = pb.TransformPoint(p.m_EndOffset); } p.m_isCollide = false; @@ -486,9 +485,9 @@ public class DynamicBone : MonoBehaviour force -= pf; // remove projected gravity force = (force + m_Force) * (m_ObjectScale * timeVar); - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; if (p.m_ParentIndex >= 0) { // verlet integration @@ -517,10 +516,10 @@ public class DynamicBone : MonoBehaviour { Plane movePlane = new Plane(); - for (int i = 1; i < m_Particles.Count; ++i) + for (int i = 1; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; - Particle p0 = m_Particles[p.m_ParentIndex]; + Particle p = Particles[i]; + Particle p0 = Particles[p.m_ParentIndex]; float restLen; if (p.m_Transform != null) @@ -594,15 +593,15 @@ public class DynamicBone : MonoBehaviour // only update stiffness and keep bone length void SkipUpdateParticles() { - for (int i = 0; i < m_Particles.Count; ++i) + for (int i = 0; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; + Particle p = Particles[i]; if (p.m_ParentIndex >= 0) { p.m_PrevPosition += m_ObjectMove; p.m_Position += m_ObjectMove; - Particle p0 = m_Particles[p.m_ParentIndex]; + Particle p0 = Particles[p.m_ParentIndex]; float restLen; if (p.m_Transform != null) @@ -682,10 +681,10 @@ public class DynamicBone : MonoBehaviour } #endif - for (int i = 1; i < m_Particles.Count; ++i) + for (int i = 1; i < Particles.Count; ++i) { - Particle p = m_Particles[i]; - Particle p0 = m_Particles[p.m_ParentIndex]; + Particle p = Particles[i]; + Particle p0 = Particles[p.m_ParentIndex]; if (p0.m_Transform.childCount <= 1) // do not modify bone orientation if has more then one child { diff --git a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs index 79d55d8..9bc1cd6 100644 --- a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs @@ -129,9 +129,9 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); trs.transform.localPosition += trs._position * morph.Weight; trs.transform.localScale += trs._scale * morph.Weight; + trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); }; } } @@ -142,9 +142,10 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; + trs.transform.localRotation = Quaternion.Euler(trs._rotation); }; } @@ -152,9 +153,10 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; + trs.transform.localRotation = Quaternion.Euler(trs._rotation); }; } @@ -162,9 +164,10 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; + trs.transform.localRotation = Quaternion.Euler(trs._rotation); }; } @@ -172,9 +175,10 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; + trs.transform.localRotation = Quaternion.Euler(trs._rotation); }; } @@ -182,9 +186,10 @@ namespace Gallop { if (trs.transform) { - trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; trs.transform.localScale = trs._scale; + trs.transform.localRotation = Quaternion.Euler(trs._rotation); }; } }