diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab index a6e7e7ae..d748c7f1 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab @@ -28,9 +28,85 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5369959147404257646} + - {fileID: 1931312758233968685} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1931312758233507997 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 725573346534502187} + m_Modifications: + - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_Name + value: GunFireYellow (1) + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} +--- !u!4 &1931312758233968685 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, + type: 3} + m_PrefabInstance: {fileID: 1931312758233507997} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5369959147404325342 PrefabInstance: m_ObjectHideFlags: 0 @@ -60,7 +136,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.45 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab index 42041593..f783b821 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab @@ -28,9 +28,85 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5369959147404257646} + - {fileID: 1931312758233968685} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1931312758233507997 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 725573346534502187} + m_Modifications: + - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_Name + value: GunFireYellow (1) + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} +--- !u!4 &1931312758233968685 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, + type: 3} + m_PrefabInstance: {fileID: 1931312758233507997} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5369959147404325342 PrefabInstance: m_ObjectHideFlags: 0 @@ -60,7 +136,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.45 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab.meta b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab.meta index f7c8b167..ae73b6c9 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab.meta +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1700fb8291df4aed83b5ce66bcdf312 +guid: 80e7a878d41b04d668ab6e58e796f3c7 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab index 457679c3..8638cfdd 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab @@ -1,64 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7707231149869136832 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7707231149869136675} - - component: {fileID: 1645396772638173221} - - component: {fileID: 8337386484776744325} - m_Layer: 0 - m_Name: BulletMonster_05 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7707231149869136675 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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: 9135409849477990309} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1645396772638173221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} - m_Name: - m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, - type: 3} - mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} - mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} - mOrbit: 0 ---- !u!96 &8337386484776744325 +--- !u!96 &2928495455450056352 TrailRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} + m_GameObject: {fileID: 930298082207856434} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -148,7 +97,155 @@ TrailRenderer: m_MinVertexDistance: 0.1 m_Autodestruct: 0 m_Emitting: 1 ---- !u!1001 &9139859469233270859 +--- !u!1 &7707231149869136832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7707231149869136675} + - component: {fileID: 1645396772638173221} + m_Layer: 0 + m_Name: BulletMonster_05 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7707231149869136675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7707231149869136832} + 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: 9135409849477990309} + - {fileID: 936625017641591368} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1645396772638173221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7707231149869136832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} + m_Name: + m_EditorClassIdentifier: + mSpeed: 40 + mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, + type: 3} + mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} + mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} + mOrbit: 0 +--- !u!96 &3967930852564081952 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138336407629140703} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.3 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.15421009 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0.95461273, g: 1, b: 0, a: 1} + key1: {r: 0.95461273, g: 1, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 386 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1001 &932170793412679078 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -157,15 +254,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_Name - value: arrow01_blue + value: arrow01_blue (1) objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.45 objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_LocalPosition.y @@ -205,6 +302,81 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} +--- !u!1 &930298082207856434 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 932170793412679078} + m_PrefabAsset: {fileID: 0} +--- !u!4 &936625017641591368 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 932170793412679078} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9139859469233270859 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7707231149869136675} + m_Modifications: + - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_Name + value: arrow01_blue + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} +--- !u!1 &9138336407629140703 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 9139859469233270859} + m_PrefabAsset: {fileID: 0} --- !u!4 &9135409849477990309 stripped Transform: m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab index 6a567db2..45f51d3d 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab @@ -1,64 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7707231149869136832 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7707231149869136675} - - component: {fileID: 1645396772638173221} - - component: {fileID: 8337386484776744325} - m_Layer: 0 - m_Name: BulletMonster_06 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7707231149869136675 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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: 9135409849477990309} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1645396772638173221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} - m_Name: - m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, - type: 3} - mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} - mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} - mOrbit: 0 ---- !u!96 &8337386484776744325 +--- !u!96 &2928495455450056352 TrailRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} + m_GameObject: {fileID: 930298082207856434} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -148,7 +97,155 @@ TrailRenderer: m_MinVertexDistance: 0.1 m_Autodestruct: 0 m_Emitting: 1 ---- !u!1001 &9139859469233270859 +--- !u!1 &7707231149869136832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7707231149869136675} + - component: {fileID: 1645396772638173221} + m_Layer: 0 + m_Name: BulletMonster_06 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7707231149869136675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7707231149869136832} + 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: 9135409849477990309} + - {fileID: 936625017641591368} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1645396772638173221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7707231149869136832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} + m_Name: + m_EditorClassIdentifier: + mSpeed: 40 + mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, + type: 3} + mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} + mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} + mOrbit: 0 +--- !u!96 &3967930852564081952 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138336407629140703} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.3 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.15421009 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0.95461273, g: 1, b: 0, a: 1} + key1: {r: 0.95461273, g: 1, b: 0, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 386 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1001 &932170793412679078 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -157,15 +254,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_Name - value: arrow01_blue + value: arrow01_blue (1) objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.45 objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_LocalPosition.y @@ -205,6 +302,81 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} +--- !u!1 &930298082207856434 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 932170793412679078} + m_PrefabAsset: {fileID: 0} +--- !u!4 &936625017641591368 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 932170793412679078} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9139859469233270859 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7707231149869136675} + m_Modifications: + - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_Name + value: arrow01_blue + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} +--- !u!1 &9138336407629140703 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, + type: 3} + m_PrefabInstance: {fileID: 9139859469233270859} + m_PrefabAsset: {fileID: 0} --- !u!4 &9135409849477990309 stripped Transform: m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta index 839e0a4f..1e8cee1d 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9f6f0f56d900b462b81f985854d217d2 +guid: 0f44f84b8cfe04d76b91a9982cbe58e4 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index 9b03074c..f45cb251 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -209,9 +209,9 @@ public class Utils case 5: tHOffset = 3.5f; break; case 6: tHOffset = 4f; break; case 7: tHOffset = 4.5f; break; - case 8: tHOffset = 3.5f; break; - case 9: tHOffset = 4f; break; - case 10: tHOffset = 5f; break; + case 8: tHOffset = 4.5f; break; + case 9: tHOffset = 4.5f; break; + case 10: tHOffset = 4.5f; break; } } else if (pBType == BlockType.Human) @@ -222,11 +222,11 @@ public class Utils case 2: tHOffset = 2f; break; case 3: tHOffset = 3f; break; case 4: tHOffset = 3f; break; - case 5: tHOffset = 3.5f; break; - case 6: tHOffset = 4f; break; - case 7: tHOffset = 4.5f; break; - case 8: tHOffset = 5f; break; - case 9: tHOffset = 5.2f; break; + case 5: tHOffset = 5f; break; + case 6: tHOffset = 5f; break; + case 7: tHOffset = 6f; break; + case 8: tHOffset = 6f; break; + case 9: tHOffset = 6f; break; case 10: tHOffset = 6f; break; } } @@ -247,10 +247,10 @@ public class Utils case 4: tScale = 0.5f; break; case 5: case 6: - case 7: tScale = 0.8f; break; - case 8: tScale = 1f; break; + case 7: tScale = 0.6f; break; + case 8: tScale = 0.7f; break; case 9: - case 10: tScale = 1.2f; break; + case 10: tScale = 0.8f; break; } } else if (pBType == BlockType.Human) @@ -264,9 +264,9 @@ public class Utils case 5: tScale = 0.5f; break; case 6: tScale = 0.5f; break; case 7: tScale = 0.6f; break; - case 8: tScale = 0.7f; break; - case 9: tScale = 0.8f; break; - case 10: tScale = 1f; break; + case 8: tScale = 0.6f; break; + case 9: tScale = 0.6f; break; + case 10: tScale = 0.7f; break; } } @@ -283,10 +283,6 @@ public class Utils case 1: case 2: case 3: tLength = 1.167f; break; - case 4: - case 5: - case 6: - case 7: tLength = 1f; break; } } else if (pBType == BlockType.Human) @@ -297,9 +293,6 @@ public class Utils case 2: tLength = 1.033f; break; case 3: case 4: tLength = 1.333f; break; - case 5: - case 6: - case 7: tLength = 1f; break; } }