diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index 130722a..0000000 --- a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index f9b8ed8..0000000 --- a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta b/Assets/Prefabs.meta similarity index 67% rename from Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta rename to Assets/Prefabs.meta index e474937..8ec46e4 100644 --- a/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta +++ b/Assets/Prefabs.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 81dbcde0f90df4e9ba9ca2794490e57a +guid: 0fea20d3edb8fd6489ca302b95893639 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/火把.prefab b/Assets/Prefabs/火把.prefab new file mode 100644 index 0000000..d3b9b77 --- /dev/null +++ b/Assets/Prefabs/火把.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1936023874439208078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936023874439208072} + - component: {fileID: 1936023874439208079} + - component: {fileID: 4902991926991665690} + m_Layer: 0 + m_Name: "\u706B\u628A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1936023874439208072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936023874439208078} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1936023874439208079 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936023874439208078} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 5c0aba5708616c04182e2737f0b79fec, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.93, y: 6.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4902991926991665690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936023874439208078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38942215688709940aa75b20394fe4f5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Prefabs/火把.prefab.meta similarity index 63% rename from Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta rename to Assets/Prefabs/火把.prefab.meta index 1eadf09..a73e763 100644 --- a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ b/Assets/Prefabs/火把.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -DefaultImporter: +guid: a74564a767dc70240816885b2afad328 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Prefabs/石刀.prefab b/Assets/Prefabs/石刀.prefab new file mode 100644 index 0000000..91d9c6a --- /dev/null +++ b/Assets/Prefabs/石刀.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6620016358095660858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6620016358095660856} + - component: {fileID: 6620016358095660859} + - component: {fileID: 8773829515005846407} + m_Layer: 0 + m_Name: "\u77F3\u5200" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6620016358095660856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6620016358095660858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6620016358095660859 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6620016358095660858} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: dc56fb8ee3fd2f140af2c2f5b46474ca, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.41, y: 5.57} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8773829515005846407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6620016358095660858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38942215688709940aa75b20394fe4f5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Prefabs/石刀.prefab.meta similarity index 63% rename from Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta rename to Assets/Prefabs/石刀.prefab.meta index f073d2a..a3c4b55 100644 --- a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ b/Assets/Prefabs/石刀.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -DefaultImporter: +guid: edecf791093330a4b8299512214e3c7b +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Prefabs/空手.prefab b/Assets/Prefabs/空手.prefab new file mode 100644 index 0000000..63157c4 --- /dev/null +++ b/Assets/Prefabs/空手.prefab @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7570369621642905633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6876791028779571526} + - component: {fileID: 1385768884675084595} + m_Layer: 0 + m_Name: "\u77F3\u65A7" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6876791028779571526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7570369621642905633} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 7863567265678196433} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1385768884675084595 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7570369621642905633} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c0a0626de86a9ef4dbc8aa6f4ec78707, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.89, y: 3.14} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7863567265678196435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7863567265678196433} + - component: {fileID: 7863567265678196434} + m_Layer: 0 + m_Name: "\u7A7A\u624B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7863567265678196433 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7863567265678196435} + 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: + - {fileID: 6876791028779571526} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7863567265678196434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7863567265678196435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78cd2dd02bceb464c92d5d793e296305, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/空手.prefab.meta b/Assets/Prefabs/空手.prefab.meta new file mode 100644 index 0000000..cbf68ab --- /dev/null +++ b/Assets/Prefabs/空手.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4cc5bce000aaa448b52dec73dc44706 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity index a7be077..56dddce 100644 --- a/Assets/Scenes/乐/Sample1.unity +++ b/Assets/Scenes/乐/Sample1.unity @@ -226,7 +226,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223863017} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.57, y: -4.06, z: 0} + m_LocalPosition: {x: -6.91, y: -4.06, z: 0} m_LocalScale: {x: 18.835022, y: 2.321, z: 2.321} m_Children: [] m_Father: {fileID: 0} @@ -392,7 +392,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 522233063} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 20.15, y: -4.06, z: 0} + m_LocalPosition: {x: 19.56, y: -4.06, z: 0} m_LocalScale: {x: 24.701668, y: 2.321, z: 2.321} m_Children: [] m_Father: {fileID: 0} @@ -434,8 +434,8 @@ Camera: m_GameObject: {fileID: 537498726} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.7924528, g: 0.7924528, b: 0.7924528, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -614,6 +614,8 @@ MonoBehaviour: m_EditorClassIdentifier: rotateDuration: 1 sprite_Mu: {fileID: 21300000, guid: c784f0adc2ce544be915fc26a2b4b510, type: 3} + Stick1: {fileID: 4902991926991665690, guid: a74564a767dc70240816885b2afad328, type: 3} + Stick2: {fileID: 8773829515005846407, guid: edecf791093330a4b8299512214e3c7b, type: 3} --- !u!61 &663361290 BoxCollider2D: m_ObjectHideFlags: 0 @@ -712,6 +714,233 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &795676345 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalPosition.x + value: -1.3700001 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalPosition.y + value: 3.4699993 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6620016358095660858, guid: edecf791093330a4b8299512214e3c7b, type: 3} + propertyPath: m_Name + value: "\u77F3\u5200" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: edecf791093330a4b8299512214e3c7b, type: 3} +--- !u!1 &831954385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 831954386} + - component: {fileID: 831954387} + m_Layer: 0 + m_Name: "\u7269\u54C1\u680F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &831954386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831954385} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.41, y: 0.67, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &831954387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831954385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29f9bcadc4b03344885086261210b120, type: 3} + m_Name: + m_EditorClassIdentifier: + itemList: + - {fileID: 7863567265678196434, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} +--- !u!1001 &873183835 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalPosition.x + value: -4.48 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalPosition.y + value: 3.52 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7863567265678196435, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + propertyPath: m_Name + value: "\u7A7A\u624B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} +--- !u!114 &873183836 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7863567265678196434, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} + m_PrefabInstance: {fileID: 873183835} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78cd2dd02bceb464c92d5d793e296305, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1213287236 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalPosition.x + value: -2.65 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalPosition.y + value: 3.61 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1936023874439208078, guid: a74564a767dc70240816885b2afad328, type: 3} + propertyPath: m_Name + value: "\u706B\u628A" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a74564a767dc70240816885b2afad328, type: 3} --- !u!1 &1374474098 GameObject: m_ObjectHideFlags: 0 @@ -821,7 +1050,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1658378286} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -2.79, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1374474099} @@ -841,7 +1070,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inputDir: 0 - GroundCheck: {fileID: 1374474099} + groundCheck: {fileID: 1374474099} + weapon: {fileID: 873183836} isRight: 1 isGround: 0 speed: 5 diff --git a/Assets/Scripts/乐/Item.cs b/Assets/Scripts/乐/Item.cs new file mode 100644 index 0000000..ade755f --- /dev/null +++ b/Assets/Scripts/乐/Item.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item : MonoBehaviour +{ + protected Transform oriTrans; + + virtual protected void Start() { + + transform.SetParent(null); + oriTrans=transform; + + } + + virtual public void ReturnToOri() { + transform.SetParent(null); + transform.position = oriTrans.position; + } + virtual public void InPosition(Transform tragetTrans) { + transform.SetParent(transform); + transform.localPosition = Vector3.zero; + } + + protected virtual void Attack() { + + } + +} diff --git a/Assets/Scripts/乐/Item.cs.meta b/Assets/Scripts/乐/Item.cs.meta new file mode 100644 index 0000000..77fb68e --- /dev/null +++ b/Assets/Scripts/乐/Item.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 78cd2dd02bceb464c92d5d793e296305 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/ItemController.cs b/Assets/Scripts/乐/ItemController.cs new file mode 100644 index 0000000..dc803cb --- /dev/null +++ b/Assets/Scripts/乐/ItemController.cs @@ -0,0 +1,68 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemController : UnitySingleton +{ + + int displayIndex=0; + Item displayItem; + + public List itemList = new List(); + + Player player; + + void Start() + { + player = FindObjectOfType(); + Display(); + } + + // Update is called once per frame + void Update() + { + + } + + //添加物品 + public void AddItem(Item item) { + itemList.Add(item); + } + + /// + /// 用于Player获取物品 + /// + public Item GetItem() { + return itemList[displayIndex]; + } + + /// + /// 用于强制改变Player的物品 + /// + public void SetItem() + { + player.weapon = itemList[displayIndex]; + + } + + /// + /// 展示正在使用的物品 + /// + public void Display() { + SetItem(); + displayItem = Instantiate(itemList[displayIndex],Vector3.zero,Quaternion.identity,transform); + displayItem.transform.localPosition = Vector3.zero; + } + + public void LeftChangeItem() { + Destroy(displayItem.gameObject); + displayIndex = (displayIndex - 1 + itemList.Count)%itemList.Count; + Display(); + } + public void RightChangeItem() + { + Destroy(displayItem.gameObject); + displayIndex = (displayIndex + 1)%itemList.Count; + Display(); + } +} diff --git a/Assets/Scripts/乐/ItemController.cs.meta b/Assets/Scripts/乐/ItemController.cs.meta new file mode 100644 index 0000000..e3b7113 --- /dev/null +++ b/Assets/Scripts/乐/ItemController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 29f9bcadc4b03344885086261210b120 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/Player.cs b/Assets/Scripts/乐/Player.cs index a608cab..b1ad8f0 100644 --- a/Assets/Scripts/乐/Player.cs +++ b/Assets/Scripts/乐/Player.cs @@ -8,47 +8,54 @@ using DG.Tweening; public class Player : PlayerControl { /// - /// Ҹ + /// 玩家刚体组件喵 /// Rigidbody2D m_rigidbody; /// - /// ŵλ + /// 脚底位置子物体 /// - [Header("ŵλ")] [FoldoutGroup("")] - public Transform GroundCheck; + [Header("脚底位置")] [FoldoutGroup("子物体")] + public Transform groundCheck; /// - /// ɫΪ1 + /// 手持武器 /// - [ReadOnly] [Header("")] + [Header("手持武器")] [FoldoutGroup("子物体")] + public Item weapon; + + + /// + /// 角色朝向（向右为1） + /// + [ReadOnly] [Header("朝向监测")] public int isRight = 1; /// - /// ɫǷ + /// 角色是否落地 /// [ReadOnly] - [Header("ؼ")] + [Header("落地监测")] public bool isGround = false; - [Header("ٶ")][FoldoutGroup("ɫ")] + [Header("行走速度")][FoldoutGroup("角色操作数据")] public float speed; - [Header("Ծ")][FoldoutGroup("ɫ")] + [Header("跳跃力量")][FoldoutGroup("角色操作数据")] public float jumpForce; /// - /// ɫʱ + /// 角色翻面时长 /// - [Header("ɫʱ")] + [Header("角色翻面所需时长")] public float flipDuration = 0.1f; /// - /// ҳʼ + /// 玩家初始化喵 /// override protected void Start() { @@ -69,7 +76,7 @@ public class Player : PlayerControl } /// - /// 溯 + /// 翻面函数 /// void Flip() { @@ -79,7 +86,7 @@ public class Player : PlayerControl //transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z); //transform.DOScale(new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z),0.1f); - //ֵת ԹתδʱٴηתɵʼǶȲͬӶӰĿǶ + //分情况定值翻转 可以规避在旋转动画未结束时再次翻转的造成的起始角度不同从而影响目标角度误差的问题 switch (isRight) { case 1: transform.DORotate(new Vector3(0, 0, 0), flipDuration); @@ -87,27 +94,35 @@ public class Player : PlayerControl case -1: transform.DORotate(new Vector3(0,180,0), flipDuration); break; - } - - - } - + } + } } /// - /// Ƿֹͣҡ + /// 检测是否停止摇杆输入 /// void OnInputDetect() { if (inputDir == 0) Freeze(); } /// - /// ǿƾֹ + /// 强制静止 /// void Freeze() { m_rigidbody.velocity = new Vector2(0,m_rigidbody.velocity.y); } + void Moving() { + m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); + } + + + + + + + + /// override protected void OnMove(InputAction.CallbackContext ctx) { @@ -116,6 +131,7 @@ public class Player : PlayerControl } override protected void OnAtk() { base.OnAtk(); + } override protected void OnJump() { base.OnJump(); @@ -130,25 +146,53 @@ public class Player : PlayerControl } - void Moving() { - m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); + protected override void OnLeftChange() + { + WeaponReturn(); + ItemController.Instance.LeftChangeItem(); + WeaponInPosition(); + } - private void OnCollisionEnter2D(Collision2D collision)// + protected override void OnRightChange() { - //ʱһ + ItemController.Instance.RightChangeItem(); + } + + + void WeaponInPosition() { + GameObject chosenOne; + chosenOne = GameObject.Find(weapon.name); + if (chosenOne.TryGetComponent(out Item chosenWeapen)) + chosenWeapen.InPosition(weapon.transform); + } + + void WeaponReturn() + { + GameObject chosenOne; + chosenOne = GameObject.Find(weapon.name); + if (chosenOne.TryGetComponent(out Item chosenWeapen)) + chosenWeapen.ReturnToOri(); + } + + + + + private void OnCollisionEnter2D(Collision2D collision)//当有物体碰上 + { + //创到地面时触发一次 if (collision.transform.CompareTag("Ground")) { - //ŵ׷һ + //向脚底发射一条短射线 Ray2D ray = new Ray2D( - GroundCheck.position, + groundCheck.position, Vector2.down ); Debug.DrawRay(ray.origin, ray.direction, Color.red, 10f); - //ȡߵײ + //获取射线的碰撞结果 RaycastHit2D hit2D; hit2D = Physics2D.Raycast(ray.origin, ray.direction, 0.001f); - //нߴǵ,űʾŵ + //如果射线有结果并且射线创到的是地面,才表示着地了 if (hit2D && hit2D.collider.transform.CompareTag("Ground")) { isGround = true; diff --git a/Assets/Scripts/乐/Shu.cs b/Assets/Scripts/乐/Shu.cs new file mode 100644 index 0000000..1fa5f10 --- /dev/null +++ b/Assets/Scripts/乐/Shu.cs @@ -0,0 +1,67 @@ +using DG.Tweening; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Shu : Interactable +{ + int interactState = 0; + public float rotateDuration=0.5f; + SpriteRenderer m_spr; + public Sprite sprite_Mu; + bool interating = false; + + public Item Stick1; + public Item Stick2; + + override protected void Start() + { + base.Start(); + m_spr = GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } + + public override void OnCall() + { + + switch (interactState) { + case 0: + ItemController.Instance.AddItem(Stick1); + ItemController.Instance.AddItem(Stick2); + ChangesDuringIntertacting(); + break; + case 1: + transform.DORotate(new Vector3(0, 0, -90), rotateDuration); + ChangesDuringIntertacting(); + break; + default: + break; + } + + } + + void ResetInteracting() { + interating = false; + CancleEvent(); + } + + void ChangesDuringIntertacting() + { + if (interating==false) { + player.ToMap("Null"); + interactState++; + interating = true; + Invoke(nameof(ResetInteracting), rotateDuration);} + } + + public override void CancleEvent() + { + player.ToMap("Normal"); + + } +} diff --git a/Assets/Scripts/乐/Tree.cs.meta b/Assets/Scripts/乐/Shu.cs.meta similarity index 100% rename from Assets/Scripts/乐/Tree.cs.meta rename to Assets/Scripts/乐/Shu.cs.meta diff --git a/Assets/Scripts/乐/Stick.cs b/Assets/Scripts/乐/Stick.cs new file mode 100644 index 0000000..167723d --- /dev/null +++ b/Assets/Scripts/乐/Stick.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Stick :Item +{ + + + // Start is called before the first frame update + protected override void Start() + { + base.Start(); + } + + // Update is called once per frame + void Update() + { + + } + + protected override void Attack() + { + base.Attack(); + } +} diff --git a/Assets/Scripts/乐/Stick.cs.meta b/Assets/Scripts/乐/Stick.cs.meta new file mode 100644 index 0000000..5b47001 --- /dev/null +++ b/Assets/Scripts/乐/Stick.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 38942215688709940aa75b20394fe4f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/Tree.cs b/Assets/Scripts/乐/Tree.cs deleted file mode 100644 index b6de203..0000000 --- a/Assets/Scripts/乐/Tree.cs +++ /dev/null @@ -1,42 +0,0 @@ -using DG.Tweening; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Tree : Interactable -{ - int interactState = 0; - public float rotateDuration=0.5f; - SpriteRenderer m_spr; - public Sprite sprite_Mu; - void Start() - { - m_spr = GetComponent(); - } - - // Update is called once per frame - void Update() - { - - } - - public override void OnCall() - { - switch (interactState) { - case 0: - transform.DORotate(new Vector3(0, 0, -90), rotateDuration); - interactState++; - break; - case 1: - m_spr.sprite = sprite_Mu; - interactState++; - break; - default: - break; - } - - - - - } -} diff --git a/Assets/Scripts/勍/Interactable.cs b/Assets/Scripts/勍/Interactable.cs index c317f85..9b89ca6 100644 --- a/Assets/Scripts/勍/Interactable.cs +++ b/Assets/Scripts/勍/Interactable.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,7 +8,9 @@ using UnityEngine; /// public class Interactable : Event { - void Start() + + protected Player player; + protected virtual void Start() { //检查触发器 if (GetComponent() == null) @@ -25,7 +28,13 @@ public class Interactable : Event if (other.TryGetComponent(out PlayerInteract playerInteract)) { playerInteract.SetCatched(this); + } + if (other.TryGetComponent(out Player player)) + { + this.player = player; + } + } void OnTriggerExit2D(Collider2D other) @@ -35,4 +44,9 @@ public class Interactable : Event playerInteract.CancleCatched(this); } } + + internal void OnTriggerEnter2D() + { + throw new NotImplementedException(); + } } diff --git a/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta b/Assets/美术素材/杂项.meta similarity index 67% rename from Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta rename to Assets/美术素材/杂项.meta index eebd079..32f1773 100644 --- a/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta +++ b/Assets/美术素材/杂项.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: fd02c799f3f5c4c83b2fc26c105a3821 +guid: 5859259546e18dd4ba0dea2a9de51cfc +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/美术素材/杂项/大木头.png b/Assets/美术素材/杂项/大木头.png new file mode 100644 index 0000000..11108ab Binary files /dev/null and b/Assets/美术素材/杂项/大木头.png differ diff --git a/Assets/美术素材/杂项/大木头.png.meta b/Assets/美术素材/杂项/大木头.png.meta new file mode 100644 index 0000000..186340e --- /dev/null +++ b/Assets/美术素材/杂项/大木头.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a3f0028dad18e9e4cbea3032a15d1af1 +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/美术素材/杂项/小木头.png b/Assets/美术素材/杂项/小木头.png new file mode 100644 index 0000000..c3903dd Binary files /dev/null and b/Assets/美术素材/杂项/小木头.png differ diff --git a/Assets/美术素材/杂项/小木头.png.meta b/Assets/美术素材/杂项/小木头.png.meta new file mode 100644 index 0000000..b6b0dec --- /dev/null +++ b/Assets/美术素材/杂项/小木头.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 208da563c96740e438a01a757872c8cf +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/美术素材/杂项/木-字.png b/Assets/美术素材/杂项/木-字.png new file mode 100644 index 0000000..ca8d90d Binary files /dev/null and b/Assets/美术素材/杂项/木-字.png differ diff --git a/Assets/美术素材/杂项/木-字.png.meta b/Assets/美术素材/杂项/木-字.png.meta new file mode 100644 index 0000000..a565892 --- /dev/null +++ b/Assets/美术素材/杂项/木-字.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 2c5e368e5beb231498ff8a1e97e9b105 +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/美术素材/杂项/树-字.png b/Assets/美术素材/杂项/树-字.png new file mode 100644 index 0000000..0658367 Binary files /dev/null and b/Assets/美术素材/杂项/树-字.png differ diff --git a/Assets/美术素材/杂项/树-字.png.meta b/Assets/美术素材/杂项/树-字.png.meta new file mode 100644 index 0000000..596eb47 --- /dev/null +++ b/Assets/美术素材/杂项/树-字.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: dd1d169d630929b4c9bf20d377fe0377 +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/美术素材/杂项/水.png b/Assets/美术素材/杂项/水.png new file mode 100644 index 0000000..f15f721 Binary files /dev/null and b/Assets/美术素材/杂项/水.png differ diff --git a/Assets/美术素材/杂项/水.png.meta b/Assets/美术素材/杂项/水.png.meta new file mode 100644 index 0000000..8b294fc --- /dev/null +++ b/Assets/美术素材/杂项/水.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 3d7d3ebe6a6447544a75481dae841879 +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/美术素材/杂项/火.png b/Assets/美术素材/杂项/火.png new file mode 100644 index 0000000..57fd218 Binary files /dev/null and b/Assets/美术素材/杂项/火.png differ diff --git a/Assets/美术素材/杂项/火.png.meta b/Assets/美术素材/杂项/火.png.meta new file mode 100644 index 0000000..631a875 --- /dev/null +++ b/Assets/美术素材/杂项/火.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 70d51fe5529327246ac1a59122dabd6c +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/美术素材/杂项/火把.png b/Assets/美术素材/杂项/火把.png new file mode 100644 index 0000000..27dcc4e Binary files /dev/null and b/Assets/美术素材/杂项/火把.png differ diff --git a/Assets/美术素材/杂项/火把.png.meta b/Assets/美术素材/杂项/火把.png.meta new file mode 100644 index 0000000..0b5735d --- /dev/null +++ b/Assets/美术素材/杂项/火把.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5c0aba5708616c04182e2737f0b79fec +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/美术素材/杂项/石.png b/Assets/美术素材/杂项/石.png new file mode 100644 index 0000000..25458f3 Binary files /dev/null and b/Assets/美术素材/杂项/石.png differ diff --git a/Assets/美术素材/杂项/石.png.meta b/Assets/美术素材/杂项/石.png.meta new file mode 100644 index 0000000..931566a --- /dev/null +++ b/Assets/美术素材/杂项/石.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6b62e188606d12d4484e4012216d999f +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/美术素材/杂项/石刀.png b/Assets/美术素材/杂项/石刀.png new file mode 100644 index 0000000..8832ae0 Binary files /dev/null and b/Assets/美术素材/杂项/石刀.png differ diff --git a/Assets/美术素材/杂项/石刀.png.meta b/Assets/美术素材/杂项/石刀.png.meta new file mode 100644 index 0000000..346bfb8 --- /dev/null +++ b/Assets/美术素材/杂项/石刀.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: dc56fb8ee3fd2f140af2c2f5b46474ca +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/美术素材/杂项/石斧.png b/Assets/美术素材/杂项/石斧.png new file mode 100644 index 0000000..0174a90 Binary files /dev/null and b/Assets/美术素材/杂项/石斧.png differ diff --git a/Assets/美术素材/杂项/石斧.png.meta b/Assets/美术素材/杂项/石斧.png.meta new file mode 100644 index 0000000..447b6d2 --- /dev/null +++ b/Assets/美术素材/杂项/石斧.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: c0a0626de86a9ef4dbc8aa6f4ec78707 +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/美术素材/杂项/碎石块.png b/Assets/美术素材/杂项/碎石块.png new file mode 100644 index 0000000..9ef5592 Binary files /dev/null and b/Assets/美术素材/杂项/碎石块.png differ diff --git a/Assets/美术素材/杂项/碎石块.png.meta b/Assets/美术素材/杂项/碎石块.png.meta new file mode 100644 index 0000000..4ba48ca --- /dev/null +++ b/Assets/美术素材/杂项/碎石块.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6e29a4b4f493b5a418290dcc35785c1f +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/美术素材/杂项/落雷.png b/Assets/美术素材/杂项/落雷.png new file mode 100644 index 0000000..63d286a Binary files /dev/null and b/Assets/美术素材/杂项/落雷.png differ diff --git a/Assets/美术素材/杂项/落雷.png.meta b/Assets/美术素材/杂项/落雷.png.meta new file mode 100644 index 0000000..42e7ba4 --- /dev/null +++ b/Assets/美术素材/杂项/落雷.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 41b18b678381f1e499d268570f60d426 +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/美术素材/杂项/虎.png b/Assets/美术素材/杂项/虎.png new file mode 100644 index 0000000..c979db4 Binary files /dev/null and b/Assets/美术素材/杂项/虎.png differ diff --git a/Assets/美术素材/杂项/虎.png.meta b/Assets/美术素材/杂项/虎.png.meta new file mode 100644 index 0000000..b61699f --- /dev/null +++ b/Assets/美术素材/杂项/虎.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 602bf12dbb7835f4fa9d43060264472d +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/美术素材/杂项/逐帧火焰.png b/Assets/美术素材/杂项/逐帧火焰.png new file mode 100644 index 0000000..58b1c2c Binary files /dev/null and b/Assets/美术素材/杂项/逐帧火焰.png differ diff --git a/Assets/美术素材/杂项/逐帧火焰.png.meta b/Assets/美术素材/杂项/逐帧火焰.png.meta new file mode 100644 index 0000000..7eb27c1 --- /dev/null +++ b/Assets/美术素材/杂项/逐帧火焰.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 91e1e28fe75915c4493e1ac23df68aca +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/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index 6508084..6cb264c 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -72,3 +72,13 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms +[api-updater (non-obsolete-error-filter)] 2022/3/15 11:16:23 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 847.0362ms +moved types parse time: 53ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms +