diff --git a/.gitignore b/.gitignore index 07d2263..b362d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # # Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore # +.utmp/ /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -12,6 +13,8 @@ /Assets/AmplifyShaderEditor/ /Ignore/ /Screenshots/ +/[Uu]ser[Ss]ettings/ +*.log # Asset meta data should only be ignored when the corresponding asset is also ignored !/[Aa]ssets/**/*.meta @@ -63,10 +66,10 @@ crashlytics-build.properties /Assets/Plugins/RootMotion/PuppetMaster/_Integration /VMDRecords -/umamusume Config.json /gltf /Assets/Plugins/RootMotion/FinalIK/_Integration /Poses /Assets/AmplifyShaderEditor.meta /BuildDev +/UserSettings/Layouts/default-2022.dwlt diff --git a/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs b/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs index d152b08..b21e325 100644 --- a/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs +++ b/Assets/Plugins/RootMotion/PuppetMaster/Scripts/PuppetMasterSetup.cs @@ -242,24 +242,44 @@ namespace RootMotion.Dynamics { // Returns the Muscle.Group of the specified bone Transform (only if using the Humanoid rig) private static Muscle.Group FindGroup(Animator animator, Transform t) { - if (!animator.isHuman) return Muscle.Group.Hips; - if (t == animator.GetBoneTransform(HumanBodyBones.Chest)) return Muscle.Group.Spine; - if (t == animator.GetBoneTransform(HumanBodyBones.Head)) return Muscle.Group.Head; - if (t == animator.GetBoneTransform(HumanBodyBones.Hips)) return Muscle.Group.Hips; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftFoot)) return Muscle.Group.Foot; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftHand)) return Muscle.Group.Hand; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerArm)) return Muscle.Group.Arm; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerLeg)) return Muscle.Group.Leg; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperArm)) return Muscle.Group.Arm; - if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperLeg)) return Muscle.Group.Leg; - if (t == animator.GetBoneTransform(HumanBodyBones.RightFoot)) return Muscle.Group.Foot; - if (t == animator.GetBoneTransform(HumanBodyBones.RightHand)) return Muscle.Group.Hand; - if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerArm)) return Muscle.Group.Arm; - if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerLeg)) return Muscle.Group.Leg; - if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperArm)) return Muscle.Group.Arm; - if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperLeg)) return Muscle.Group.Leg; - return Muscle.Group.Spine; - } + if (animator.isHuman) { + if (t == animator.GetBoneTransform(HumanBodyBones.Chest)) return Muscle.Group.Spine; + if (t == animator.GetBoneTransform(HumanBodyBones.Head)) return Muscle.Group.Head; + if (t == animator.GetBoneTransform(HumanBodyBones.Hips)) return Muscle.Group.Hips; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftFoot)) return Muscle.Group.Foot; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftHand)) return Muscle.Group.Hand; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerArm)) return Muscle.Group.Arm; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerLeg)) return Muscle.Group.Leg; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperArm)) return Muscle.Group.Arm; + if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperLeg)) return Muscle.Group.Leg; + if (t == animator.GetBoneTransform(HumanBodyBones.RightFoot)) return Muscle.Group.Foot; + if (t == animator.GetBoneTransform(HumanBodyBones.RightHand)) return Muscle.Group.Hand; + if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerArm)) return Muscle.Group.Arm; + if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerLeg)) return Muscle.Group.Leg; + if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperArm)) return Muscle.Group.Arm; + if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperLeg)) return Muscle.Group.Leg; + } + else + { + if (t.name.Equals("Hip")) return Muscle.Group.Hips; + if (t.name.Equals("Spine")) return Muscle.Group.Spine; + if (t.name.Equals("Chest")) return Muscle.Group.Spine; + if (t.name.Equals("Head")) return Muscle.Group.Head; + if (t.name.Equals("Arm_L")) return Muscle.Group.Arm; + if (t.name.Equals("Elbow_L")) return Muscle.Group.Arm; + if (t.name.Equals("Wrist_L")) return Muscle.Group.Hand; + if (t.name.Equals("Arm_R")) return Muscle.Group.Arm; + if (t.name.Equals("Elbow_R")) return Muscle.Group.Arm; + if (t.name.Equals("Wrist_R")) return Muscle.Group.Hand; + if (t.name.Equals("Thigh_L")) return Muscle.Group.Leg; + if (t.name.Equals("Knee_L")) return Muscle.Group.Leg; + if (t.name.Equals("Ankle_L")) return Muscle.Group.Foot; + if (t.name.Equals("Thigh_R")) return Muscle.Group.Leg; + if (t.name.Equals("Knee_R")) return Muscle.Group.Leg; + if (t.name.Equals("Ankle_R")) return Muscle.Group.Foot; + } + return Muscle.Group.Spine; + } // Removes all bones that don't have a Rigidbody or a Collider attached because they are not part of the simulation private void RemoveUnnecessaryBones() { diff --git a/Assets/Plugins/RootMotion/RagdollManager/Scripts/BipedRagdollReferences.cs b/Assets/Plugins/RootMotion/RagdollManager/Scripts/BipedRagdollReferences.cs index 460b9a4..c43f7d3 100644 --- a/Assets/Plugins/RootMotion/RagdollManager/Scripts/BipedRagdollReferences.cs +++ b/Assets/Plugins/RootMotion/RagdollManager/Scripts/BipedRagdollReferences.cs @@ -211,36 +211,44 @@ namespace RootMotion.Dynamics { public static BipedRagdollReferences FromAvatar(Animator animator) { BipedRagdollReferences r = new BipedRagdollReferences(); - if (!animator.isHuman) { - List list = new List(animator.gameObject.GetComponentsInChildren()); - list.Find(t => t.name.Equals("Position")); + if (!animator.isHuman) + { + Dictionary transformDict = new Dictionary(); + foreach (Transform t in animator.gameObject.GetComponentsInChildren()) + { + if(!transformDict.ContainsKey(t.name)) + { + transformDict[t.name] = t; + } + } - r.root = list.Find(t => t.name.Equals("Position")); + r.root = transformDict.ContainsKey("Position") ? transformDict["Position"] : null; - r.hips = list.Find(t => t.name.Equals("Hip")); - r.spine = list.Find(t => t.name.Equals("Spine")); - r.chest = list.Find(t => t.name.Equals("Chest")); - r.head = list.Find(t => t.name.Equals("Head")); + r.hips = transformDict.ContainsKey("Hip") ? transformDict["Hip"] : null; + r.spine = transformDict.ContainsKey("Spine") ? transformDict["Spine"] : null; + r.chest = transformDict.ContainsKey("Chest") ? transformDict["Chest"] : null; + r.head = transformDict.ContainsKey("Head") ? transformDict["Head"] : null; - r.leftUpperArm = list.Find(t => t.name.Equals("Arm_L")); - r.leftLowerArm = list.Find(t => t.name.Equals("Elbow_L")); - r.leftHand = list.Find(t => t.name.Equals("Wrist_L")); + r.leftUpperArm = transformDict.ContainsKey("Arm_L") ? transformDict["Arm_L"] : null; + r.leftLowerArm = transformDict.ContainsKey("Elbow_L") ? transformDict["Elbow_L"] : null; + r.leftHand = transformDict.ContainsKey("Wrist_L") ? transformDict["Wrist_L"] : null; - r.rightUpperArm = list.Find(t => t.name.Equals("Arm_R")); - r.rightLowerArm = list.Find(t => t.name.Equals("Elbow_R")); - r.rightHand = list.Find(t => t.name.Equals("Wrist_R")); + r.rightUpperArm = transformDict.ContainsKey("Arm_R") ? transformDict["Arm_R"] : null; + r.rightLowerArm = transformDict.ContainsKey("Elbow_R") ? transformDict["Elbow_R"] : null; + r.rightHand = transformDict.ContainsKey("Wrist_R") ? transformDict["Wrist_R"] : null; - r.leftUpperLeg = list.Find(t => t.name.Equals("Thigh_L")); - r.leftLowerLeg = list.Find(t => t.name.Equals("Knee_L")); - r.leftFoot = list.Find(t => t.name.Equals("Ankle_L")); + r.leftUpperLeg = transformDict.ContainsKey("Thigh_L") ? transformDict["Thigh_L"] : null; + r.leftLowerLeg = transformDict.ContainsKey("Knee_L") ? transformDict["Knee_L"] : null; + r.leftFoot = transformDict.ContainsKey("Ankle_L") ? transformDict["Ankle_L"] : null; - r.rightUpperLeg = list.Find(t => t.name.Equals("Thigh_R")); - r.rightLowerLeg = list.Find(t => t.name.Equals("Knee_R")); - r.rightFoot = list.Find(t => t.name.Equals("Ankle_R")); - return r; - } + r.rightUpperLeg = transformDict.ContainsKey("Thigh_R") ? transformDict["Thigh_R"] : null; + r.rightLowerLeg = transformDict.ContainsKey("Knee_R") ? transformDict["Knee_R"] : null; + r.rightFoot = transformDict.ContainsKey("Ankle_R") ? transformDict["Ankle_R"] : null; - r.root = animator.transform; + return r; + } + + r.root = animator.transform; r.hips = animator.GetBoneTransform(HumanBodyBones.Hips); r.spine = animator.GetBoneTransform(HumanBodyBones.Spine); diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 7a12239..741427a 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1236,6 +1236,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26809008} m_CullTransparentMesh: 1 +--- !u!1 &31766242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 31766243} + - component: {fileID: 31766245} + - component: {fileID: 31766244} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &31766243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31766242} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 856541962} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &31766244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31766242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &31766245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31766242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &32867438 GameObject: m_ObjectHideFlags: 0 @@ -3114,7 +3191,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &92965282 @@ -8182,7 +8259,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000122} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &270183827 @@ -10857,7 +10934,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &351714761 @@ -16662,7 +16739,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1505249815} m_HandleRect: {fileID: 1505249814} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -17817,7 +17894,7 @@ RectTransform: 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_AnchoredPosition: {x: 60, y: 0} m_SizeDelta: {x: 800, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &523631781 @@ -19400,7 +19477,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &569543143 @@ -28401,7 +28478,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 544177725} m_HandleRect: {fileID: 544177724} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -30090,6 +30167,96 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &856541961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 856541962} + - component: {fileID: 856541965} + - component: {fileID: 856541964} + - component: {fileID: 856541963} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &856541962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 856541961} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 31766243} + m_Father: {fileID: 1248201896} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &856541963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 856541961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &856541964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 856541961} + 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: 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 &856541965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 856541961} + m_CullTransparentMesh: 1 --- !u!1 &858700654 GameObject: m_ObjectHideFlags: 0 @@ -30329,6 +30496,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859804981} m_CullTransparentMesh: 1 +--- !u!1 &860215613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 860215614} + - component: {fileID: 860215616} + - component: {fileID: 860215615} + 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 &860215614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860215613} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1951457974} + 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 &860215615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860215613} + 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: Head + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 309c10a796fa90746889302436dac032, type: 2} + m_sharedMaterial: {fileID: 1876532955194943090, guid: 309c10a796fa90746889302436dac032, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 20 + m_fontSizeBase: 20 + 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: 0 + 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 &860215616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 860215613} + m_CullTransparentMesh: 1 --- !u!1 &863491768 GameObject: m_ObjectHideFlags: 0 @@ -32215,7 +32517,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380, y: -45.000122} + m_AnchoredPosition: {x: 380, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &931406427 @@ -32603,7 +32905,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000122} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &952551665 @@ -35332,7 +35634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1040294592 @@ -39073,6 +39375,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162273397} m_CullTransparentMesh: 1 +--- !u!1 &1163845818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1163845819} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1163845819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163845818} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1712696204} + m_Father: {fileID: 2050879076} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1171836682 GameObject: m_ObjectHideFlags: 0 @@ -41411,6 +41749,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1243726156} m_CullTransparentMesh: 1 +--- !u!1 &1248201894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1248201896} + - component: {fileID: 1248201898} + - component: {fileID: 1248201897} + - component: {fileID: 1248201895} + m_Layer: 5 + m_Name: Head List + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1248201895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248201894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 31766243} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 90 + m_Viewport: {fileID: 856541962} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 2050879075} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!224 &1248201896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248201894} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 856541962} + - {fileID: 2050879076} + m_Father: {fileID: 1984124021} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 525, y: -75} + m_SizeDelta: {x: 270, y: -149.99998} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1248201897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248201894} + 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: 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 &1248201898 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248201894} + m_CullTransparentMesh: 1 --- !u!1 &1249866794 GameObject: m_ObjectHideFlags: 0 @@ -48765,7 +49211,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46.499878} + m_AnchoredPosition: {x: 0, y: -46.5} m_SizeDelta: {x: 300, y: -93.00023} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1453791885 @@ -50408,7 +50854,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!224 &1525688469 stripped @@ -51123,7 +51569,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1558324558 @@ -51319,6 +51765,7 @@ MonoBehaviour: MobCharactersList: {fileID: 1892028687} MobCharactersPageCtrl: {fileID: 1092593580} CostumeList: {fileID: 270183827} + HeadCostumeList: {fileID: 1248201895} MobCostumeList: {fileID: 1765749874} AnimationSetList: {fileID: 92965282} AnimationList: {fileID: 1440546413} @@ -51426,6 +51873,7 @@ MonoBehaviour: DynamicBoneEnable: 1 EnableEyeTracking: 1 EnableFaceOverride: 1 + CurrentHeadCostumeId: LiveTime: 0 isRecordVMD: 0 isRequireStage: 1 @@ -55059,7 +55507,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1678768231 @@ -55393,7 +55841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1684693616 @@ -55889,7 +56337,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1699478760 @@ -56623,6 +57071,81 @@ RectTransform: m_AnchoredPosition: {x: 15, y: -15} m_SizeDelta: {x: 110, y: 30} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &1712696203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1712696204} + - component: {fileID: 1712696205} + - component: {fileID: 1712696206} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1712696204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712696203} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1163845819} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1712696205 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712696203} + m_CullTransparentMesh: 1 +--- !u!114 &1712696206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712696203} + 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!1 &1716374325 GameObject: m_ObjectHideFlags: 0 @@ -58208,7 +58731,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000122} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1765749874 @@ -63494,6 +64017,139 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1951457973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1951457974} + - component: {fileID: 1951457977} + - component: {fileID: 1951457976} + - component: {fileID: 1951457975} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1951457974 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951457973} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 860215614} + m_Father: {fileID: 1984124021} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 525, y: -150.00008} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1951457975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951457973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1951457976} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: ToggleUIPanel + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1248201894} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1951457976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951457973} + 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.9607844, g: 0.9607844, b: 0.9607844, 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: 21300000, guid: f0efb3b3a93d2674e90438758b0fb001, type: 3} + 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: 2 +--- !u!222 &1951457977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951457973} + m_CullTransparentMesh: 1 --- !u!1 &1958159929 GameObject: m_ObjectHideFlags: 0 @@ -63692,7 +64348,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1970310175 @@ -64157,7 +64813,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1975357613 @@ -64581,6 +65237,8 @@ RectTransform: m_Children: - {fileID: 1558324557} - {fileID: 270183826} + - {fileID: 1951457974} + - {fileID: 1248201896} m_Father: {fileID: 1389187104} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -66940,6 +67598,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2049278006} m_CullTransparentMesh: 1 +--- !u!1 &2050879074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050879076} + - component: {fileID: 2050879078} + - component: {fileID: 2050879077} + - component: {fileID: 2050879075} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2050879075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050879074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1712696206} + m_HandleRect: {fileID: 1712696204} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!224 &2050879076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050879074} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1163845819} + m_Father: {fileID: 1248201896} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &2050879077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050879074} + 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: 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 &2050879078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050879074} + m_CullTransparentMesh: 1 --- !u!1 &2056602387 GameObject: m_ObjectHideFlags: 0 @@ -69185,7 +69969,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2129326814 @@ -70413,7 +71197,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000122} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2146564492 diff --git a/Assets/Scripts/UI/LiveCharacterSelect.cs b/Assets/Scripts/UI/LiveCharacterSelect.cs index da4d7a7..5234632 100644 --- a/Assets/Scripts/UI/LiveCharacterSelect.cs +++ b/Assets/Scripts/UI/LiveCharacterSelect.cs @@ -5,6 +5,7 @@ public class LiveCharacterSelect : MonoBehaviour { public CharaEntry CharaEntry; public string CostumeId; + public string HeadCostumeId; public Image CharaImage; public Image CostumeImage; public Text IndexText; @@ -17,10 +18,11 @@ public class LiveCharacterSelect : MonoBehaviour ui.ToggleUIPanel(ui.SelectCharacterPannel); } - public void SetValue(CharaEntry charaentry, string costumeId, Sprite costumeSprite) + public void SetValue(CharaEntry charaentry, string costumeId, Sprite costumeSprite, string headCostumeId) { CharaEntry = charaentry; CostumeId = costumeId; + HeadCostumeId = headCostumeId; CharaImage.enabled = true; CharaImage.sprite = charaentry.Icon; CostumeImage.sprite = costumeSprite; diff --git a/Assets/Scripts/UI/UmaUIContainer.cs b/Assets/Scripts/UI/UmaUIContainer.cs index 087de08..e5d55c3 100644 --- a/Assets/Scripts/UI/UmaUIContainer.cs +++ b/Assets/Scripts/UI/UmaUIContainer.cs @@ -66,5 +66,6 @@ public class UmaUIContainer : MonoBehaviour public Toggle Toggle; public Image Image; public Image ToggleImage; + public string Id; } diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index b736b2f..2d1f011 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -23,6 +23,7 @@ public class UmaContainer : MonoBehaviour public CharaShaderEffectData HeadShaderEffectData; public CharaShaderEffectData BodyShaderEffectData; public List Materials = new List(); + public List Renderers = new List(); protected UmaViewerBuilder Builder => UmaViewerBuilder.Instance; protected UmaViewerMain Main => UmaViewerMain.Instance; diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index 005dd15..cfb81f5 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -170,7 +170,8 @@ public class UmaContainerCharacter : UmaContainer UmaAnimator.runtimeAnimatorController = OverrideController; //Materials - foreach (var rend in gameObject.GetComponentsInChildren()) + Renderers = gameObject.GetComponentsInChildren().ToList(); + foreach (var rend in Renderers) { for (int i = 0; i < rend.sharedMaterials.Length; i++) { @@ -458,6 +459,7 @@ public class UmaContainerCharacter : UmaContainer var animator = UmaAnimator; BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator); BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r); + options.spine = true; var ik = container.gameObject.AddComponent(); ik.references.root = container.transform; diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 0a363ca..c5fa86b 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -180,7 +180,8 @@ public enum UmaFileType teambuilding, challengematch, collectevent, - ratingrace + ratingrace, + jobs } public enum TranslationTables diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index e8ab39b..67599c3 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -25,6 +25,8 @@ public class UmaDatabaseController } /// 3d/chara/body/ public static string BodyPath = "3d/chara/body/"; + /// 3d/chara/mini/body/ + public static string MiniBodyPath = "3d/chara/mini/body/"; /// 3d/chara/head/ public static string HeadPath = "3d/chara/head/"; /// 3d/motion/ diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 2a45b51..63a812b 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -45,7 +45,7 @@ public class UmaViewerBuilder : MonoBehaviour Instance = this; } - public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini) + public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini, string haedCostumeId = "") { int id = chara.Id; var umaContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent(); @@ -69,7 +69,7 @@ public class UmaViewerBuilder : MonoBehaviour else { umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara); - LoadNormalUma(umaContainer, chara, costumeId, true); + LoadNormalUma(umaContainer, chara, costumeId, true, haedCostumeId); } yield break; @@ -94,7 +94,7 @@ public class UmaViewerBuilder : MonoBehaviour } else { - LoadNormalUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId); + LoadNormalUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId, false, characters[i].HeadCostumeId); } Gallop.Live.Director.instance.CharaContainerScript.Add(umaContainer); @@ -102,7 +102,7 @@ public class UmaViewerBuilder : MonoBehaviour } } - private void LoadNormalUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, bool loadMotion = false) + private void LoadNormalUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, bool loadMotion = false, string haedCostumeId = "") { int id = chara.Id; umaContainer.CharaEntry = chara; @@ -117,11 +117,12 @@ public class UmaViewerBuilder : MonoBehaviour shape = charaData["shape"].ToString(); UmaDatabaseEntry asset = null; + + umaContainer.VarCostumeIdLong = costumeId; if (genericCostume) { costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_')); umaContainer.VarCostumeIdShort = costumeIdShort; - umaContainer.VarCostumeIdLong = costumeId; umaContainer.VarBust = bust; umaContainer.VarSkin = skin; umaContainer.VarSocks = socks; @@ -218,12 +219,12 @@ public class UmaViewerBuilder : MonoBehaviour else { head_id = id; - head_costumeId = costumeId; + head_costumeId = string.IsNullOrEmpty(haedCostumeId) ? costumeId : haedCostumeId; CurrentHead = new UmaHeadData { id = id, - costumeId = costumeId, + costumeId = head_costumeId, tailId = tailId, chara = chara }; diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index e427428..3be7085 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -30,6 +30,7 @@ public class UmaViewerUI : MonoBehaviour public ScrollRect MobCharactersList; public PageManager MobCharactersPageCtrl; public ScrollRect CostumeList; + public ScrollRect HeadCostumeList; public ScrollRect MobCostumeList; public ScrollRect AnimationSetList; public ScrollRect AnimationList; @@ -143,6 +144,7 @@ public class UmaViewerUI : MonoBehaviour public bool DynamicBoneEnable = true; public bool EnableEyeTracking = true; public bool EnableFaceOverride = true; + public string CurrentHeadCostumeId = string.Empty; [Header("Live")] public bool LiveTime = false; @@ -717,20 +719,22 @@ public class UmaViewerUI : MonoBehaviour Action action = delegate (CharaEntry achara) { string nameVar = mini ? $"pfb_mbdy{achara.Id}" : $"pfb_bdy{achara.Id}"; - foreach (var entry in Main.AbList.Where(a => !a.Key.Contains("clothes") && a.Key.Contains(nameVar))) + string bodyPath = mini ? UmaDatabaseController.MiniBodyPath : UmaDatabaseController.BodyPath; + foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith(bodyPath) && !a.Name.Contains("clothes") && a.Name.Contains(nameVar))) { var container = Instantiate(UmaContainerCostumePrefab, costumeList.content).GetComponent(); - string[] split = entry.Key.Split('_'); + string[] split = entry.Name.Split('_'); string costumeId = split[split.Length - 1]; var dressdata = Main.Costumes.FirstOrDefault(a => (a.CharaId == achara.Id && a.BodyTypeSub == int.Parse(costumeId))); container.Name = container.name = GetCostumeName(costumeId, (dressdata == null ? costumeId : dressdata.DressName)); container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon); container.Image.enabled = true; + container.Id = costumeId; container.Button.onClick.AddListener(() => { if (LiveSelectPannel.activeInHierarchy && CurrentSeletChara) { - CurrentSeletChara.SetValue(achara, costumeId, container.Image.sprite); + CurrentSeletChara.SetValue(achara, costumeId, container.Image.sprite, CurrentHeadCostumeId); } else { @@ -745,7 +749,7 @@ public class UmaViewerUI : MonoBehaviour Builder.UnloadUma(); //UmaAssetManager.UnloadAllBundle(true); UmaAssetManager.PreLoadAndRun(list , delegate { - StartCoroutine(Builder.LoadUma(achara, costumeId, mini)); + StartCoroutine(Builder.LoadUma(achara, costumeId, mini, CurrentHeadCostumeId)); }); //StartCoroutine(Builder.LoadUma(achara, costumeId, mini)); } @@ -761,7 +765,8 @@ public class UmaViewerUI : MonoBehaviour //Common costumes List costumes = new List(); var nameVar = mini ? "pfb_mbdy0" : $"pfb_bdy0"; - foreach (var entry in Main.AbChara.Where(a => a.Name.Contains("/body/") && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar))) + string bodyPath = mini ? UmaDatabaseController.MiniBodyPath : UmaDatabaseController.BodyPath; + foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith(bodyPath) && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar))) { string id = Path.GetFileName(entry.Name); string[] split = id.Split('_'); @@ -780,11 +785,12 @@ public class UmaViewerUI : MonoBehaviour container.Name = container.name = GetCostumeName(id, (dressdata == null ? id : dressdata.DressName)); container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon); container.Image.enabled = true; + container.Id = costumeId; container.Button.onClick.AddListener(() => { if (LiveSelectPannel.activeInHierarchy && CurrentSeletChara) { - CurrentSeletChara.SetValue(chara, costumeId, container.Image.sprite); + CurrentSeletChara.SetValue(chara, costumeId, container.Image.sprite, CurrentHeadCostumeId); } else { @@ -802,12 +808,65 @@ public class UmaViewerUI : MonoBehaviour Builder.UnloadUma(); //UmaAssetManager.UnloadAllBundle(true); - UmaAssetManager.PreLoadAndRun(list, delegate { StartCoroutine(Builder.LoadUma(chara, costumeId, mini)); }); + UmaAssetManager.PreLoadAndRun(list, delegate { StartCoroutine(Builder.LoadUma(chara, costumeId, mini, CurrentHeadCostumeId)); }); //StartCoroutine(Builder.LoadUma(achara, costumeId, mini)); } }); } } + + if(!chara.IsMob && !mini) + { + for (int i = HeadCostumeList.content.childCount - 1; i >= 0; i--) + { + Destroy(HeadCostumeList.content.GetChild(i).gameObject); + } + CurrentHeadCostumeId = string.Empty; + nameVar = $"/pfb_chr{chara.Id}_"; + foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{chara.Id}_") && !a.Name.Contains("clothes") && a.Name.Contains(nameVar))) + { + var container = Instantiate(UmaContainerCostumePrefab, HeadCostumeList.content).GetComponent(); + string[] split = entry.Name.Split('_'); + string head_costumeId = split[split.Length - 1]; + var dressdata = Main.Costumes.FirstOrDefault(a => (a.CharaId == chara.Id && a.BodyTypeSub == int.Parse(head_costumeId))); + container.Name = container.name = GetCostumeName(head_costumeId, (dressdata == null ? head_costumeId : dressdata.DressName)); + container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon); + container.Image.enabled = true; + container.Id = head_costumeId; + container.Button.onClick.AddListener(() => + { + CurrentHeadCostumeId = head_costumeId; + if (!LiveSelectPannel.activeInHierarchy || !CurrentSeletChara) + { + HighlightChildImage(HeadCostumeList.content, container); + } + bool hasBreak = false; + foreach (var t in CostumeList.GetComponentsInChildren()) + { + if (t.ToggleImage.enabled) + { + hasBreak = true; + t.Button.onClick.Invoke(); + break; + } + else if(CurrentSeletChara && CurrentSeletChara.CostumeId == t.Id) + { + hasBreak = true; + t.Button.onClick.Invoke(); + break; + } + } + if (!hasBreak) + { + //if no costume selected, select first costume + if (CostumeList.content.childCount > 0) + { + CostumeList.content.GetChild(0).GetComponent().Button.onClick.Invoke(); + } + } + }); + } + } } void ListLiveSounds(int songid) diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 225d9f0..2923b60 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -927,7 +927,7 @@ namespace Gallop foreach (var part in updateInfo_.mouthPrev.facialPartsDataArray) { if (part.FacialPartsId == 0) { continue; } - MouthMorphs[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio)) * ((float)updateInfo_.mouthPrev.weight / 100); + MouthMorphs[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio)); } } else @@ -943,7 +943,7 @@ namespace Gallop foreach (var part in updateInfo_.mouthCur.facialPartsDataArray) { if (part.FacialPartsId == 0) { continue; } - MouthMorphs[part.FacialPartsId - 1].weight += ((float)part.WeightPer / 100 * weightRatio) * ((float)updateInfo_.mouthCur.weight / 100); + MouthMorphs[part.FacialPartsId - 1].weight += ((float)part.WeightPer / 100 * weightRatio); } ChangeMorphMouth(); diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/BezierUtil.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/BezierUtil.cs index 84e1859..66d4af4 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/BezierUtil.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/BezierUtil.cs @@ -61,7 +61,7 @@ namespace Gallop.Live.Cutt float num = 1f - t; float num2 = t * t * t * t; float num3 = 4f * t * t * t * num; - float num4 = 4f * t * t * num * num; + float num4 = 6f * t * t * num * num; float num5 = 4f * t * num * num * num; float num6 = num * num * num * num; v3.x = num2 * end.x + num3 * cp3.x + num4 * cp2.x + num5 * cp1.x + num6 * start.x; @@ -74,8 +74,8 @@ namespace Gallop.Live.Cutt float num = 1f - t; float num2 = t * t * t * t * t; float num3 = 5f * t * t * t * t * num; - float num4 = 5f * t * t * t * num * num; - float num5 = 5f * t * t * num * num * num; + float num4 = 10f * t * t * t * num * num; + float num5 = 10f * t * t * num * num * num; float num6 = 5f * t * num * num * num * num; float num7 = num * num * num * num * num; v3.x = num2 * end.x + num3 * cp4.x + num4 * cp3.x + num5 * cp2.x + num6 * cp1.x + num7 * start.x; diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineCharaLocator.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineCharaLocator.cs index bb628bb..dc4b72d 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineCharaLocator.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineCharaLocator.cs @@ -13,6 +13,8 @@ namespace Gallop.Live.Cutt public Dictionary Bones; + private LiveCharaPosition _liveCharaStandingPosition; + public LiveTimelineCharaLocator(UmaContainerCharacter umaContainer) { UmaContainer = umaContainer; @@ -36,7 +38,7 @@ namespace Gallop.Live.Cutt public bool liveCharaVisible { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public LiveCharaPosition liveCharaStandingPosition { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public LiveCharaPosition liveCharaStandingPosition { get => _liveCharaStandingPosition; set => _liveCharaStandingPosition = value; } public Vector3 liveCharaInitialPosition { get => _liveCharaInitialPosition; set => _liveCharaInitialPosition = value; } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs index 0715388..41b19e7 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineControl.cs @@ -1,11 +1,8 @@ using System; -using System.Collections; using System.Collections.Generic; using UnityEngine; -using static RootMotion.FinalIK.IKSolverVR; using System.Linq; using System.IO; -using static Gallop.Live.Cutt.LiveTimelineDefine; namespace Gallop.Live.Cutt { @@ -55,6 +52,16 @@ namespace Gallop.Live.Cutt public event Action OnUpdateCameraSwitcher; + public event GlobalLightUpdateInfoDelegate OnUpdateGlobalLight; + + public event BgColor1UpdateInfoDelegate OnUpdateBgColor1; + + public event BgColor2UpdateInfoDelegate OnUpdateBgColor2; + + public event TransformUpdateInfoDelegate OnUpdateTransform; + + public event ObjectUpdateInfoDelegate OnUpdateObject; + private static Func fnGetCameraPosValue = GetCameraPosValue; private static Func fnGetCameraLookAtValue = GetCameraLookAtValue; @@ -100,6 +107,8 @@ namespace Gallop.Live.Cutt public List> MultiRecordFrames = new List>(); public event Action RecordUma; + public Dictionary StageObjectMap = new Dictionary(); + public float currentLiveTime { get @@ -328,6 +337,11 @@ namespace Gallop.Live.Cutt AlterUpdate_CameraFov(workSheet, _currentFrame); AlterUpdate_CameraRoll(workSheet, _currentFrame); AlterUpdate_MultiCamera(workSheet, _currentFrame); + AlterUpdate_GlobalLight(workSheet, _currentFrame); + AlterUpdate_BgColor1(workSheet, _currentFrame); + AlterUpdate_TransformControl(workSheet, _currentFrame); + AlterUpdate_ObjectControl(workSheet, _currentFrame); + _isNowAlterUpdate = false; if (IsRecordVMD) @@ -362,7 +376,7 @@ namespace Gallop.Live.Cutt { foreach (var motion in _motionSequenceArray) { - motion.AlterUpdate(liveTime); + motion.AlterUpdate(liveTime, data.worksheetList[0].timescaleKeys); } } @@ -626,7 +640,23 @@ namespace Gallop.Live.Cutt if (curKey.visible || IsRecordVMD) { - if(nextKey != null && nextKey.interpolateType != LiveCameraInterpolateType.None) + if (!string.IsNullOrEmpty(curKey.ParentObjectName)) + { + var parent_transform = curKey.GetParentObjectTransform(this); + if (parent_transform) + { + if (chara.transform.parent != parent_transform) + { + chara.transform.SetParent(parent_transform); + } + } + } + else if (chara.transform.parent) + { + chara.transform.SetParent(null); + } + + if (nextKey != null && nextKey.interpolateType != LiveCameraInterpolateType.None) { float ratio = CalculateInterpolationValue(curKey, nextKey, time * 60); chara.transform.localPosition = Vector3.Lerp(curKey.Position, nextKey.Position, ratio); @@ -1561,6 +1591,209 @@ namespace Gallop.Live.Cutt } } + private void AlterUpdate_GlobalLight(LiveTimelineWorkSheet sheet, float currentFrame) { + GlobalLightUpdateInfo updateInfo = default; + int count = sheet.globalLightDataLists.Count; + for(int i = 0; i < count; i++) + { + LiveTimelineKeyGlobalLightDataList keys = sheet.globalLightDataLists[i].keys; + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) + { + continue; + } + else if (sheet.globalLightDataLists[i].name != "GlobalLight") + { + continue; + } + FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); + if (curKey != null) + { + LiveTimelineKeyGlobalLightData lightData = curKey as LiveTimelineKeyGlobalLightData; + LiveTimelineKeyGlobalLightData lightData2 = nextKey as LiveTimelineKeyGlobalLightData; + Quaternion quaternion = Quaternion.identity; + if (lightData.cameraFollow) + { + quaternion = GetCamera(sheet.targetCameraIndex).cacheTransform.rotation; + } + updateInfo.flags = lightData.flags; + if (lightData2 != null && lightData2.interpolateType != 0) + { + float ratio = CalculateInterpolationValue(lightData, lightData2, currentFrame); + Quaternion a = Quaternion.Euler(lightData.lightDir); + Quaternion b = Quaternion.Euler(lightData2.lightDir); + updateInfo.lightRotation = Quaternion.Lerp(a, b, ratio) * quaternion; + updateInfo.globalRimShadowRate = LerpWithoutClamp(lightData.globalRimShadowRate, lightData2.globalRimShadowRate, ratio); + updateInfo.rimColor = Color.Lerp(lightData.rimColor, lightData2.rimColor, ratio); + updateInfo.rimStep = LerpWithoutClamp(lightData.rimStep, lightData2.rimStep, ratio); + updateInfo.rimFeather = LerpWithoutClamp(lightData.rimFeather, lightData2.rimFeather, ratio); + updateInfo.rimSpecRate = LerpWithoutClamp(lightData.rimSpecRate, lightData2.rimSpecRate, ratio); + updateInfo.flags = lightData2.flags; + updateInfo.RimHorizonOffset = LerpWithoutClamp(lightData.RimHorizonOffset, lightData2.RimHorizonOffset, ratio); + updateInfo.RimVerticalOffset = LerpWithoutClamp(lightData.RimVerticalOffset, lightData2.RimVerticalOffset, ratio); + updateInfo.RimHorizonOffset2 = LerpWithoutClamp(lightData.RimHorizonOffset2, lightData2.RimHorizonOffset2, ratio); + updateInfo.RimVerticalOffset2 = LerpWithoutClamp(lightData.RimVerticalOffset2, lightData2.RimVerticalOffset2, ratio); + updateInfo.rimColor2 = Color.Lerp(lightData.rimColor2, lightData2.rimColor2, ratio); + updateInfo.rimStep2 = LerpWithoutClamp(lightData.rimStep2, lightData2.rimStep2, ratio); + updateInfo.rimFeather2 = LerpWithoutClamp(lightData.rimFeather2, lightData2.rimFeather2, ratio); + updateInfo.rimSpecRate2 = LerpWithoutClamp(lightData.rimSpecRate2, lightData2.rimSpecRate2, ratio); + updateInfo.globalRimShadowRate2 = LerpWithoutClamp(lightData.globalRimShadowRate2, lightData2.globalRimShadowRate2, ratio); + } + else + { + updateInfo.lightRotation = Quaternion.Euler(lightData.lightDir) * quaternion; + updateInfo.globalRimShadowRate = lightData.globalRimShadowRate; + updateInfo.rimColor = lightData.rimColor; + updateInfo.rimStep = lightData.rimStep; + updateInfo.rimFeather = lightData.rimFeather; + updateInfo.rimSpecRate = lightData.rimSpecRate; + updateInfo.flags = lightData.flags; + updateInfo.RimHorizonOffset = lightData.RimHorizonOffset; + updateInfo.RimVerticalOffset = lightData.RimVerticalOffset; + updateInfo.RimHorizonOffset2 = lightData.RimHorizonOffset2; + updateInfo.RimVerticalOffset2 = lightData.RimVerticalOffset2; + updateInfo.rimColor2 = lightData.rimColor2; + updateInfo.rimStep2 = lightData.rimStep2; + updateInfo.rimFeather2 = lightData.rimFeather2; + updateInfo.rimSpecRate2 = lightData.rimSpecRate2; + updateInfo.globalRimShadowRate2 = lightData.globalRimShadowRate2; + } + OnUpdateGlobalLight.Invoke(ref updateInfo); + } + } + } + + private HashSet validBgColorNames = new HashSet { "CharaCenter", "CharaLeft", "CharaRight", "CharaColor" }; + + private void AlterUpdate_BgColor1(LiveTimelineWorkSheet sheet, float currentFrame) { + int count = sheet.bgColor1List.Count; + + for (int i = 0; i < count; i++) + { + LiveTimelineKeyBgColor1DataList keys = sheet.bgColor1List[i].keys; + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) + { + continue; + } + else if (!validBgColorNames.Contains(sheet.bgColor1List[i].name)) + { + continue; + } + FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); + if (curKey == null) + { + continue; + } + BgColor1UpdateInfo updateInfo = default; + LiveTimelineKeyBgColor1Data bgColorData = curKey as LiveTimelineKeyBgColor1Data; + LiveTimelineKeyBgColor1Data bgColorData2 = nextKey as LiveTimelineKeyBgColor1Data; + if (bgColorData2 != null && bgColorData2.interpolateType != 0) + { + float t = CalculateInterpolationValue(bgColorData, bgColorData2, currentFrame); + updateInfo.flags = bgColorData.flags; + updateInfo.color = Color.Lerp(bgColorData.color, bgColorData2.color, t); + updateInfo.toonDarkColor = Color.Lerp(bgColorData.toonDarkColor, bgColorData2.toonDarkColor, t); + updateInfo.toonBrightColor = Color.Lerp(bgColorData.toonBrightColor, bgColorData2.toonBrightColor, t); + updateInfo.outlineColor = Color.Lerp(bgColorData.outlineColor, bgColorData2.outlineColor, t); + updateInfo.outlineColorBlend = bgColorData.outlineColorBlend; + updateInfo.Saturation = LerpWithoutClamp(bgColorData.Saturation, bgColorData2.Saturation, t); + } + else + { + updateInfo.flags = bgColorData.flags; + updateInfo.color = bgColorData.color; + updateInfo.toonDarkColor = bgColorData.toonDarkColor; + updateInfo.toonBrightColor = bgColorData.toonBrightColor; + updateInfo.outlineColor = bgColorData.outlineColor; + updateInfo.outlineColorBlend = bgColorData.outlineColorBlend; + updateInfo.Saturation = bgColorData.Saturation; + } + OnUpdateBgColor1.Invoke(ref updateInfo); + } + } + + private void AlterUpdate_TransformControl(LiveTimelineWorkSheet sheet, float currentFrame) + { + int count = sheet.transformList.Count; + for (int i = 0; i < count; i++) + { + var keys = sheet.transformList[i].keys; + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) + { + continue; + } + FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); + if (curKey == null) + { + continue; + } + TransformUpdateInfo updateInfo = default; + updateInfo.data = sheet.transformList[i]; + LiveTimelineKeyTransformData transformData = curKey as LiveTimelineKeyTransformData; + LiveTimelineKeyTransformData transformData2 = nextKey as LiveTimelineKeyTransformData; + if (transformData2 != null && transformData2.interpolateType != 0) + { + float t = CalculateInterpolationValue(transformData, transformData2, currentFrame); + updateInfo.updateData.position = Vector3.Lerp(transformData.position, transformData2.position, t); + updateInfo.updateData.rotation = Quaternion.Lerp(Quaternion.Euler(transformData.rotate), Quaternion.Euler(transformData2.rotate), t); + updateInfo.updateData.scale = Vector3.Lerp(transformData.scale, transformData2.scale, t); + } + else + { + updateInfo.updateData.position = transformData.position; + updateInfo.updateData.rotation = Quaternion.Euler(transformData.rotate); + updateInfo.updateData.scale = transformData.scale; + } + OnUpdateTransform.Invoke(ref updateInfo); + } + } + + private void AlterUpdate_ObjectControl(LiveTimelineWorkSheet sheet, float currentFrame) + { + int count = sheet.objectList.Count; + for (int i = 0; i < count; i++) + { + var keys = sheet.objectList[i].keys; + if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode)) + { + continue; + } + else if (!StageObjectMap.ContainsKey(sheet.objectList[i].name)) + { + continue; + } + FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame); + if (curKey == null) + { + continue; + } + ObjectUpdateInfo updateInfo = default; + LiveTimelineKeyObjectData objectData = curKey as LiveTimelineKeyObjectData; + LiveTimelineKeyObjectData objectData2 = nextKey as LiveTimelineKeyObjectData; + if (objectData2 != null && objectData2.interpolateType != 0) + { + float t = CalculateInterpolationValue(objectData, objectData2, currentFrame); + updateInfo.updateData.position = Vector3.Lerp(objectData.position, objectData2.position, t); + updateInfo.updateData.rotation = Quaternion.Lerp(Quaternion.Euler(objectData.rotate), Quaternion.Euler(objectData2.rotate), t); + updateInfo.updateData.scale = Vector3.Lerp(objectData.scale, objectData2.scale, t); + } + else + { + updateInfo.updateData.position = objectData.position; + updateInfo.updateData.rotation = Quaternion.Euler(objectData.rotate); + updateInfo.updateData.scale = objectData.scale; + } + updateInfo.data = sheet.objectList[i]; + updateInfo.renderEnable = objectData.renderEnable; + updateInfo.AttachTarget = objectData.AttachTarget; + updateInfo.CharacterPosition = objectData.CharacterPosition; + updateInfo.MultiCameraIndex = objectData.MultiCameraIndex; + updateInfo.OffsetType = objectData.OffsetValueType; + updateInfo.LayerType = objectData.LayerTypeValue; + updateInfo.IsLayerTypeRecursively = objectData.IsLayerTypeRecursively; + OnUpdateObject.Invoke(ref updateInfo); + } + } + private static float LerpWithoutClamp(float a, float b, float t) { return a + (b - a) * t; diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor1Data.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor1Data.cs index 1011b1b..b5725cc 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor1Data.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor1Data.cs @@ -1,6 +1,8 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; namespace Gallop.Live.Cutt { @@ -13,7 +15,71 @@ namespace Gallop.Live.Cutt Max = 4 } - [System.Serializable] + [Serializable] + public class LiveTimelineKeyBgColor1Data : LiveTimelineKeyWithInterpolate + { + // Fields + public Color color; // 0x2c + public float power; // 0x3c + public float scale; // 0x40 + public int flags; // 0x44 + public ColorType ColorType; // 0x48 + public float Saturation; // 0x4c + public Color toonDarkColor; // 0x50 + public Color toonBrightColor; // 0x60 + public float vertexColorToonPower; // 0x70 + public float outlineWidthPower; // 0x74 + public Color outlineColor; // 0x78 + public OutlineColorBlend outlineColorBlend; // 0x88 + public LightBlendMode LightBlendMode; // 0x8c + public bool IsProjector; // 0x90 + public string BlinkLightName; // 0x98 + public int BlinkLightNameHash; // 0xa0 + public int BlinkLightContainerIndex; // 0xa4 + public float BlinkLightBrightnessPower; // 0xa8 + public bool IsAdjustedBlinkLightColor; // 0xac + public LiveTimelineKeyLoopType loopType; // 0xb0 + public int loopCount; // 0xb4 + public int loopExecutedCount; // 0xb8 + public int loopIntervalFrame; // 0xbc + public bool isPasteLoopUnit; // 0xc0 + public bool isChangeLoopInterpolate; // 0xc1 + public float f32; // 0xc4 + public LiveTimelineKeyLoopType _loopType; // 0xc8 + public int _loopCount; // 0xcc + public int _loopExecutedCount; // 0xd0 + public int _loopIntervalFrame; // 0xd4 + public bool _isChangeLoopInterpolate; // 0xd8 + //private const Int32 ATTR_SILHOUETTE; // 0x0 + //private const Int32 ATTR_SYNC_BLINKLIGHT; // 0x0 + + public bool IsSilhouette { get; set; } + public bool IsSyncBlinkLight { get; set; } + + } + + [Serializable] + public class LiveTimelineKeyBgColor1DataList : LiveTimelineKeyDataListTemplate + { + + } + + [Serializable] + public class LiveTimelineBgColor1Data : ILiveTimelineGroupDataWithName + { + // Fields + private const string DEFAULT_NAME = "BgColor1"; // 0x0 + public LiveTimelineKeyBgColor1DataList keys; // 0x28 + private int[] _targetCharaIdArray; // 0x30 + private int[] _targetDressIdArray; // 0x38 + + // Properties + public int[] TargetCharaIdArray { get; } + public int[] TargetDressIdArray { get; } + + } + + [Serializable] public class ILiveTimelineGroupDataWithName : ILiveTimelineGroupData { public string name; diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs new file mode 100644 index 0000000..836ae5c --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyBgColor2Data : LiveTimelineKeyWithInterpolate + { + // Fields + public Color color1; // 0x2c + public Color color2; // 0x3c + public float power; // 0x4c + public string BlinkLightName; // 0x50 + public int BlinkLightNameHash; // 0x58 + public int BlinkLightContainerIndex; // 0x5c + public float BlinkLightBrightnessPower; // 0x60 + public bool IsSyncBlinkLightToColor1; // 0x64 + public bool IsSyncBlinkLightToColor2; // 0x65 + public bool IsAdjustedBlinkLightColor; // 0x66 + public LiveTimelineKeyLoopType loopType; // 0x68 + public int loopCount; // 0x6c + public int loopExecutedCount; // 0x70 + public int loopIntervalFrame; // 0x74 + public bool isPasteLoopUnit; // 0x78 + public bool isChangeLoopInterpolate; // 0x79 + public float f32; // 0x7c + public LiveTimelineKeyLoopType _loopType; // 0x80 + public int _loopCount; // 0x84 + public int _loopExecutedCount; // 0x88 + public int _loopIntervalFrame; // 0x8c + public bool _isChangeLoopInterpolate; // 0x90 + + } + + [Serializable] + public class LiveTimelineKeyBgColor2DataList : LiveTimelineKeyDataListTemplate + { + + } + + [Serializable] + public class LiveTimelineBgColor2Data : ILiveTimelineGroupDataWithName + { + // Fields + private const string DEFAULT_NAME = "BgColor2"; // 0x0 + public LiveTimelineKeyBgColor1DataList keys; // 0x28 + } +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs.meta new file mode 100644 index 0000000..655ea71 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineBgColor2Data.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 642bf32136ecd1740bff1df8e635cc20 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineFormationOffsetData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineFormationOffsetData.cs index 9347415..90ab905 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineFormationOffsetData.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineFormationOffsetData.cs @@ -1,6 +1,8 @@ using Gallop.Live.Cutt; +using System; using System.Collections; using System.Collections.Generic; +using System.Security.Cryptography; using UnityEngine; namespace Gallop.Live.Cutt @@ -100,6 +102,22 @@ namespace Gallop.Live.Cutt private bool _isUpdatedParentObject; private Transform _parentObjectTransform; private int _parentObjectTargetCount; + + public Transform GetParentObjectTransform(LiveTimelineControl liveTimelineControl) + { + if (_parentObjectTransform != null) + { + return _parentObjectTransform; + } + + if (liveTimelineControl.StageObjectMap.TryGetValue(ParentObjectName, out GameObject gameObject)) + { + _parentObjectTransform = gameObject.transform; + return _parentObjectTransform; + } + + return null; + } } [System.Serializable] diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs new file mode 100644 index 0000000..752715d --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs @@ -0,0 +1,60 @@ +锘縰sing System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyGlobalLightData : LiveTimelineKeyWithInterpolate + { + // Static field + public static readonly Color DefaultRimColor; + + // Public fields + public Vector3 lightDir; + public Color rimColor; + public float rimStep; + public float rimFeather; + public float rimSpecRate; + public float globalRimShadowRate; + public bool cameraFollow; + public float RimHorizonOffset; + public float RimVerticalOffset; + public float RimHorizonOffset2; + public float RimVerticalOffset2; + public Color rimColor2; + public float rimStep2; + public float rimFeather2; + public float rimSpecRate2; + public float globalRimShadowRate2; + public LiveCharaPositionFlag flags; + public string BlinkLightName; + public int BlinkLightNameHash; + public int BlinkLightContainerIndex; + public LiveTimelineKeyLoopType loopType; + public int loopCount; + public int loopExecutedCount; + public int loopIntervalFrame; + public bool isPasteLoopUnit; + public bool isChangeLoopInterpolate; + + // Properties + public bool IsSyncBlinkLightToRimColor { get; set; } + public bool IsSyncBlinkLightToRimColor2 { get; set; } + } + + [Serializable] + public class LiveTimelineKeyGlobalLightDataList : LiveTimelineKeyDataListTemplate + { + + } + + [Serializable] + public class LiveTimelineGlobalLightData : ILiveTimelineGroupDataWithName + { + private const string default_name = "GlobalLight"; + public LiveTimelineKeyGlobalLightDataList keys; + } +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs.meta new file mode 100644 index 0000000..6b9120b --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineGlobalLightData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcf99bb4db6442b42ace13bc95add694 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineObjectData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineObjectData.cs index 83889ea..be90a43 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineObjectData.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineObjectData.cs @@ -1,3 +1,6 @@ +using System; +using UnityEngine; + namespace Gallop.Live.Cutt { public enum LiveCharaPosition @@ -28,4 +31,58 @@ namespace Gallop.Live.Cutt Right = 2, CharacterMax = 17 } + + public enum AttachType + { + None = 0, + Camera = 1, + Character = 2, + } + + public enum OffsetType + { + Direct = 0, + Add = 1, + } + + + public enum LayerType + { + None = 0, + Normal = 1, + NotReflect = 2, + Projector = 3, + } + + [Serializable] + public class LiveTimelineKeyObjectDataList : LiveTimelineKeyDataListTemplate + { + + } + + [Serializable] + public class LiveTimelineKeyObjectData : LiveTimelineKeyWithInterpolate + { + public Vector3 position; + public Vector3 rotate; + public Vector3 scale; + public bool renderEnable; + public AttachType AttachTarget; + public int CharacterPosition; + public int MultiCameraIndex; + public OffsetType OffsetValueType; + public LayerType LayerTypeValue; + public bool IsLayerTypeRecursively; + } + + [Serializable] + public class LiveTimelineObjectData : ILiveTimelineGroupDataWithName + { + // Fields + private const string default_name = "Object"; + public LiveTimelineKeyObjectDataList keys; + public bool enablePosition; + public bool enableRotate; + public bool enableScale; + } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs new file mode 100644 index 0000000..e761399 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs @@ -0,0 +1,30 @@ +using System; +using UnityEngine; + +namespace Gallop.Live.Cutt +{ + [Serializable] + public class LiveTimelineKeyTransformDataList : LiveTimelineKeyDataListTemplate + { + + } + + [Serializable] + public class LiveTimelineKeyTransformData : LiveTimelineKeyWithInterpolate + { + public Vector3 position; + public Vector3 rotate; + public Vector3 scale; + } + + [Serializable] + public class LiveTimelineTransformData : ILiveTimelineGroupDataWithName + { + private const string default_name = "Transform"; + public LiveTimelineKeyTransformDataList keys; + public bool enablePosition; + public bool enableRotate; + public bool enableScale; + } +} + diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs.meta new file mode 100644 index 0000000..7caaced --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDataList/LiveTimelineTransformData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 802d655b98ea2e94ebf22b8c396babd1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDefine.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDefine.cs index b315c84..49e3201 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDefine.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineDefine.cs @@ -1,14 +1,15 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; namespace Gallop.Live.Cutt { - public class LiveTimelineDefine : MonoBehaviour - { - public enum FacialId - { - Base = 1001, + public class LiveTimelineDefine : MonoBehaviour + { + public enum FacialId + { + Base = 1001, WinkR = 1002, WinkL = 1003, EyeHalfA = 1004, @@ -405,6 +406,150 @@ namespace Gallop.Live.Cutt Up = 1, Down = 2 } - } + + public enum OutlineColorBlend + { + Blend = 0, + Multiply = 1, + Max = 2 + } + + public enum LightBlendMode + { + Addition = 0, + Multiply = 1, + SoftAddition = 2, + AlphaBlend = 3, + Multiply0 = 4, + Multiply2x = 5, + } + + public enum ColorType + { + Main = 0, + Sub = 1, + Training1 = 2, + Training2 = 3, + Border = 4, + Num1 = 5, + Num2 = 6, + Turn = 7, + Wipe1 = 8, + Wipe2 = 9, + Wipe3 = 10, + Speech1 = 11, + Nameplate1 = 12, + Nameplate2 = 13, + Speech2 = 14 + } + + public enum LiveTimelineKeyDataType + { + Timescale = 0, + CameraPos = 1, + CameraLookAt = 2, + CameraFov = 3, + CameraRoll = 4, + HandShakeCamera = 5, + Event = 6, + CharaMotionSequence = 7, + BgColor1 = 8, + BgColor2 = 9, + MonitorControl = 10, + CameraSwitcher = 11, + LipSync = 12, + PostEffectDOF = 13, + PostEffectBloomDiffusion = 14, + RadialBlur = 15, + CameraLayer = 16, + Projector = 17, + FacialFace = 18, + FacialMouth = 19, + FacialCheek = 20, + FacialEye = 21, + FacialEyebrow = 22, + FacialEyeTrack = 23, + FacialEar = 24, + FacialEffect = 25, + FacialNoise = 26, + CharaMotionNoise = 27, + FormationOffset = 28, + Animation = 29, + TextureAnimation = 30, + Transform = 31, + Renderer = 32, + Object = 33, + Audience = 34, + Props = 35, + PropsAttach = 36, + VolumeLight = 37, + HdrBloom = 38, + PostFilm = 39, + Fade = 40, + Particle = 41, + ParticleGroup = 42, + WashLight = 43, + Laser = 44, + BlinkLight = 45, + UVScrollLight = 46, + FacialToon = 47, + GlobalLight = 48, + GlobalFog = 49, + LightShafts = 50, + MonitorCameraPos = 51, + MonitorCameraLookAt = 52, + MultiCameraPos = 53, + MultiCameraLookAt = 54, + EyeCameraPos = 55, + EyeCameraLookAt = 56, + LensFlare = 57, + Environment = 58, + SweatLocator = 59, + Effect = 60, + ColorCorrection = 61, + PreColorCorrection = 62, + TiltShift = 63, + A2U = 64, + A2UConfig = 65, + FlashPlayer = 66, + Title = 67, + Spotlight3d = 68, + CharaNode = 69, + NodeScale = 70, + Fluctuation = 71, + CharaFootLight = 72, + ChromaticAberration = 73, + LightProjection = 74, + Billboard = 75, + MultiCameraPostFilm = 76, + MultiCameraPostEffectBloomDiffusion = 77, + MultiCameraColorCorrection = 78, + MultiCameraTiltShift = 79, + MultiCameraRadialBlur = 80, + MultiCameraPostEffectDOF = 81, + AdditionalLight = 82, + MultiLightShadow = 83, + MobControl = 84, + CyalumeControl = 85, + CameraMotion = 86, + WaveObject = 87, + CharaWind = 88, + CharaParts = 89, + CameraCutNo = 90, + ToneCurve = 91, + Exposure = 92, + Vortex = 93, + CharaCollision = 94, + TransmittedLight = 95, + TransmittedLightMask = 96, + Voice = 97, + LipSyncPatternRange = 98, + LipSyncPattern = 99, + LensDistortion = 100, + CharaNodeOffset = 101, + TransparentCamera = 102, + Max = 103 + } + } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs index f7bc156..fbc0346 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -82,7 +83,7 @@ namespace Gallop.Live.Cutt _tempAnim.enabled = false; } - public void AlterUpdate(float currentTime) + public void AlterUpdate(float currentTime, LiveTimelineKeyTimescaleDataList timescaleKeys) { var director = Director.instance; if (Director.instance.liveMode == 0) @@ -122,7 +123,34 @@ namespace Gallop.Live.Cutt { start = (double)arg.motionHeadFrameSeparetes[charaIndex] / 60; } - double interval = (currentTime - arg.FrameSecond) * arg.playSpeed; + + double interval = 0; + double last_current_time = currentTime; + if (timescaleKeys.thisList.Count > 0) + { + // apply timescale keys + for (int i = timescaleKeys.thisList.Count - 1; i >= 0; i--) + { + var scaleKey = timescaleKeys.thisList[i]; + if (scaleKey.FrameSecond <= currentTime) + { + if (scaleKey.FrameSecond <= arg.FrameSecond) + { + interval += (last_current_time - arg.FrameSecond) * scaleKey.Timescale * arg.playSpeed; + break; + } + else + { + interval += (last_current_time - scaleKey.FrameSecond) * scaleKey.Timescale * arg.playSpeed; + last_current_time = scaleKey.FrameSecond; + } + } + } + } + else + { + interval = (currentTime - arg.FrameSecond) * arg.playSpeed; + } float currentAnimationTime = (float)(start + interval); if (anim) diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs index 79b9a04..0f09e7b 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; namespace Gallop.Live.Cutt { @@ -603,6 +604,8 @@ namespace Gallop.Live.Cutt public int frame; public LiveTimelineKeyAttribute attribute; + public LiveTimelineKeyDataType dataType; + private double _framesecond = -999; public double FrameSecond { @@ -625,9 +628,14 @@ namespace Gallop.Live.Cutt public LiveTimelineEasing.Type easingType; } + [Serializable] + public class LiveTimelineKeyTimescaleData : LiveTimelineKey + { + public float Timescale; + } - //正在处理这里 - [System.Serializable] +//正在处理这里 +[System.Serializable] public class LiveTimelineKeyCameraPositionData : LiveTimelineKeyWithInterpolate { public LiveCameraPositionType setType; @@ -874,6 +882,12 @@ namespace Gallop.Live.Cutt public delegate void CameraPosUpdateInfoDelegate(ref CameraPosUpdateInfo updateInfo); + [Serializable] + public class LiveTimelineKeyTimescaleDataList : LiveTimelineKeyDataListTemplate + { + public bool _isCheckSameFrame; + } + [System.Serializable] public class LiveTimelineKeyCameraPositionDataList : LiveTimelineKeyDataListTemplate { @@ -896,6 +910,7 @@ namespace Gallop.Live.Cutt public float TotalTimeLength; public bool Lyrics; public LiveTimelineDefine.SheetIndex SheetType; + [SerializeField] public LiveTimelineKeyTimescaleDataList timescaleKeys; [SerializeField] public LiveTimelineKeyCameraPositionDataList cameraPosKeys; [SerializeField] public List multiCameraPosKeys; [SerializeField] public List multiCameraLookAtKeys; @@ -915,6 +930,13 @@ namespace Gallop.Live.Cutt [SerializeField] public LiveTimelineFacialData[] other4FacialArray; [SerializeField] public LiveTimelineFormationOffsetData formationOffsetSet; + [SerializeField] public List globalLightDataLists; + [SerializeField] public List bgColor1List; + [SerializeField] public List bgColor2List; + + [SerializeField] public List transformList; + [SerializeField] public List objectList; + /* //终于可以调用AB包了,虽然后面发现没什么用...说不定什么时候能用到 private void Start() diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs new file mode 100644 index 0000000..36bbf0d --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; + +namespace Gallop.Live.Cutt +{ + public struct BgColor1UpdateInfo + { + // Fields + public int TimelineNameHash; // 0x10 + public int[] TargetCharaIdArray; // 0x18 + public int[] TargetDressIdArray; // 0x20 + public Color color; // 0x28 + public float colorPower; // 0x38 + public float scale; // 0x3c + public float Saturation; // 0x40 + public int flags; // 0x44 + public Color toonDarkColor; // 0x48 + public Color toonBrightColor; // 0x58 + public float vertexColorToonPower; // 0x68 + public float outlineWidthPower; // 0x6c + public Color outlineColor; // 0x70 + public OutlineColorBlend outlineColorBlend; // 0x80 + public LightBlendMode LightBlendMode; // 0x84 + public bool IsSilhouette; // 0x88 + public bool IsProjector; // 0x89 + public ColorType CurrentColorType; // 0x8c + public Color CurrentColor; // 0x90 + public int CurrentFlags; // 0xa0 + public ColorType NextColorType; // 0xa4 + public Color NextColor; // 0xa8 + public int NextFlags; // 0xb8 + public float InterpolateRatio; // 0xbc + public bool IsSyncBlinkLight; // 0xc0 + public bool IsSyncBlinkLightNext; // 0xc1 + public bool IsAdjustedBlinkLightColor; // 0xc2 + public int BlinkLightNameHash; // 0xc4 + public int BlinkLightContainerIndex; // 0xc8 + public float BlinkLightBrightnessPower; // 0xcc + } + + public delegate void BgColor1UpdateInfoDelegate(ref BgColor1UpdateInfo updateInfo); + + public struct BgColor2UpdateInfo + { + // Fields + public int TimelineNameHash; // 0x10 + public Color color1; // 0x14 + public Color color2; // 0x24 + public float value; // 0x34 + public int rndValueIdx; // 0x38 + } + + public delegate void BgColor2UpdateInfoDelegate(ref BgColor2UpdateInfo updateInfo); +} \ No newline at end of file diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs.meta new file mode 100644 index 0000000..0e88025 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/BgColorUpdateInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2fd7f5ece3508c74eb2a0f0c003367ab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/FacialDataUpdateInfo.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/FacialDataUpdateInfo.cs similarity index 100% rename from Assets/Scripts/umamusume/Gallop/Live/Cutt/FacialDataUpdateInfo.cs rename to Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/FacialDataUpdateInfo.cs diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/FacialDataUpdateInfo.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/FacialDataUpdateInfo.cs.meta similarity index 83% rename from Assets/Scripts/umamusume/Gallop/Live/Cutt/FacialDataUpdateInfo.cs.meta rename to Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/FacialDataUpdateInfo.cs.meta index 279ae0a..7333d98 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/FacialDataUpdateInfo.cs.meta +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/FacialDataUpdateInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d23729e48867d7143b85da3439885191 +guid: 4cc8fc1d38ab89c46973d235c8a6e42c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs new file mode 100644 index 0000000..6e590c7 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Gallop.Live.Cutt +{ + public struct GlobalLightUpdateInfo + { + // Fields + public Quaternion lightRotation; // 0x10 + public float globalRimShadowRate; // 0x20 + public Color rimColor; // 0x24 + public float rimStep; // 0x34 + public float rimFeather; // 0x38 + public float rimSpecRate; // 0x3c + public LiveCharaPositionFlag flags; // 0x40 + public float RimHorizonOffset; // 0x44 + public float RimVerticalOffset; // 0x48 + public float RimHorizonOffset2; // 0x4c + public float RimVerticalOffset2; // 0x50 + public Color rimColor2; // 0x54 + public float rimStep2; // 0x64 + public float rimFeather2; // 0x68 + public float rimSpecRate2; // 0x6c + public float globalRimShadowRate2; // 0x70 + } + + public delegate void GlobalLightUpdateInfoDelegate(ref GlobalLightUpdateInfo updateInfo); +} \ No newline at end of file diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs.meta new file mode 100644 index 0000000..e6dca40 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/GlobalLightUpdateInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a7b4156d6854f014dacbd5accca6ca40 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs new file mode 100644 index 0000000..5db57bb --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; + +namespace Gallop.Live.Cutt +{ + public struct TransformBaseData + { + public Vector3 position; + public Quaternion rotation; + public Vector3 scale; + } + + public struct ObjectUpdateInfo + { + public LiveTimelineObjectData data; + public TransformBaseData updateData; + public bool renderEnable; + public AttachType AttachTarget; + public int CharacterPosition; + public int MultiCameraIndex; + public OffsetType OffsetType; + public LayerType LayerType; + public bool IsLayerTypeRecursively; + } + + public delegate void ObjectUpdateInfoDelegate(ref ObjectUpdateInfo updateInfo); +} diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs.meta new file mode 100644 index 0000000..88671e2 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/ObjectUpdateInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 236ab682e89d7904ea32d67bdac14a31 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs new file mode 100644 index 0000000..f191074 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using static Gallop.Live.Cutt.LiveTimelineDefine; + +namespace Gallop.Live.Cutt +{ + public struct TransformUpdateInfo + { + public LiveTimelineTransformData data; + public TransformBaseData updateData; + } + + public delegate void TransformUpdateInfoDelegate(ref TransformUpdateInfo updateInfo); +} \ No newline at end of file diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs.meta b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs.meta new file mode 100644 index 0000000..3840b8c --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/UpdateInfo/TransformUpdateInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b66324f884c18d1488c452817ef4ed06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index ddd1efe..4d9d44e 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -104,6 +104,7 @@ namespace Gallop.Live { Debug.Log(live.BackGroundId); Builder.LoadAssetPath(string.Format(STAGE_PATH, live.BackGroundId), transform); + _liveTimelineControl.StageObjectMap = _stageController.StageObjectMap; } //Make CharacterObject @@ -187,6 +188,7 @@ namespace Gallop.Live } } }; + _liveTimelineControl.OnUpdateFacial += delegate (FacialDataUpdateInfo updateInfo_, float liveTime_, int position) { if (position < charaObjs.Count) @@ -195,6 +197,71 @@ namespace Gallop.Live container.FaceDrivenKeyTarget.AlterUpdateFacialNew(ref updateInfo_, liveTime_); } }; + + _liveTimelineControl.OnUpdateGlobalLight += delegate (ref GlobalLightUpdateInfo updateInfo) + { + var tmpPos = -(updateInfo.lightRotation * Vector3.forward).normalized; + foreach (var locator in _liveTimelineControl.liveCharactorLocators) + { + if (locator != null && updateInfo.flags.hasFlag(locator.liveCharaStandingPosition) && locator is LiveTimelineCharaLocator charaLocator) + { + var container = charaLocator.UmaContainer; + if (container) + { + MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock(); + propertyBlock.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate); + propertyBlock.SetColor("_RimColor", updateInfo.rimColor); + propertyBlock.SetFloat("_RimStep", updateInfo.rimStep); + propertyBlock.SetFloat("_RimFeather", updateInfo.rimFeather); + propertyBlock.SetFloat("_RimSpecRate", updateInfo.rimSpecRate); + propertyBlock.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset); + propertyBlock.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset); + propertyBlock.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2); + propertyBlock.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2); + propertyBlock.SetColor("_RimColor2", updateInfo.rimColor2); + propertyBlock.SetFloat("_RimStep2", updateInfo.rimStep2); + propertyBlock.SetFloat("_RimFeather2", updateInfo.rimFeather2); + propertyBlock.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2); + propertyBlock.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2); + foreach (var renderer in container.Renderers) + { + renderer.SetPropertyBlock(propertyBlock); + foreach(var mat in renderer.materials) + { + mat.SetFloat("_UseOriginalDirectionalLight", 1); + mat.SetVector("_OriginalDirectionalLightDir", tmpPos); + } + } + } + } + } + }; + + _liveTimelineControl.OnUpdateBgColor1 += delegate (ref BgColor1UpdateInfo updateInfo) + { + foreach (var locator in _liveTimelineControl.liveCharactorLocators) + { + var EFlags = (LiveCharaPositionFlag)updateInfo.flags; + if (locator != null && (updateInfo.flags == 0 || EFlags.hasFlag(locator.liveCharaStandingPosition)) && locator is LiveTimelineCharaLocator charaLocator) + { + var container = charaLocator.UmaContainer; + if (container) + { + MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock(); + propertyBlock.SetColor("_CharaColor", updateInfo.color); + propertyBlock.SetColor("_ToonDarkColor", updateInfo.toonDarkColor); + propertyBlock.SetColor("_ToonBrightColor", updateInfo.toonBrightColor); + propertyBlock.SetColor("_OutlineColor", updateInfo.outlineColor); + propertyBlock.SetFloat("_Saturation", updateInfo.Saturation); + foreach (var renderer in container.Renderers) + { + renderer.SetPropertyBlock(propertyBlock); + } + } + } + } + }; + SetupCharacterLocator(); InitializeCamera(); UpdateMainCamera(); @@ -284,6 +351,7 @@ namespace Gallop.Live { var container = CharaContainerScript[i]; container.LiveLocator = new LiveTimelineCharaLocator(container); + container.LiveLocator.liveCharaStandingPosition = (LiveCharaPosition)i; _liveTimelineControl.liveCharactorLocators[i] = container.LiveLocator; container.LiveLocator.liveCharaInitialPosition = container.transform.position; } diff --git a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs index 63301bc..fa016bd 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/StageController.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/StageController.cs @@ -1,3 +1,4 @@ +using Gallop.Live.Cutt; using System; using System.Collections.Generic; using UnityEngine; @@ -5,9 +6,21 @@ using UnityEngine; namespace Gallop.Live { + [Serializable] + public class StageObjectUnit + { + public string UnitName; + public GameObject[] ChildObjects; + public string[] _childObjectNames; + } + public class StageController : MonoBehaviour { public List _stageObjects; + public StageObjectUnit[] _stageObjectUnits; + public Dictionary StageObjectUnitMap = new Dictionary(); + public Dictionary StageObjectMap = new Dictionary(); + public Dictionary StageParentMap = new Dictionary(); private void Awake() { @@ -15,6 +28,17 @@ namespace Gallop.Live if (Director.instance) { Director.instance._stageController = this; + Director.instance._liveTimelineControl.OnUpdateTransform += UpdateTransform; + Director.instance._liveTimelineControl.OnUpdateObject += UpdateObject; + } + } + + private void OnDestroy() + { + if (Director.instance) + { + Director.instance._liveTimelineControl.OnUpdateTransform -= UpdateTransform; + Director.instance._liveTimelineControl.OnUpdateObject -= UpdateObject; } } @@ -22,7 +46,112 @@ namespace Gallop.Live { foreach (GameObject stage_part in _stageObjects) { - Instantiate(stage_part, transform); + var instance = Instantiate(stage_part, transform); + foreach (var child in instance.GetComponentsInChildren(true)) + { + if (!StageObjectMap.ContainsKey(child.name)) + { + if (child.name.Contains("light")) + { + // Since the parsing of light material keyframes has been implemented + // Directly displaying the light will block the view + // Therefore, the light's GameObject is hidden here first + // TODO: Remove this after implementing light parsing + child.gameObject.SetActive(false); + continue; + } + var tmp_name = child.name.Replace("(Clone)", ""); + StageObjectMap.Add(tmp_name, child.gameObject); + StageParentMap.TryAdd(tmp_name, child.gameObject.transform.parent); + } + } + } + + foreach (var unit in _stageObjectUnits) + { + if (!StageObjectUnitMap.ContainsKey(unit.UnitName)) + { + StageObjectUnitMap.Add(unit.UnitName, unit); + } + } + } + + public void UpdateObject(ref ObjectUpdateInfo updateInfo) { + + if (updateInfo.data == null) + { + return; + } + if (StageObjectMap.TryGetValue(updateInfo.data.name, out GameObject gameObject)) + { + gameObject.SetActive(updateInfo.renderEnable); + + Transform attach_transform = null; + switch (updateInfo.AttachTarget) + { + case AttachType.None: + if(StageParentMap.TryGetValue(updateInfo.data.name, out Transform parentTransform)) + { + attach_transform = parentTransform; + } + break; + case AttachType.Character: + var chara = Director.instance.CharaContainerScript[updateInfo.CharacterPosition]; + if (chara) + { + attach_transform = chara.transform; + } + break; + case AttachType.Camera: + attach_transform = Director.instance.MainCameraTransform; + break; + } + if (gameObject.transform.parent != attach_transform) + { + gameObject.transform.SetParent(attach_transform); + } + + if (updateInfo.data.enablePosition) + { + gameObject.transform.localPosition = updateInfo.updateData.position; + } + if (updateInfo.data.enableRotate) + { + gameObject.transform.localRotation = updateInfo.updateData.rotation; + } + if (updateInfo.data.enableScale) + { + gameObject.transform.localScale = updateInfo.updateData.scale; + } + } + } + + public void UpdateTransform(ref TransformUpdateInfo updateInfo) + { + if (updateInfo.data == null) + { + return; + } + if (StageObjectUnitMap.TryGetValue(updateInfo.data.name, out StageObjectUnit objectUnit)) + { + foreach(var child in objectUnit.ChildObjects) + { + if (StageObjectMap.TryGetValue(child.name, out GameObject gameObject)) + { + if (updateInfo.data.enablePosition) + { + gameObject.transform.localPosition = updateInfo.updateData.position; + } + if (updateInfo.data.enableRotate) + { + gameObject.transform.localRotation = updateInfo.updateData.rotation; + } + if (updateInfo.data.enableScale) + { + gameObject.transform.localScale = updateInfo.updateData.scale; + } + } + } } } } diff --git a/Assets/Scripts/umamusume/Gallop/RenderPipeline.meta b/Assets/Scripts/umamusume/Gallop/RenderPipeline.meta new file mode 100644 index 0000000..8daf2e8 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/RenderPipeline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f07b01a4a8f75c49af0f7340468ed3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs b/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs new file mode 100644 index 0000000..893f596 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs @@ -0,0 +1,14 @@ +锘縩amespace Gallop.RenderPipeline +{ + public enum CutoffType + { + Invalid = -1, + UnSupport = 0, + UnSupportButDraw = 1, + DiscardSrcTexA = 2, + DiscardSrcTexB = 3, + AlphaBlend = 4, + AlphaBlendSrcTexR = 5, + Max = 6, + } +} diff --git a/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs.meta b/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs.meta new file mode 100644 index 0000000..ee9b397 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/RenderPipeline/Enums.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c87c0f004ed3834f87c5527519f1111 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ed5da2c..6c526f0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -158,7 +158,6 @@ PlayerSettings: m_ColorGamuts: 00000000 targetPixelDensity: 395 resolutionScalingMode: 1 - resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -625,11 +624,8 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 - switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 - switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 - switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -822,7 +818,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -871,7 +866,6 @@ PlayerSettings: hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 - windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt deleted file mode 100644 index c378bfe..0000000 --- a/UserSettings/Layouts/default-2022.dwlt +++ /dev/null @@ -1,1229 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 8 - y: 53 - width: 1902 - height: 1091 - m_ShowMode: 4 - m_Title: Game - m_RootView: {fileID: 3} - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1366 - y: 0 - width: 536 - height: 1041 - m_MinSize: {x: 276, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 6} - - {fileID: 5} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1902 - height: 1091 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1902 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 1071 - width: 1902 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1902 - height: 1041 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 16 - draggingID: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1366 - height: 1041 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 17 - draggingID: 0 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1366 - height: 991 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 18 - draggingID: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 169 - height: 991 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 169 - y: 0 - width: 1197 - height: 991 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 15} - - {fileID: 12} - - {fileID: 18} - m_Selected: 2 - m_LastSelected: 0 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 991 - width: 1366 - height: 50 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 16} - - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 446 - y: 73 - width: 900 - height: 731 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 6056432768204826005, guid: 98e0b60ea4971b2498d6afb4bbb063b2, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 98e0b60ea4971b2498d6afb4bbb063b2, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 6096580125238414995, guid: 98e0b60ea4971b2498d6afb4bbb063b2, - type: 2} - m_ScrollPosition: {x: 0, y: 0} - - m_Target: {fileID: 6056432768204826005, guid: 98e0b60ea4971b2498d6afb4bbb063b2, - type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1374 - y: 83 - width: 535 - height: 1020 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 476 - m_ControlHash: 1412526313 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 8 - y: 83 - width: 168 - height: 970 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: fefaffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 456 - y: 81 - width: 918 - height: 719 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: -166, y: -26} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 - id: Tool Settings - index: 0 - layout: 1 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-grid-and-snap-toolbar - index: 1 - layout: 1 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 25} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-scene-view-toolbar - index: 0 - layout: 1 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-search-toolbar - index: 1 - layout: 1 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: -247} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 - id: unity-transform-toolbar - index: 0 - layout: 2 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 197} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-component-tools - index: 1 - layout: 2 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 67.5, y: -123} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 - id: Orientation - index: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Light Settings - index: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Camera - index: 1 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Constraints - index: 1 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Collisions - index: 2 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Navmesh Display - index: 4 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Agent Display - index: 5 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Obstacle Display - index: 6 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Occlusion Culling - index: 3 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Physics Debugger - index: 4 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Scene Visibility - index: 5 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 25} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Particles - index: 6 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap - index: 11 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap Palette Helper - index: 12 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 48, y: 48} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/TrailRenderer - index: 7 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 48, y: 10} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: UnityEditor.SceneViewCameraOverlay - index: 10 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 48, y: 48} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: APV Overlay - index: 9 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 48, y: 48} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: XREnvironmentToolbar - index: 9 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 48, y: 48} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: XR Building Blocks - index: 9 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 48, y: 25} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: AINavigationOverlay - index: 8 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 48, y: 48} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Animation Rigging - index: 10 - layout: 4 - size: {x: 0, y: 0} - sizeOverriden: 0 - m_OverlaysVisible: 1 - m_WindowGUID: 70fba9a9ae9062242ac546d07156082e - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 0 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: -1.1173961, y: 0.78319824, z: -4.181621} - speed: 2 - m_Value: {x: -1.1173961, y: 0.78319824, z: -4.181621} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - m_ShowGrid: 0 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: 0.008837877, y: -0.98918545, z: 0.06717923, w: 0.13011949} - speed: 2 - m_Value: {x: 0.008837832, y: -0.9891805, z: 0.0671789, w: 0.13011883} - m_Size: - m_Target: 2.3812582 - speed: 2 - m_Value: 2.3812582 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_CameraSettings: - m_Speed: 1.005 - m_SpeedNormalized: 0.49999997 - m_SpeedMin: 0.01 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.0018563727, y: -0.72387266, z: -0.001947335, w: -0.6899283} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 10 - y: 821 - width: 1365 - height: 280 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts - m_Globs: [] - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Games\Unity\UmaViewer - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 48} - m_SelectedIDs: d28b0000 - m_LastClickedID: 35794 - m_ExpandedIDs: 00000000be8b0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000be8b0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000c4e0ffff0c2e010000000000daf1ffffc49100000a930000de720000168d0000cea70000d6a70000d2a70000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 263} - m_GridSize: 16 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 8 - y: 1074 - width: 1365 - height: 29 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 177 - y: 83 - width: 1195 - height: 970 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Games\Unity\FriendsXR - Copy\Library\PlayModeViewStates\291c5964f2df65d4c8d3e00f1e2f5739 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1195, y: 672} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -597.5 - m_HBaseRangeMax: 597.5 - m_VBaseRangeMin: -336 - m_VBaseRangeMax: 336 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1195 - height: 949 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 597.5, y: 474.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -597.5 - y: -474.5 - width: 1195 - height: 949 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1195, y: 970} - m_ClearInEditMode: 1 - m_NoCameraWarning: 0 - m_LowResolutionForAspectRatios: 01000001000000000000 - m_XRRenderMode: -1 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1