diff --git a/Assets/Scenes/勍/InteractTest.unity b/Assets/Scenes/勍/InteractTest.unity index 3635794..4cb3432 100644 --- a/Assets/Scenes/勍/InteractTest.unity +++ b/Assets/Scenes/勍/InteractTest.unity @@ -149,7 +149,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5352854} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.16, y: 0.4, z: 0} + m_LocalPosition: {x: -9.530919, y: 0.4, z: 0} m_LocalScale: {x: 1.54, y: 1.54, z: 1.26} m_Children: [] m_Father: {fileID: 288199589} @@ -218,7 +218,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df6e24c16bdbd3c499f0d98e388083b2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 226789352} moveRate: -1 startPoint: 0 --- !u!1 &15582731 @@ -247,7 +246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15582731} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.7439997, y: 0, z: 0} + m_LocalPosition: {x: 8.5778265, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} m_Children: [] m_Father: {fileID: 2122669497} @@ -316,7 +315,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df6e24c16bdbd3c499f0d98e388083b2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 226789352} moveRate: 0.9 startPoint: 0 --- !u!1 &56909002 @@ -470,10 +468,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110133614} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.16, y: -1.96, z: 0} + m_LocalPosition: {x: 9.53, y: -2.88, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 760298201} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -492,6 +489,7 @@ MonoBehaviour: inputDir: 0 groundCheck: {fileID: 0} weapon: {fileID: 0} + weaponPos: {x: 0, y: 0, z: 0} isRight: 1 isGround: 0 speed: 10 @@ -709,7 +707,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 226789349} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.16, y: -0.5, z: -10} + m_LocalPosition: {x: 9.530919, y: -0.6770234, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -936,6 +934,38 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &457532748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 457532749} + m_Layer: 0 + m_Name: "\u5BF9\u8BDD" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &457532749 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457532748} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.821547, y: -0.8392732, z: -14.130539} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1548530252} + - {fileID: 843077163} + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &487690318 GameObject: m_ObjectHideFlags: 0 @@ -1018,6 +1048,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &515434246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515434247} + - component: {fileID: 515434248} + m_Layer: 0 + m_Name: "\u9EC4\u5E1D\u4E4B\u95EE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &515434247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515434246} + 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_Children: [] + m_Father: {fileID: 1442756489} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &515434248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515434246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55246ffc0988b9243b2761737d3be10c, type: 3} + m_Name: + m_EditorClassIdentifier: + isPlaying: 0 --- !u!1 &661209885 GameObject: m_ObjectHideFlags: 0 @@ -1044,7 +1118,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661209885} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.3279998, y: 0, z: 0} + m_LocalPosition: {x: 7.6247354, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -1113,39 +1187,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df6e24c16bdbd3c499f0d98e388083b2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 226789352} moveRate: 0.8 startPoint: 0 ---- !u!1 &760298200 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 760298201} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &760298201 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 760298200} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.54, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 110133615} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &781772278 GameObject: m_ObjectHideFlags: 0 @@ -1183,7 +1226,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 760298201} + m_Follow: {fileID: 110133615} m_Lens: FieldOfView: 60 OrthographicSize: 5 @@ -1207,7 +1250,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781772278} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.16, y: -0.5, z: -10} + m_LocalPosition: {x: 9.53, y: -0.8800001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 903864635} @@ -1231,6 +1274,60 @@ MonoBehaviour: m_BoundingShape2D: {fileID: 1206926897} m_ConfineScreenEdges: 1 m_Damping: 0 +--- !u!1 &843077162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 843077163} + - component: {fileID: 843077164} + m_Layer: 0 + m_Name: "\u9EC4\u5E1D\u7591\u60D1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &843077163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 843077162} + 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_Children: [] + m_Father: {fileID: 457532749} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &843077164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 843077162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cb90a10e58c42d47b5142ad61ef47d8, type: 3} + m_Name: + m_EditorClassIdentifier: + contentList: + - {fileID: 21300000, guid: c5247c64a49f62b4eac48ee3d1043ef5, type: 3} + - {fileID: 21300000, guid: 49135acf8ddf6ba4093b9b41d816ce1b, type: 3} + speakerList: 0000000001000000 + conversationName: "\u9EC4\u5E1D\u7591\u60D1" + timePerSpeak: 3 + P1Background: {fileID: 21300000, guid: e607823a00e274a48bef895b49e595be, type: 3} + P2Background: {fileID: 21300000, guid: 4c2e83e347d617a4bbf4901c20a3e98c, type: 3} + P1Pos: {fileID: 110133615} + P2Pos: {fileID: 1750262982} + offset: {x: 2.5, y: 2} --- !u!1 &900617625 GameObject: m_ObjectHideFlags: 0 @@ -1259,7 +1356,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &903864634 GameObject: @@ -1436,60 +1533,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 38.4, y: 2.4652278} m_EdgeRadius: 0 ---- !u!1 &1016989005 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1016989007} - - component: {fileID: 1016989006} - m_Layer: 0 - m_Name: "\u7B2C\u4E00\u6B21\u5BF9\u8BDD" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1016989006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1016989005} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6cb90a10e58c42d47b5142ad61ef47d8, type: 3} - m_Name: - m_EditorClassIdentifier: - contentList: - - {fileID: 21300000, guid: a0f5e5418ee5cba4b96b8014babc7779, type: 3} - - {fileID: 21300000, guid: c5247c64a49f62b4eac48ee3d1043ef5, type: 3} - speakerList: 0000000001000000 - conversationName: 1 - timePerSpeak: 3 - P1Background: {fileID: 21300000, guid: af1a632119c2cae4590e3d61c88b4ad9, type: 3} - P2Background: {fileID: 21300000, guid: 9c6f1b7fb2e78b541985e40a52b9ca6c, type: 3} - P1Pos: {fileID: 110133615} - P2Pos: {fileID: 1750262982} - offset: {x: 1.5, y: 1.5} ---- !u!4 &1016989007 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1016989005} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1103262709 GameObject: m_ObjectHideFlags: 0 @@ -1506,7 +1549,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1103262710 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1785,6 +1828,8 @@ GameObject: m_Component: - component: {fileID: 1350993555} - component: {fileID: 1350993556} + - component: {fileID: 1350993558} + - component: {fileID: 1350993557} m_Layer: 0 m_Name: "\u4E09\u5341\u53EA\u9E21\u7EF3\u7ED3" m_TagString: Untagged @@ -1857,6 +1902,77 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1350993557 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350993554} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.04, y: 1.92} + newSize: {x: 3.04, y: 1.92} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.04, y: 1.92} + m_EdgeRadius: 0 +--- !u!114 &1350993558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350993554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aaac64616770dce42a623c267c4d9d31, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 3 +--- !u!1 &1442756488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1442756489} + m_Layer: 0 + m_Name: "\u6F14\u51FA" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1442756489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442756488} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.821547, y: -0.8392732, z: -14.130539} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 515434247} + - {fileID: 1835952801} + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1449312143 GameObject: m_ObjectHideFlags: 0 @@ -1883,7 +1999,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449312143} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.08, y: 0, z: 0} + m_LocalPosition: {x: 4.7654595, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -1952,7 +2068,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df6e24c16bdbd3c499f0d98e388083b2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 226789352} moveRate: 0.5 startPoint: 0 --- !u!1 &1473915065 @@ -1998,6 +2113,59 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1548530251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1548530252} + - component: {fileID: 1548530253} + m_Layer: 0 + m_Name: "\u9EC4\u5E1D\u63D0\u9700\u6C42" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1548530252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548530251} + 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_Children: [] + m_Father: {fileID: 457532749} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1548530253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548530251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cb90a10e58c42d47b5142ad61ef47d8, type: 3} + m_Name: + m_EditorClassIdentifier: + contentList: + - {fileID: 21300000, guid: a0f5e5418ee5cba4b96b8014babc7779, type: 3} + speakerList: 01000000 + conversationName: "\u9EC4\u5E1D\u63D0\u9700\u6C42" + timePerSpeak: 3 + P1Background: {fileID: 21300000, guid: e607823a00e274a48bef895b49e595be, type: 3} + P2Background: {fileID: 21300000, guid: 4c2e83e347d617a4bbf4901c20a3e98c, type: 3} + P1Pos: {fileID: 110133615} + P2Pos: {fileID: 1750262982} + offset: {x: 2.5, y: 2} --- !u!1 &1558198558 GameObject: m_ObjectHideFlags: 0 @@ -2008,6 +2176,8 @@ GameObject: m_Component: - component: {fileID: 1558198559} - component: {fileID: 1558198560} + - component: {fileID: 1558198562} + - component: {fileID: 1558198561} m_Layer: 0 m_Name: "\u4E8C\u5341\u4E2A\u5973\u751F\u7EF3\u7ED3" m_TagString: Untagged @@ -2080,6 +2250,45 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1558198561 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558198558} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.06, y: 1.9} + newSize: {x: 3.06, y: 1.9} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.06, y: 1.9} + m_EdgeRadius: 0 +--- !u!114 &1558198562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558198558} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aaac64616770dce42a623c267c4d9d31, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 1 --- !u!1 &1651968730 GameObject: m_ObjectHideFlags: 0 @@ -2315,8 +2524,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e1b2323b7275ad44c94037be9f2ccec3, type: 3} m_Name: m_EditorClassIdentifier: - neededType: 1 - hasFinishTheConversation: 0 + neededType: 2 + state: 1 --- !u!212 &1750262985 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2368,6 +2577,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1835952800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1835952801} + - component: {fileID: 1835952802} + m_Layer: 0 + m_Name: "\u9EC4\u5E1D\u7591\u60D1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1835952801 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835952800} + 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_Children: [] + m_Father: {fileID: 1442756489} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1835952802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835952800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 730ec98327097464e86940e5df1628d3, type: 3} + m_Name: + m_EditorClassIdentifier: + isPlaying: 0 --- !u!1 &1836672841 GameObject: m_ObjectHideFlags: 0 @@ -2547,7 +2800,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1918365588} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.83199996, y: 0, z: 0} + m_LocalPosition: {x: 1.9061838, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -2616,7 +2869,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df6e24c16bdbd3c499f0d98e388083b2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 226789352} moveRate: 0.2 startPoint: 0 --- !u!1 &1965616928 @@ -2629,6 +2881,8 @@ GameObject: m_Component: - component: {fileID: 1965616929} - component: {fileID: 1965616930} + - component: {fileID: 1965616932} + - component: {fileID: 1965616931} m_Layer: 0 m_Name: "\u5341\u4E2A\u7537\u751F\u7EF3\u7ED3" m_TagString: Untagged @@ -2701,6 +2955,45 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1965616931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965616928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aaac64616770dce42a623c267c4d9d31, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 2 +--- !u!61 &1965616932 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965616928} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.17, y: 1.85} + newSize: {x: 3.17, y: 1.85} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.17, y: 1.85} + m_EdgeRadius: 0 --- !u!1 &2122669496 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/勍/HuangDi.cs b/Assets/Scripts/勍/HuangDi.cs index d97997b..807e1f5 100644 --- a/Assets/Scripts/勍/HuangDi.cs +++ b/Assets/Scripts/勍/HuangDi.cs @@ -9,26 +9,41 @@ using Sirenix.OdinInspector; public class HuangDi : EntryTrigger { [SerializeField][EnumPaging] - private KnotMediator.KnotType neededType = KnotMediator.KnotType.None; - [Header("是否已经完成了对话")] - public bool hasFinishTheConversation = false; + private KnotMediator.KnotType neededType = KnotMediator.KnotType.编成麻花的绳结; + + public enum HuangDiState + { + None, + Ask, + Answer, + End + } + + public HuangDiState state = HuangDiState.None; public override void OnCall() { - if(hasFinishTheConversation){ + + if(state == HuangDiState.Ask) + { if(KnotMediator.Instance.CheckKnotType(neededType)) { Debug.Log("皇帝接受了绳结"); + state = HuangDiState.Answer; + //触发结束演出 + FindObjectOfType().OnCall(); } else { Debug.Log("皇帝拒绝了绳结"); + FindObjectOfType().OnCall(); } } - else + if(state == HuangDiState.None) { - ConversationController.Instance.OnCall("1"); + FindObjectOfType().OnCall(); } + } diff --git a/Assets/Scripts/勍/Parallax.cs b/Assets/Scripts/勍/Parallax.cs index 78308be..4c6a162 100644 --- a/Assets/Scripts/勍/Parallax.cs +++ b/Assets/Scripts/勍/Parallax.cs @@ -14,7 +14,7 @@ using Cinemachine; public class Parallax : MonoBehaviour { - public Transform Cam;//视差摄像机 + private Transform Cam;//视差摄像机 [Header("代表水平方向上、随着相机运动的倍率。")] public float moveRate;//视差率 [Header("有时候视差起点会被不可抗力污染,当场景的东西位置乱了,就手动处理一下这个值吧")] @@ -22,6 +22,7 @@ public class Parallax : MonoBehaviour // Start is called before the first frame update void Start() { + Cam = GameObject.FindGameObjectWithTag("MainCamera").transform; //startPoint = transform.position.x;//获取当前起点位置 //startPoint = transform.localPosition.x;//获取当前起点位置 } @@ -30,8 +31,9 @@ public class Parallax : MonoBehaviour { if(Cam == null) { - Debug.LogError("视差摄像机未赋值,把主摄像机赋值给Cam就行"); - return; + Cam = GameObject.FindGameObjectWithTag("MainCamera").transform; + //Debug.LogError("视差摄像机未赋值,把主摄像机赋值给Cam就行"); + //return; } //每帧更新位置 //transform.position = new Vector2(startPoint + Cam.position.x * moveRate, transform.position.y); diff --git a/Assets/Scripts/勍/对话框架/AConversation.cs b/Assets/Scripts/勍/对话框架/AConversation.cs index fe9b866..408ce1f 100644 --- a/Assets/Scripts/勍/对话框架/AConversation.cs +++ b/Assets/Scripts/勍/对话框架/AConversation.cs @@ -121,11 +121,13 @@ public class AConversation : MonoBehaviour } /// - /// 对话结束时触发,已有内容,会恢复玩家的操作权限 + /// 对话结束时触发 会恢复玩家的操作权限 /// public virtual void OnEnd() { - player.ToMap("Normal"); + //不在演出中时,恢复玩家的操作权限 + if(!ConversationController.Instance.CheckStage()) + player.ToMap("Normal"); } diff --git a/Assets/Scripts/勍/对话框架/ConversationController.cs b/Assets/Scripts/勍/对话框架/ConversationController.cs index 7b14aa4..12cdc36 100644 --- a/Assets/Scripts/勍/对话框架/ConversationController.cs +++ b/Assets/Scripts/勍/对话框架/ConversationController.cs @@ -18,6 +18,7 @@ public class ConversationController : UnitySingleton { if (conversation.conversationName == name) { + Debug.Log("找到对话:" + name); conversation.OnCall(); //改变玩家地图至Null FindObjectOfType().ToMap("Null"); @@ -27,4 +28,20 @@ public class ConversationController : UnitySingleton //如果没找到,则报错 Debug.LogError("没有找到名为" + name + "的对话"); } + + /// + /// 如果正在演出,是不可以还给玩家操作权限的,出此下策,记录此时是否在演出 + /// + /// + public bool CheckStage(){ + Stage[] stageList = FindObjectsOfType(); + foreach (Stage stage in stageList) + { + if (stage.isPlaying) + { + return true; + } + } + return false; + } } diff --git a/Assets/Scripts/勍/演出.meta b/Assets/Scripts/勍/演出.meta new file mode 100644 index 0000000..0561659 --- /dev/null +++ b/Assets/Scripts/勍/演出.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 353a97102fb385248b88317c7fac5f14 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/演出/HuangdiAsk.cs b/Assets/Scripts/勍/演出/HuangdiAsk.cs new file mode 100644 index 0000000..5c51a99 --- /dev/null +++ b/Assets/Scripts/勍/演出/HuangdiAsk.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 演出,黄帝之问 +/// +public class HuangdiAsk : Stage +{ + protected override IEnumerator Main() + { + //触发对话:黄帝提需求 + ConversationController.Instance.OnCall("黄帝提需求"); + //等待对话结束 + yield return new WaitForSeconds(3f); + //黄帝手指左方,但是目前没有动画 + + //标记黄帝状态为Ask + FindObjectOfType().state = HuangDi.HuangDiState.Ask; + + //结束 + yield return base.Main(); + } +} diff --git a/Assets/Scripts/勍/演出/HuangdiAsk.cs.meta b/Assets/Scripts/勍/演出/HuangdiAsk.cs.meta new file mode 100644 index 0000000..dd7063c --- /dev/null +++ b/Assets/Scripts/勍/演出/HuangdiAsk.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55246ffc0988b9243b2761737d3be10c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/演出/HuangdiConfused.cs b/Assets/Scripts/勍/演出/HuangdiConfused.cs new file mode 100644 index 0000000..6e3546d --- /dev/null +++ b/Assets/Scripts/勍/演出/HuangdiConfused.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HuangdiConfused : Stage +{ + protected override IEnumerator Main() + { + Debug.Log("黄帝疑惑"); + //触发对话:黄帝疑惑 + ConversationController.Instance.OnCall("黄帝疑惑"); + //等待对话结束 + yield return new WaitForSeconds(9f); + //标记黄帝状态为End + FindObjectOfType().state = HuangDi.HuangDiState.End; + //结束 + yield return base.Main(); + } +} diff --git a/Assets/Scripts/勍/演出/HuangdiConfused.cs.meta b/Assets/Scripts/勍/演出/HuangdiConfused.cs.meta new file mode 100644 index 0000000..543e538 --- /dev/null +++ b/Assets/Scripts/勍/演出/HuangdiConfused.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 730ec98327097464e86940e5df1628d3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/演出/Stage.cs b/Assets/Scripts/勍/演出/Stage.cs new file mode 100644 index 0000000..eebe20f --- /dev/null +++ b/Assets/Scripts/勍/演出/Stage.cs @@ -0,0 +1,64 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Sirenix.OdinInspector; + +/// +/// 演出父类,所有演出均需要继承此类 +/// +public class Stage : MonoBehaviour +{ + /// + /// 是否正在演出 + /// + [ReadOnly] + public bool isPlaying = false; + protected Player player; + + /// + /// 外界调用唯一入口 + /// + [ContextMenu("Play")] + public void OnCall() + { + //初始化 + Init(); + //开始Main的协程 + StartCoroutine(Main()); + } + + /// + /// 默认的初始化会找到玩家并清除玩家的操作地图,请按需求base + /// + protected virtual void Init() + { + //找到玩家 + player = FindObjectOfType(); + //清除玩家的操作地图 + player.ToMap("Null"); + + isPlaying = true; + } + + /// + /// 主体演出内容,base中包含触发结束事件,重写请在主体尾部base + /// + protected virtual IEnumerator Main() + { + yield return new WaitForEndOfFrame(); + OnEnd(); + } + + /// + /// 结束事件,默认结束后恢复玩家的操作地图,请按需求base + /// + protected virtual void OnEnd() + { + //恢复玩家的操作地图 + player.ToMap("Normal"); + + isPlaying = false; + } + + +} diff --git a/Assets/Scripts/勍/演出/Stage.cs.meta b/Assets/Scripts/勍/演出/Stage.cs.meta new file mode 100644 index 0000000..66bea0c --- /dev/null +++ b/Assets/Scripts/勍/演出/Stage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27b092c95d8c3ae48abe6f57bf7e028a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/场景1/P1.png b/Assets/美术素材/场景1/P1.png new file mode 100644 index 0000000..a2ed00c Binary files /dev/null and b/Assets/美术素材/场景1/P1.png differ diff --git a/Assets/美术素材/场景1/P1.png.meta b/Assets/美术素材/场景1/P1.png.meta new file mode 100644 index 0000000..5cccec8 --- /dev/null +++ b/Assets/美术素材/场景1/P1.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e607823a00e274a48bef895b49e595be +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/场景1/P2.png b/Assets/美术素材/场景1/P2.png new file mode 100644 index 0000000..b0a4356 Binary files /dev/null and b/Assets/美术素材/场景1/P2.png differ diff --git a/Assets/美术素材/场景1/P2.png.meta b/Assets/美术素材/场景1/P2.png.meta new file mode 100644 index 0000000..d2c9c6d --- /dev/null +++ b/Assets/美术素材/场景1/P2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 4c2e83e347d617a4bbf4901c20a3e98c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/场景1/两根手指.png b/Assets/美术素材/场景1/两根手指.png new file mode 100644 index 0000000..7dab0bd Binary files /dev/null and b/Assets/美术素材/场景1/两根手指.png differ diff --git a/Assets/美术素材/场景1/两根手指.png.meta b/Assets/美术素材/场景1/两根手指.png.meta new file mode 100644 index 0000000..ad06eb5 --- /dev/null +++ b/Assets/美术素材/场景1/两根手指.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 49135acf8ddf6ba4093b9b41d816ce1b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/场景1/图标1.png.meta b/Assets/美术素材/场景1/图标1.png.meta index 257141b..8a174e3 100644 --- a/Assets/美术素材/场景1/图标1.png.meta +++ b/Assets/美术素材/场景1/图标1.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 80 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,6 +75,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/美术素材/场景1/图标2.png.meta b/Assets/美术素材/场景1/图标2.png.meta index 479dd78..a054841 100644 --- a/Assets/美术素材/场景1/图标2.png.meta +++ b/Assets/美术素材/场景1/图标2.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 80 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,6 +75,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: []