diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/犬包含内脏/Materials/M_GouNeiPiHong.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/犬包含内脏/Materials/M_GouNeiPiHong.mat index 47205d9c..ace468ed 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/犬包含内脏/Materials/M_GouNeiPiHong.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/犬包含内脏/Materials/M_GouNeiPiHong.mat @@ -127,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.1592, g: 0.0737, b: 0.0468, a: 1} - - _Color: {r: 0.15919995, g: 0.07369999, b: 0.046799973, a: 1} + - _Color: {r: 0.1592, g: 0.0737, b: 0.0468, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index e3c13e7c..963b54ce 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -10473,143 +10473,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.14, y: 0.01, z: 0.1} m_Center: {x: -0.22, y: 1.34, z: 0.11} ---- !u!1 &330585543 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 330585546} - - component: {fileID: 330585545} - - component: {fileID: 330585544} - - component: {fileID: 330585547} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &330585544 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 ---- !u!20 &330585545 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &330585546 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - serializedVersion: 2 - m_LocalRotation: {x: 0.14400358, y: 0.68489325, z: -0.14083375, w: 0.70025} - m_LocalPosition: {x: -4.8052416, y: 3.420195, z: -0.20748214} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &330585547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 --- !u!1 &335886310 GameObject: m_ObjectHideFlags: 0 @@ -29451,13 +29314,53 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7025760688970972829, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1461444727} m_SourcePrefab: {fileID: 100100000, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} --- !u!4 &1461444725 stripped Transform: m_CorrespondingSourceObject: {fileID: 6685111115918638199, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} m_PrefabInstance: {fileID: 1461444724} m_PrefabAsset: {fileID: 0} +--- !u!1 &1461444726 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7025760688970972829, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + m_PrefabInstance: {fileID: 1461444724} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1461444727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461444726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e31f7b6160cbed41851ac4f758706c8, type: 3} + m_Name: + m_EditorClassIdentifier: + matNum: 2 + Target: {fileID: 0} + BaseShader: {fileID: 4800000, guid: dd422ec82032dcf4d899c694efd5019f, type: 3} + LayerCount: 20 + FurLength: 2 + FurFore: {x: 0, y: 0, z: 0} + Noise: {fileID: 2800000, guid: f97ca2e498e99be41a9eb038d1740e6e, type: 3} + Noise2: {fileID: 2800000, guid: 6b9d7faf469fd124bae6670b53972ec2, type: 3} + MainTex: {fileID: 2800000, guid: de4f1fca678c9e34990acd4e996c5faf, type: 3} + Mask: {fileID: 2800000, guid: 545fc224987f7464c954c35f4f811822, type: 3} + ValueMask: {fileID: 2800000, guid: 625e84e011f035b4dbdd7a85a7a8f2b3, type: 3} + TValue: 0.08 + FurColor: {r: 0.6431373, g: 0.6431373, b: 0.6431373, a: 1} + ShadowColor: {r: 1, g: 1, b: 1, a: 1} + ShadowPow: 2 + SpPow: 1 + SpScale: 1 + FPow: 1 + FScale: 1 + FurTenacity: 1 --- !u!1001 &1468210278 PrefabInstance: m_ObjectHideFlags: 0 @@ -47715,7 +47618,6 @@ Camera: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 330585546} - {fileID: 410087041} - {fileID: 832575519} - {fileID: 490020475} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ba38098a..f70fe59e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -123,74 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &35403205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 35403208} - - component: {fileID: 35403207} - - component: {fileID: 35403206} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &35403206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35403205} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &35403207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35403205} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &35403208 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35403205} - serializedVersion: 2 - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &547432235 GameObject: m_ObjectHideFlags: 0 @@ -1257,4 +1189,3 @@ SceneRoots: - {fileID: 547432243} - {fileID: 1089184134} - {fileID: 1269024859} - - {fileID: 35403208} diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index fd8352e7..06b90084 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -412,7 +412,7 @@ Environment/SM_QvanChangJing/SM_BuLiaoLei/zhusheqi 一次性注射器 - + 耗材/一次性注射器.png @@ -648,7 +648,7 @@ - + 隐藏初始道具 @@ -708,7 +708,7 @@ - + 主刀角色初始化 @@ -744,6 +744,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1331,7 +1355,7 @@ - + @@ -1574,6 +1598,7 @@ + @@ -1584,15 +1609,8 @@ - - - - - - - - + @@ -1672,9 +1690,9 @@ - - - + + + @@ -2636,13 +2654,13 @@ - + - + @@ -2701,7 +2719,7 @@ - +