From 7d0666f7092bc25dc49e19114dce7662f0413ecd Mon Sep 17 00:00:00 2001 From: buncccc Date: Wed, 16 Apr 2025 16:28:42 +1200 Subject: [PATCH] Stable state for week 3 --- Assets/Scenes/SampleScene.unity | 77 ++++++++++++++----- .../mona/animation/Mona_parameters.asset | 71 +---------------- 2 files changed, 58 insertions(+), 90 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 72eb3a4..a1e24f5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -136,12 +136,12 @@ GameObject: - component: {fileID: 91574288} - component: {fileID: 91574287} m_Layer: 0 - m_Name: Quad + m_Name: DepthTestingQuad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &91574287 MeshCollider: m_ObjectHideFlags: 0 @@ -577,10 +577,10 @@ Camera: width: 1 height: 1 near clip plane: 0 - far clip plane: 1 + far clip plane: 2 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 1 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -604,7 +604,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 412576889} m_LocalRotation: {x: 0.49999997, y: -0.5, z: 0.50000006, w: 0.5} - m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -622,9 +622,21 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalPosition.x - value: 0.02 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalPosition.y @@ -632,23 +644,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalPosition.z - value: 0.245 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalRotation.w - value: -0.040932205 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalRotation.y - value: 0.99916196 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -656,7 +668,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 184.692 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -666,6 +678,10 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: 122b76bddc6897647a2cbe65d677905f, type: 2} + - target: {fileID: 3858698724807265506, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5095278636693962166, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} propertyPath: m_BlendShapeWeights.Array.size value: 160 @@ -698,6 +714,10 @@ PrefabInstance: propertyPath: m_Name value: mona objectReference: {fileID: 0} + - target: {fileID: 9212658836938270507, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} --- !u!1 &705507993 @@ -871,14 +891,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &963194229 MonoBehaviour: m_ObjectHideFlags: 0 @@ -917,9 +937,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272761324} - m_LocalRotation: {x: -0.028943438, y: -0.7065142, z: 0.7065142, w: -0.028943438} - m_LocalPosition: {x: -0.0031539074, y: 0, z: 0.07698757} - m_LocalScale: {x: 2.2267053, y: 2.2267058, z: 2.2267063} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1871562477} @@ -1086,11 +1106,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1425914718 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9212658836938270507, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} + m_PrefabInstance: {fileID: 570808960} + m_PrefabAsset: {fileID: 0} --- !u!4 &1871562477 stripped Transform: m_CorrespondingSourceObject: {fileID: 3277633862007588681, guid: d59516398c7be0643b8b0658abc4c8c6, type: 3} m_PrefabInstance: {fileID: 570808960} m_PrefabAsset: {fileID: 0} +--- !u!114 &1871562481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425914718} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a42175a861c72054982b102c884dd2a6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1983426807 GameObject: m_ObjectHideFlags: 0 @@ -1195,10 +1232,10 @@ Camera: width: 1 height: 1 near clip plane: 0 - far clip plane: 1 + far clip plane: 2 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 1 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/りすきーしょっぷ/mona/animation/Mona_parameters.asset b/Assets/りすきーしょっぷ/mona/animation/Mona_parameters.asset index 25f6b63..65dcc98 100644 --- a/Assets/りすきーしょっぷ/mona/animation/Mona_parameters.asset +++ b/Assets/りすきーしょっぷ/mona/animation/Mona_parameters.asset @@ -9,75 +9,6 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1506855854, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Script: {fileID: 0} m_Name: Mona_parameters m_EditorClassIdentifier: - parameters: - - name: toggle_handsign - valueType: 2 - saved: 1 - defaultValue: 1 - - name: NSFWbodyN - valueType: 2 - saved: 0 - defaultValue: 0 - - name: toggle_outer - valueType: 2 - saved: 1 - defaultValue: 1 - - name: toggle_tights - valueType: 2 - saved: 1 - defaultValue: 1 - - name: toggle_shoes - valueType: 2 - saved: 1 - defaultValue: 1 - - name: toggle_UWsafety - valueType: 2 - saved: 1 - defaultValue: 1 - - name: toggle_emotion_ahoge - valueType: 2 - saved: 1 - defaultValue: 0 - - name: toggle_emotion_kemomimi - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_CostumeSet - valueType: 0 - saved: 1 - defaultValue: 0 - - name: change_UnderWear - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_BreastSize - valueType: 1 - saved: 1 - defaultValue: 0 - - name: change_frontHairA_1 - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_frontHairA_2 - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_frontHairB_1 - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_frontHairB_2 - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_materialA - valueType: 2 - saved: 1 - defaultValue: 0 - - name: change_materialB - valueType: 2 - saved: 1 - defaultValue: 0