diff --git a/Assets/Animate/Thunder/LightAttack.anim b/Assets/Animate/Thunder/LightAttack.anim index 29c5083..cccd02e 100644 --- a/Assets/Animate/Thunder/LightAttack.anim +++ b/Assets/Animate/Thunder/LightAttack.anim @@ -304,7 +304,248 @@ AnimationClip: path: classID: 61 script: {fileID: 0} - m_PPtrCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: GameObject + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: GameObject/GameObject (1) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 0.3254902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: GameObject + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: f52995b186599e748bb4ac1aa2adec15, type: 3} + - time: 0.71666664 + value: {fileID: 21300000, guid: 9653048377be1e249aedf22cbd840e65, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 1565c879ea5d89b4c95631a5c956ab49, type: 3} + - time: 0.78333336 + value: {fileID: 21300000, guid: 16f9e85a4068b4242a553039343f2256, type: 3} + - time: 0.81666666 + value: {fileID: 21300000, guid: a0bbd353e1fa5084daaadc05986cddea, type: 3} + attribute: m_Sprite + path: GameObject + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -368,7 +609,89 @@ AnimationClip: typeID: 61 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: [] + - serializedVersion: 2 + path: 1482111001 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2597326486 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2597326486 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1482111001 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1482111001 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2597326486 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2597326486 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2597326486 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1482111001 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1482111001 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1482111001 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: f52995b186599e748bb4ac1aa2adec15, type: 3} + - {fileID: 21300000, guid: 9653048377be1e249aedf22cbd840e65, type: 3} + - {fileID: 21300000, guid: 1565c879ea5d89b4c95631a5c956ab49, type: 3} + - {fileID: 21300000, guid: 16f9e85a4068b4242a553039343f2256, type: 3} + - {fileID: 21300000, guid: a0bbd353e1fa5084daaadc05986cddea, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -962,6 +1285,232 @@ AnimationClip: path: classID: 61 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.68333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: GameObject + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: GameObject/GameObject (1) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 0.3254902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: GameObject/GameObject (1) + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: GameObject + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.81666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: GameObject + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Prefabs/火把.prefab b/Assets/Prefabs/火把.prefab index 03b945a..8e6213d 100644 --- a/Assets/Prefabs/火把.prefab +++ b/Assets/Prefabs/火把.prefab @@ -27,7 +27,7 @@ Transform: 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_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Prefabs/着火.prefab b/Assets/Prefabs/着火.prefab index fe9bb5e..51ab577 100644 --- a/Assets/Prefabs/着火.prefab +++ b/Assets/Prefabs/着火.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1526015722} - component: {fileID: 1526015724} - component: {fileID: 1526015723} + - component: {fileID: 1293624182534080961} m_Layer: 0 m_Name: "\u9010\u5E27\u706B\u7130_0 (1)" m_TagString: Untagged @@ -26,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526015721} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.86, y: 3.32, z: 0} + m_LocalPosition: {x: 2.61, y: 0.8, z: 0} m_LocalScale: {x: 1.2578193, y: 1.6940328, z: 1.6940328} m_Children: [] m_Father: {fileID: 4181178188287077441} @@ -102,6 +103,18 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1293624182534080961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526015721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3212449af0acfc4c8cc44c64580c1cf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4181178188287077447 GameObject: m_ObjectHideFlags: 0 @@ -129,7 +142,7 @@ Transform: m_GameObject: {fileID: 4181178188287077447} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.05, y: 6.19, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: - {fileID: 1526015722} m_Father: {fileID: 0} diff --git a/Assets/Prefabs/石刀.prefab b/Assets/Prefabs/石刀.prefab index 9ffd596..d19cff6 100644 --- a/Assets/Prefabs/石刀.prefab +++ b/Assets/Prefabs/石刀.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 6620016358095660858} m_LocalRotation: {x: -0, y: -0, z: -0.11641215, w: 0.993201} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Prefabs/石斧.prefab b/Assets/Prefabs/石斧.prefab index b349719..410e5a9 100644 --- a/Assets/Prefabs/石斧.prefab +++ b/Assets/Prefabs/石斧.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 3700592915405010631} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 26.43, y: 5.04, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Prefabs/雷电将军.prefab b/Assets/Prefabs/雷电将军.prefab index 819322c..db185f0 100644 --- a/Assets/Prefabs/雷电将军.prefab +++ b/Assets/Prefabs/雷电将军.prefab @@ -1,5 +1,170 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2197709718131311243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6723009446901529001} + - component: {fileID: 5769964208351876083} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6723009446901529001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2197709718131311243} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.07, z: -0.619435} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8116797640494453209} + m_Father: {fileID: 8423221657279361533} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5769964208351876083 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2197709718131311243} + 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: -1852505165 + m_SortingLayer: 4 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: f52995b186599e748bb4ac1aa2adec15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.84, y: 9.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7024800756661215748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8116797640494453209} + - component: {fileID: 165127092768132024} + m_Layer: 0 + m_Name: GameObject (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8116797640494453209 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7024800756661215748} + 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: 6723009446901529001} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &165127092768132024 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7024800756661215748} + 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: -1852505165 + m_SortingLayer: 4 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 41b18b678381f1e499d268570f60d426, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.84, y: 9.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8423221657279361535 GameObject: m_ObjectHideFlags: 0 @@ -29,10 +194,11 @@ Transform: m_GameObject: {fileID: 8423221657279361535} 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_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: - {fileID: 8423221657914492193} - {fileID: 8423221657652136749} + - {fileID: 6723009446901529001} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -132,7 +298,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8423221657652136749 Transform: m_ObjectHideFlags: 0 @@ -141,7 +307,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8423221657652136748} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.15, z: 0} + m_LocalPosition: {x: 0, y: 0.04000008, z: 0} m_LocalScale: {x: 0.1625, y: 8.0757, z: 1} m_Children: [] m_Father: {fileID: 8423221657279361533} @@ -223,7 +389,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8423221657914492192} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -3.01, z: 0} + m_LocalPosition: {x: 0, y: -4.12, z: 0} m_LocalScale: {x: 1.225, y: 0.62519, z: 1} m_Children: [] m_Father: {fileID: 8423221657279361533} diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity index a34da9c..c3162b3 100644 --- a/Assets/Scenes/乐/Sample1.unity +++ b/Assets/Scenes/乐/Sample1.unity @@ -613,7 +613,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223863017} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.91, y: -4.4, z: 0} + m_LocalPosition: {x: -6.91, y: -4.2, z: 0} m_LocalScale: {x: 18.835022, y: 2.321, z: 2.321} m_Children: [] m_Father: {fileID: 0} @@ -957,7 +957,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 522233063} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 35.2, y: -4.4, z: 0} + m_LocalPosition: {x: 35.2, y: -4.2, z: 0} m_LocalScale: {x: 55.699375, y: 2.321, z: 2.321} m_Children: [] m_Father: {fileID: 0} @@ -1018,7 +1018,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 4.5 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1042,7 +1042,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537498726} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 0, y: -1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -3332,7 +3332,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} propertyPath: m_LocalPosition.y - value: -1.21 + value: -0.88 objectReference: {fileID: 0} - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} propertyPath: m_LocalPosition.z @@ -4076,7 +4076,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: axe: {fileID: 8295477822109103334} - interactTime: 1 + interactTime: 1.5 --- !u!61 &1381849288 BoxCollider2D: m_ObjectHideFlags: 0 @@ -4270,9 +4270,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584969320} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.31, y: -0.24, z: 0} + m_LocalPosition: {x: 6.58, y: -0.25, z: 0} m_LocalScale: {x: 0.9375, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1819007945} m_Father: {fileID: 1007217205} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4289,7 +4290,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.8005185, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -4300,7 +4301,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 15, y: 1} + m_Size: {x: 13.398963, y: 1} m_EdgeRadius: 0 --- !u!1 &1588872233 GameObject: @@ -4557,6 +4558,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} m_PrefabInstance: {fileID: 1240253823} m_PrefabAsset: {fileID: 0} +--- !u!1 &1819007944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1819007945} + - component: {fileID: 1819007946} + m_Layer: 0 + m_Name: "\u6865\u7684\u78B0\u649E\u76D2\u5B50 (1)" + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1819007945 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819007944} + m_LocalRotation: {x: -0, y: -0, z: 0.20366171, w: 0.9790414} + m_LocalPosition: {x: -7.58, y: -0.79, z: 0} + m_LocalScale: {x: 0.28216174, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1584969321} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 23.502} +--- !u!61 &1819007946 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819007944} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.8005185, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 13.398963, y: 1} + m_EdgeRadius: 0 --- !u!1 &1979334484 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/乐/FireDir.cs b/Assets/Scripts/乐/FireDir.cs new file mode 100644 index 0000000..920d95f --- /dev/null +++ b/Assets/Scripts/乐/FireDir.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FireDir : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + transform.eulerAngles = Vector3.zero; + } +} diff --git a/Assets/Scripts/乐/FireDir.cs.meta b/Assets/Scripts/乐/FireDir.cs.meta new file mode 100644 index 0000000..7406643 --- /dev/null +++ b/Assets/Scripts/乐/FireDir.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3212449af0acfc4c8cc44c64580c1cf +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 7b68b0d..2afc947 100644 --- a/Assets/Scripts/乐/Player.cs +++ b/Assets/Scripts/乐/Player.cs @@ -279,4 +279,9 @@ public class Player : PlayerControl public void HurtInteractAnim() { boneAnim.SetTrigger("受伤"); } + + public void StoneInteractAnim() + { + boneAnim.SetTrigger("与火交互"); + } } diff --git a/Assets/Scripts/乐/Stone.cs b/Assets/Scripts/乐/Stone.cs index 95ab244..7b89374 100644 --- a/Assets/Scripts/乐/Stone.cs +++ b/Assets/Scripts/乐/Stone.cs @@ -24,8 +24,9 @@ public class Stone : Interacter ChangesDuringIntertacting(interactTime); if (player.weapon.name == "石刀") { + player.StoneInteractAnim();//播动画 Debug.Log("玩家制作石斧头动画"); - ItemController.Instance.ReplaceItem(axe); + Invoke(nameof(ChangeWeapon), interactTime);//配合动画延迟换武器 } else { Debug.Log("拿错物品"); @@ -37,4 +38,9 @@ public class Stone : Interacter } } + void ChangeWeapon() + { + ItemController.Instance.ReplaceItem(axe); + } + } diff --git a/Assets/动画/cangjie 1.controller b/Assets/动画/cangjie 1.controller index 31ab47e..e2ac9ec 100644 --- a/Assets/动画/cangjie 1.controller +++ b/Assets/动画/cangjie 1.controller @@ -155,7 +155,7 @@ AnimatorStateMachine: m_Position: {x: 460, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: 2237875931420563081} - m_Position: {x: 520, y: 320, z: 0} + m_Position: {x: 510, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: -1622693631265719714} m_Position: {x: 570, y: 380, z: 0} @@ -164,7 +164,7 @@ AnimatorStateMachine: m_Position: {x: 620, y: 460, z: 0} - serializedVersion: 1 m_State: {fileID: -8370624700981571467} - m_Position: {x: 540, y: 520, z: 0} + m_Position: {x: 650, y: 550, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 4157471829353929879} @@ -246,25 +246,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Move m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: "\u4E0E\u706B\u4EA4\u4E92" m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: "\u53D7\u4F24" m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/美术素材/杂项/武器.meta b/Assets/美术素材/杂项/武器.meta new file mode 100644 index 0000000..9ae28cc --- /dev/null +++ b/Assets/美术素材/杂项/武器.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82bce3f7a9333834287dfd8ab7132cae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/杂项/小木头.png b/Assets/美术素材/杂项/武器/小木头.png similarity index 100% rename from Assets/美术素材/杂项/小木头.png rename to Assets/美术素材/杂项/武器/小木头.png diff --git a/Assets/美术素材/杂项/小木头.png.meta b/Assets/美术素材/杂项/武器/小木头.png.meta similarity index 100% rename from Assets/美术素材/杂项/小木头.png.meta rename to Assets/美术素材/杂项/武器/小木头.png.meta diff --git a/Assets/美术素材/杂项/武器/火把.png b/Assets/美术素材/杂项/武器/火把.png new file mode 100644 index 0000000..118799c Binary files /dev/null and b/Assets/美术素材/杂项/武器/火把.png differ diff --git a/Assets/美术素材/杂项/火把.png.meta b/Assets/美术素材/杂项/武器/火把.png.meta similarity index 100% rename from Assets/美术素材/杂项/火把.png.meta rename to Assets/美术素材/杂项/武器/火把.png.meta diff --git a/Assets/美术素材/杂项/武器/石刀.png b/Assets/美术素材/杂项/武器/石刀.png new file mode 100644 index 0000000..d7a2cee Binary files /dev/null and b/Assets/美术素材/杂项/武器/石刀.png differ diff --git a/Assets/美术素材/杂项/石刀.png.meta b/Assets/美术素材/杂项/武器/石刀.png.meta similarity index 100% rename from Assets/美术素材/杂项/石刀.png.meta rename to Assets/美术素材/杂项/武器/石刀.png.meta diff --git a/Assets/美术素材/杂项/武器/石斧.png b/Assets/美术素材/杂项/武器/石斧.png new file mode 100644 index 0000000..9fe8a00 Binary files /dev/null and b/Assets/美术素材/杂项/武器/石斧.png differ diff --git a/Assets/美术素材/杂项/石斧.png.meta b/Assets/美术素材/杂项/武器/石斧.png.meta similarity index 100% rename from Assets/美术素材/杂项/石斧.png.meta rename to Assets/美术素材/杂项/武器/石斧.png.meta diff --git a/Assets/美术素材/杂项/火把.png b/Assets/美术素材/杂项/火把.png deleted file mode 100644 index 27dcc4e..0000000 Binary files a/Assets/美术素材/杂项/火把.png and /dev/null differ diff --git a/Assets/美术素材/杂项/石刀.png b/Assets/美术素材/杂项/石刀.png deleted file mode 100644 index 8832ae0..0000000 Binary files a/Assets/美术素材/杂项/石刀.png and /dev/null differ diff --git a/Assets/美术素材/杂项/石斧.png b/Assets/美术素材/杂项/石斧.png deleted file mode 100644 index 0174a90..0000000 Binary files a/Assets/美术素材/杂项/石斧.png and /dev/null differ diff --git a/Assets/美术素材/杂项/落雷.meta b/Assets/美术素材/杂项/落雷.meta new file mode 100644 index 0000000..4fe2bba --- /dev/null +++ b/Assets/美术素材/杂项/落雷.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae7f54cab17a99b45976418135611890 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/美术素材/杂项/落雷/雷 (1).PNG b/Assets/美术素材/杂项/落雷/雷 (1).PNG new file mode 100644 index 0000000..2b4e80b 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..2bae61f --- /dev/null +++ b/Assets/美术素材/杂项/落雷/雷 (1).PNG.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: f52995b186599e748bb4ac1aa2adec15 +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/美术素材/杂项/落雷/雷 (2).PNG b/Assets/美术素材/杂项/落雷/雷 (2).PNG new file mode 100644 index 0000000..0f8a5b7 Binary files /dev/null and b/Assets/美术素材/杂项/落雷/雷 (2).PNG differ diff --git a/Assets/美术素材/杂项/落雷/雷 (2).PNG.meta b/Assets/美术素材/杂项/落雷/雷 (2).PNG.meta new file mode 100644 index 0000000..69fffc7 --- /dev/null +++ b/Assets/美术素材/杂项/落雷/雷 (2).PNG.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 9653048377be1e249aedf22cbd840e65 +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/美术素材/杂项/落雷/雷 (3).PNG b/Assets/美术素材/杂项/落雷/雷 (3).PNG new file mode 100644 index 0000000..81e1663 Binary files /dev/null and b/Assets/美术素材/杂项/落雷/雷 (3).PNG differ diff --git a/Assets/美术素材/杂项/落雷/雷 (3).PNG.meta b/Assets/美术素材/杂项/落雷/雷 (3).PNG.meta new file mode 100644 index 0000000..e6ec466 --- /dev/null +++ b/Assets/美术素材/杂项/落雷/雷 (3).PNG.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 1565c879ea5d89b4c95631a5c956ab49 +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/美术素材/杂项/落雷/雷 (4).PNG b/Assets/美术素材/杂项/落雷/雷 (4).PNG new file mode 100644 index 0000000..752fa24 Binary files /dev/null and b/Assets/美术素材/杂项/落雷/雷 (4).PNG differ diff --git a/Assets/美术素材/杂项/落雷/雷 (4).PNG.meta b/Assets/美术素材/杂项/落雷/雷 (4).PNG.meta new file mode 100644 index 0000000..a8ad436 --- /dev/null +++ b/Assets/美术素材/杂项/落雷/雷 (4).PNG.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 16f9e85a4068b4242a553039343f2256 +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/美术素材/杂项/落雷/雷 (5).PNG b/Assets/美术素材/杂项/落雷/雷 (5).PNG new file mode 100644 index 0000000..d8e953e Binary files /dev/null and b/Assets/美术素材/杂项/落雷/雷 (5).PNG differ diff --git a/Assets/美术素材/杂项/落雷/雷 (5).PNG.meta b/Assets/美术素材/杂项/落雷/雷 (5).PNG.meta new file mode 100644 index 0000000..3e8cf15 --- /dev/null +++ b/Assets/美术素材/杂项/落雷/雷 (5).PNG.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a0bbd353e1fa5084daaadc05986cddea +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 983ac30..53bb8fd 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -152,3 +152,13 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms +[api-updater (non-obsolete-error-filter)] 2022/3/30 18:58:57 : 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 : 810.9524ms +moved types parse time: 55ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms +