diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index b9aa21a41..d805c6f78 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9284,10 +9284,10 @@ MonoBehaviour: - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - runMode: 2 + runMode: 1 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: "PeipeiDay2_\u624B\u672F\u8272\u5F69\u6062\u590D" + testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} + saveFileName: StoneDay1_2 --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ShitouHeadiFixScene.unity b/Assets/Scenes/ShitouHeadiFixScene.unity index 2d7efcaf7..663c99e24 100644 --- a/Assets/Scenes/ShitouHeadiFixScene.unity +++ b/Assets/Scenes/ShitouHeadiFixScene.unity @@ -242,11 +242,11 @@ Transform: m_GameObject: {fileID: 16205054} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} - m_LocalPosition: {x: -0.92, y: 0.24799998, z: 0} + m_LocalPosition: {x: -4.6349983, y: 0.25399998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1709695297} + m_Father: {fileID: 6045551082333026153} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!212 &16205056 SpriteRenderer: @@ -531,7 +531,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1134468525 m_SortingLayer: 10 - 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 @@ -29813,11 +29813,11 @@ Transform: m_GameObject: {fileID: 1707229602} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.9199984, y: 0.887, z: 0} + m_LocalPosition: {x: -4.6349983, y: 0.893, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1709695297} + m_Father: {fileID: 6045551082333026153} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1707229604 SpriteRenderer: @@ -29887,7 +29887,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1709695297 Transform: m_ObjectHideFlags: 0 @@ -29900,9 +29900,7 @@ Transform: m_LocalPosition: {x: -3.715, y: 0.006, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 16205055} - - {fileID: 1707229603} + m_Children: [] m_Father: {fileID: 6045551082333026153} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1709695298 @@ -38568,6 +38566,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 1841275529} + - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 16205055} + - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1707229603} - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 1709695297} diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json index 73bfabead..6dc5e561c 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/temp.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]} \ No newline at end of file