diff --git a/Assets/Resources/Characters/佩佩.prefab b/Assets/Resources/Characters/佩佩.prefab index d3b7536a2..b0a7db974 100644 --- a/Assets/Resources/Characters/佩佩.prefab +++ b/Assets/Resources/Characters/佩佩.prefab @@ -336,6 +336,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5972627471844885781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2603028657239801298} + - component: {fileID: 8940024999893864101} + m_Layer: 0 + m_Name: "\u95ED\u773C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2603028657239801298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5972627471844885781} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.023255825, y: 1.6232557, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3730270489876972133} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8940024999893864101 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5972627471844885781} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 22 + m_Sprite: {fileID: -989070093990681363, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.3581395, y: 0.6139535} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6303100974186592165 GameObject: m_ObjectHideFlags: 0 @@ -888,6 +972,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4770839564222210311} + - {fileID: 2603028657239801298} - {fileID: 5636247021632424559} - {fileID: 7780175291218341736} m_Father: {fileID: 7791994207577740999} diff --git a/Assets/Resources/Characters/石头.prefab b/Assets/Resources/Characters/石头.prefab index 38fdbe039..9610245f7 100644 --- a/Assets/Resources/Characters/石头.prefab +++ b/Assets/Resources/Characters/石头.prefab @@ -740,7 +740,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5100944589243527712 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 62c9ca788..4bc42d26c 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -36055,7 +36055,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -39784,7 +39784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2511148540085322114, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2836269877971731102, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_IsActive