diff --git a/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta index b0f651a3..efd79e86 100644 --- a/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta +++ b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta @@ -10,8 +10,22 @@ AudioImporter: compressionFormat: 1 quality: 1 conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 1 normalize: 1 preloadAudioData: 1 loadInBackground: 0 diff --git a/Assets/Resources/Audio/Monster/Monster_01_Attack.wav b/Assets/Resources/Audio/Monster/Monster_01_Attack.wav deleted file mode 100644 index 8d5332a1..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_01_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_01_Hit.wav b/Assets/Resources/Audio/Monster/Monster_01_Hit.wav new file mode 100644 index 00000000..7b4270d1 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_01_Hit.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_03_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_01_Hit.wav.meta similarity index 94% rename from Assets/Resources/Audio/Monster/Monster_03_Attack.wav.meta rename to Assets/Resources/Audio/Monster/Monster_01_Hit.wav.meta index 0be603e5..3481597b 100644 --- a/Assets/Resources/Audio/Monster/Monster_03_Attack.wav.meta +++ b/Assets/Resources/Audio/Monster/Monster_01_Hit.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55665b2d0d446428daf5e9d845cd864c +guid: 1d2fb24c03da649c7b9e249811d44653 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Monster/Monster_02_Attack.wav b/Assets/Resources/Audio/Monster/Monster_02_Attack.wav deleted file mode 100644 index 0204eee5..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_02_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_03_Attack.wav b/Assets/Resources/Audio/Monster/Monster_03_Attack.wav deleted file mode 100644 index ded45a53..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_03_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_04_Atk.wav b/Assets/Resources/Audio/Monster/Monster_04_Atk.wav new file mode 100644 index 00000000..0c585bb0 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_04_Atk.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_01_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_04_Atk.wav.meta similarity index 94% rename from Assets/Resources/Audio/Monster/Monster_01_Attack.wav.meta rename to Assets/Resources/Audio/Monster/Monster_04_Atk.wav.meta index 33416cdc..d3573a4e 100644 --- a/Assets/Resources/Audio/Monster/Monster_01_Attack.wav.meta +++ b/Assets/Resources/Audio/Monster/Monster_04_Atk.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b0b20e3349e614c90bb63fb9caf1321c +guid: c08b54ca635804fee844cfb212be141f AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Monster/Monster_04_Attack.wav b/Assets/Resources/Audio/Monster/Monster_04_Attack.wav deleted file mode 100644 index 32b478f2..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_04_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_04_Hit.wav b/Assets/Resources/Audio/Monster/Monster_04_Hit.wav new file mode 100644 index 00000000..19cd0fc3 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_04_Hit.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_04_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_04_Hit.wav.meta similarity index 94% rename from Assets/Resources/Audio/Monster/Monster_04_Attack.wav.meta rename to Assets/Resources/Audio/Monster/Monster_04_Hit.wav.meta index 963fe607..cee8f5dc 100644 --- a/Assets/Resources/Audio/Monster/Monster_04_Attack.wav.meta +++ b/Assets/Resources/Audio/Monster/Monster_04_Hit.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2f4d0f6af0ba483e9715deb83f59bf5 +guid: 879df207512544e36a15f5bb98b3d795 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Monster/Monster_05_Attack.wav b/Assets/Resources/Audio/Monster/Monster_05_Attack.wav deleted file mode 100644 index 5cd8b01e..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_05_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_05_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_05_Attack.wav.meta deleted file mode 100644 index 9ddd51c4..00000000 --- a/Assets/Resources/Audio/Monster/Monster_05_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 946d02ca7d51c43f59ab2f385c9a6af3 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_06_Atk.wav b/Assets/Resources/Audio/Monster/Monster_06_Atk.wav new file mode 100644 index 00000000..3f4c3329 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_06_Atk.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_02_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_06_Atk.wav.meta similarity index 94% rename from Assets/Resources/Audio/Monster/Monster_02_Attack.wav.meta rename to Assets/Resources/Audio/Monster/Monster_06_Atk.wav.meta index 23ca207e..9ee189de 100644 --- a/Assets/Resources/Audio/Monster/Monster_02_Attack.wav.meta +++ b/Assets/Resources/Audio/Monster/Monster_06_Atk.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cbeca661247124284b21c8f38638495f +guid: 59520264e57344149a4f1e8ba0418422 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Monster/Monster_06_Attack.wav b/Assets/Resources/Audio/Monster/Monster_06_Attack.wav deleted file mode 100644 index 22b2cedd..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_06_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_06_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_06_Attack.wav.meta deleted file mode 100644 index 78c76c1b..00000000 --- a/Assets/Resources/Audio/Monster/Monster_06_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 3bf349022545641578df727fcfe146e7 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_06_Hit.wav b/Assets/Resources/Audio/Monster/Monster_06_Hit.wav new file mode 100644 index 00000000..d4499a58 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_06_Hit.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_06_Hit.wav.meta b/Assets/Resources/Audio/Monster/Monster_06_Hit.wav.meta new file mode 100644 index 00000000..49e9161d --- /dev/null +++ b/Assets/Resources/Audio/Monster/Monster_06_Hit.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: ddd79bd4bc7a44a8e8d873dc44a8dfc6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 1 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_07_Attack.wav b/Assets/Resources/Audio/Monster/Monster_07_Attack.wav deleted file mode 100644 index e356d04d..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_07_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_07_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_07_Attack.wav.meta deleted file mode 100644 index 110d768b..00000000 --- a/Assets/Resources/Audio/Monster/Monster_07_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 8f695c38f90454ee6833a236d43b9d14 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_08_Attack.wav b/Assets/Resources/Audio/Monster/Monster_08_Attack.wav deleted file mode 100644 index 86802f68..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_08_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_08_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_08_Attack.wav.meta deleted file mode 100644 index 6466abc3..00000000 --- a/Assets/Resources/Audio/Monster/Monster_08_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 8695aaf1307d64c4f9873058e8c5f650 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_09_Attack.wav b/Assets/Resources/Audio/Monster/Monster_09_Attack.wav deleted file mode 100644 index 663c6199..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_09_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_09_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_09_Attack.wav.meta deleted file mode 100644 index 2950dec7..00000000 --- a/Assets/Resources/Audio/Monster/Monster_09_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: ebcf6b1f18ff44abbb7fe701b3f2d17a -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Audio/Monster/Monster_10_Attack.wav b/Assets/Resources/Audio/Monster/Monster_10_Attack.wav deleted file mode 100644 index c9a6e287..00000000 Binary files a/Assets/Resources/Audio/Monster/Monster_10_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Monster/Monster_10_Attack.wav.meta b/Assets/Resources/Audio/Monster/Monster_10_Attack.wav.meta deleted file mode 100644 index 569259a0..00000000 --- a/Assets/Resources/Audio/Monster/Monster_10_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: f5864e8a2f0a24ed794c9c905976a724 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 4: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 1 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_03.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_03.prefab index 5c7930c1..0d90c050 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_03.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_03.prefab @@ -48,15 +48,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.x - value: 1.5 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.y - value: 1.5 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.z - value: 1.5 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_04.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_04.prefab index 55677c48..a7b4b0f6 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_04.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_04.prefab @@ -48,15 +48,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab index e3af032a..2138f5fd 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_05.prefab @@ -48,15 +48,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab index d3e025b9..6dfca765 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_06.prefab @@ -27,190 +27,158 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3089498496042208472} - - {fileID: 6330003187180729569} + - {fileID: 6999338860313392002} + - {fileID: 7630211761348435428} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3089498496042273116 +--- !u!1001 &6999338860313717554 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 725573346534502187} m_Modifications: - - target: {fileID: 179066, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_Name - value: GunFireBlue + value: GunFireYellow objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.x value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.z value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x value: 0.3 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startSizeY.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startSizeZ.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startRotationX.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startRotationY.minMaxState - value: 3 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} ---- !u!4 &3089498496042208472 stripped + m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} +--- !u!4 &6999338860313392002 stripped Transform: - m_CorrespondingSourceObject: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, + m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} - m_PrefabInstance: {fileID: 3089498496042273116} + m_PrefabInstance: {fileID: 6999338860313717554} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6330003187180269925 +--- !u!1001 &7630211761348101460 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 725573346534502187} m_Modifications: - - target: {fileID: 179066, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_Name - value: GunFireBlue (1) + value: GunFireYellow (1) objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.x value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalScale.z value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.x value: -0.3 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startSizeY.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startSizeZ.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startRotationX.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19888426, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - propertyPath: InitialModule.startRotationY.minMaxState - value: 3 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} ---- !u!4 &6330003187180729569 stripped + m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} +--- !u!4 &7630211761348435428 stripped Transform: - m_CorrespondingSourceObject: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, + m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} - m_PrefabInstance: {fileID: 6330003187180269925} + m_PrefabInstance: {fileID: 7630211761348101460} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_07.prefab b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_07.prefab index 79b6c79d..8e7a8cfc 100644 --- a/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_07.prefab +++ b/Assets/Resources/Prefab/AtkFx/Monster/AtkFxMonster_07.prefab @@ -27,82 +27,82 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5369959147404257646} + - {fileID: 5413927507491027976} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5369959147404325342 +--- !u!1001 &5413927507490568588 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 725573346534502187} m_Modifications: - - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 179066, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_Name - value: GunFireYellow + value: GunFireBlue objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalScale.x value: 2 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalScale.y value: 2 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalPosition.z - value: 0.15 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} ---- !u!4 &5369959147404257646 stripped + m_SourcePrefab: {fileID: 100100000, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} +--- !u!4 &5413927507491027976 stripped Transform: - m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, + m_CorrespondingSourceObject: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - m_PrefabInstance: {fileID: 5369959147404325342} + m_PrefabInstance: {fileID: 5413927507490568588} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab index 4a358d34..259ec0c0 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_01 @@ -49,22 +48,9 @@ MonoBehaviour: mSpeed: 40 mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} + mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} --- !u!96 &8337386484776744325 TrailRenderer: serializedVersion: 2 diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab index 017c819e..7ab9d550 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_02 @@ -49,22 +48,9 @@ MonoBehaviour: mSpeed: 40 mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} + mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} --- !u!96 &8337386484776744325 TrailRenderer: serializedVersion: 2 diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab index e44b0164..c1ee78fe 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_03 @@ -49,22 +48,9 @@ MonoBehaviour: mSpeed: 40 mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 415e4a0685241434da3402fd9d653b06, type: 3} + mHitSound: {fileID: 8300000, guid: 1d2fb24c03da649c7b9e249811d44653, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} --- !u!96 &8337386484776744325 TrailRenderer: serializedVersion: 2 diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab index c18b28af..e6a232b4 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab @@ -10,8 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_04 m_TagString: Untagged @@ -30,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9135409849477990309} + - {fileID: 6483067627287084188} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,182 +44,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: 37f3becc2844545a5864648979a5e19a, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: c08b54ca635804fee844cfb212be141f, type: 3} + mHitSound: {fileID: 8300000, guid: 879df207512544e36a15f5bb98b3d795, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} ---- !u!96 &8337386484776744325 -TrailRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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.24880916 - 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 &9139859469233270859 +--- !u!1001 &6483067627286610368 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7707231149869136675} m_Modifications: - - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 131070, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_Name - value: arrow01_blue + value: RocketMissileFire objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 155406, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.z + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.w - value: 0.70710677 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.x - value: 0.70710677 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} ---- !u!4 &9135409849477990309 stripped + - target: {fileID: 8210142, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19803244, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19803244, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8210142, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} +--- !u!4 &6483067627287084188 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + m_CorrespondingSourceObject: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} - m_PrefabInstance: {fileID: 9139859469233270859} + m_PrefabInstance: {fileID: 6483067627286610368} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab.meta b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab.meta index b88365bf..1a8b77fb 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_04.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8894ffc6ab01a4aed814664d6e19698d +guid: 9784c82ef9b4b4f6cbd17275c85045f5 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab index 60788f2d..5346ca03 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab @@ -10,8 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_05 m_TagString: Untagged @@ -30,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9135409849477990309} + - {fileID: 6483067627287084188} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,182 +44,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: 0bcd11aa773604f0cbec8d3e58331467, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: c08b54ca635804fee844cfb212be141f, type: 3} + mHitSound: {fileID: 8300000, guid: 879df207512544e36a15f5bb98b3d795, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} ---- !u!96 &8337386484776744325 -TrailRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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.24880916 - 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 &9139859469233270859 +--- !u!1001 &6483067627286610368 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7707231149869136675} m_Modifications: - - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 131070, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_Name - value: arrow01_blue + value: RocketMissileFire objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 155406, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.w - value: 0.70710677 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.x - value: 0.70710677 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} ---- !u!4 &9135409849477990309 stripped + - target: {fileID: 8210142, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19803244, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19803244, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8210142, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} +--- !u!4 &6483067627287084188 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + m_CorrespondingSourceObject: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} - m_PrefabInstance: {fileID: 9139859469233270859} + m_PrefabInstance: {fileID: 6483067627286610368} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab.meta b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab.meta index f47e76a0..10757b86 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_05.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a962458774d06467ab7a2004e5389989 +guid: fc0d42beb6b8f482197eda57e2b40ff5 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab index 7e774a04..e8edce99 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_06 m_TagString: Untagged @@ -29,8 +28,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2804286947027406000} - - {fileID: 8665644612738455215} + - {fileID: 7565460165172064941} + - {fileID: 4309498425730913731} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,246 +45,151 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: c47320be490f34cab8658fafa1afb5b5, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: 421dcb70dbc8e42caa2aac30fc50e29e, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 59520264e57344149a4f1e8ba0418422, type: 3} + mHitSound: {fileID: 8300000, guid: ddd79bd4bc7a44a8e8d873dc44a8dfc6, type: 3} mOrbit: 0 ---- !u!96 &8337386484776744325 -TrailRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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.24880916 - 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 &2804286947027243958 +--- !u!1001 &4309498425731032143 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7707231149869136675} m_Modifications: - - target: {fileID: 109416, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 148698, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_Name - value: 'LaserMissileBlue ' + value: LaserMissileFire (1) objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalPosition.x - value: -0.3 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8255212, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} ---- !u!4 &2804286947027406000 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, - type: 3} - m_PrefabInstance: {fileID: 2804286947027243958} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8665644612738222505 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7707231149869136675} - m_Modifications: - - target: {fileID: 109416, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_Name - value: LaserMissileBlue (1) - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalPosition.x value: 0.3 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8255212, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} ---- !u!4 &8665644612738455215 stripped + - target: {fileID: 19801434, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19801434, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} +--- !u!4 &4309498425730913731 stripped Transform: - m_CorrespondingSourceObject: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, + m_CorrespondingSourceObject: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} - m_PrefabInstance: {fileID: 8665644612738222505} + m_PrefabInstance: {fileID: 4309498425731032143} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7565460165172167457 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7707231149869136675} + m_Modifications: + - target: {fileID: 148698, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_Name + value: LaserMissileFire + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalPosition.x + value: -0.3 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19801434, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19801434, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2a6c671eff9a71a418bd43aa8d6188d2, type: 3} +--- !u!4 &7565460165172064941 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 422284, guid: 2a6c671eff9a71a418bd43aa8d6188d2, + type: 3} + m_PrefabInstance: {fileID: 7565460165172167457} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab index 454e504a..9cb434ff 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab @@ -10,8 +10,6 @@ GameObject: m_Component: - component: {fileID: 7707231149869136675} - component: {fileID: 1645396772638173221} - - component: {fileID: 7707231149869136755} - - component: {fileID: 8337386484776744325} m_Layer: 0 m_Name: BulletMonster_07 m_TagString: Untagged @@ -30,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9135409849477990309} + - {fileID: 7429762429223493838} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,182 +44,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: c47320be490f34cab8658fafa1afb5b5, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 59520264e57344149a4f1e8ba0418422, type: 3} + mHitSound: {fileID: 8300000, guid: ddd79bd4bc7a44a8e8d873dc44a8dfc6, type: 3} mOrbit: 0 ---- !u!135 &7707231149869136755 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: 0, y: 0, z: 0} ---- !u!96 &8337386484776744325 -TrailRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707231149869136832} - 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.24880916 - 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 &9139859469233270859 +--- !u!1001 &7429762429223927752 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7707231149869136675} m_Modifications: - - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 109416, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_Name - value: arrow01_blue + value: LaserMissileBlue objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalRotation.w - value: 0.70710677 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalRotation.x - value: 0.70710677 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - target: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} ---- !u!4 &9135409849477990309 stripped + m_SourcePrefab: {fileID: 100100000, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} +--- !u!4 &7429762429223493838 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + m_CorrespondingSourceObject: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - m_PrefabInstance: {fileID: 9139859469233270859} + m_PrefabInstance: {fileID: 7429762429223927752} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab.meta b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab.meta index e4d820ad..ecfe3d6b 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_07.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ffee07c305c7746658323d7729f323ac +guid: 26ff7d918810c49c787681003265ce09 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab new file mode 100644 index 00000000..ab92f33c --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7213818210742496884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4588342500070417715} + - component: {fileID: -5195902059270698307} + m_Layer: 0 + m_Name: HitFxMonster_04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4588342500070417715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + 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: 4505389333441132433} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5195902059270698307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a2a21e8dbc06493e81aa359c6308674, type: 3} + m_Name: + m_EditorClassIdentifier: + Delay: 2 +--- !u!1001 &4505389333440679143 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4588342500070417715} + m_Modifications: + - target: {fileID: 130848, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_Name + value: ExplosionFireballFire + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startSizeY.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startSizeZ.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8285908, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} +--- !u!4 &4505389333441132433 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, + type: 3} + m_PrefabInstance: {fileID: 4505389333440679143} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab.meta b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab.meta new file mode 100644 index 00000000..d076138d --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_04.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37f3becc2844545a5864648979a5e19a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab new file mode 100644 index 00000000..4d526a7f --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7213818210742496884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4588342500070417715} + - component: {fileID: -5195902059270698307} + m_Layer: 0 + m_Name: HitFxMonster_05 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4588342500070417715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + 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: 4505389333441132433} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5195902059270698307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a2a21e8dbc06493e81aa359c6308674, type: 3} + m_Name: + m_EditorClassIdentifier: + Delay: 2 +--- !u!1001 &4505389333440679143 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4588342500070417715} + m_Modifications: + - target: {fileID: 130848, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_Name + value: ExplosionFireballFire + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startSizeY.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startSizeZ.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8285908, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} +--- !u!4 &4505389333441132433 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, + type: 3} + m_PrefabInstance: {fileID: 4505389333440679143} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab.meta b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab.meta new file mode 100644 index 00000000..adbd5c69 --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_05.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0bcd11aa773604f0cbec8d3e58331467 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab index 5cf81e32..3c3afc57 100644 --- a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab @@ -28,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3598971097514301396} + - {fileID: 5613606937254950500} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,78 +45,78 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Delay: 2 ---- !u!1001 &3598971097514140662 +--- !u!1001 &5613606937254503694 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4588342500070417715} m_Modifications: - - target: {fileID: 102984, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 152634, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_Name - value: LaserExplosionBlue + value: LaserExplosionFire objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalScale.x value: 2 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalScale.y value: 2 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + - target: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 63782bd2b5a23754181adaf65653088a, type: 3} ---- !u!4 &3598971097514301396 stripped + m_SourcePrefab: {fileID: 100100000, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} +--- !u!4 &5613606937254950500 stripped Transform: - m_CorrespondingSourceObject: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, + m_CorrespondingSourceObject: {fileID: 447338, guid: c816e04fdd948ef479558e37f6acc4ae, type: 3} - m_PrefabInstance: {fileID: 3598971097514140662} + m_PrefabInstance: {fileID: 5613606937254503694} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab.meta b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab.meta index faf03d99..8391b20a 100644 --- a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab.meta +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_06.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c47320be490f34cab8658fafa1afb5b5 +guid: 421dcb70dbc8e42caa2aac30fc50e29e PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab new file mode 100644 index 00000000..c8fd2d9b --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab @@ -0,0 +1,122 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7213818210742496884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4588342500070417715} + - component: {fileID: 8465329885344687710} + m_Layer: 0 + m_Name: HitFxMonster_07 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4588342500070417715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + 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: 3598971097514301396} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8465329885344687710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213818210742496884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a2a21e8dbc06493e81aa359c6308674, type: 3} + m_Name: + m_EditorClassIdentifier: + Delay: 2 +--- !u!1001 &3598971097514140662 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4588342500070417715} + m_Modifications: + - target: {fileID: 102984, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_Name + value: LaserExplosionBlue + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 63782bd2b5a23754181adaf65653088a, type: 3} +--- !u!4 &3598971097514301396 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, + type: 3} + m_PrefabInstance: {fileID: 3598971097514140662} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab.meta b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab.meta new file mode 100644 index 00000000..faf03d99 --- /dev/null +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_07.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c47320be490f34cab8658fafa1afb5b5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab index 6410d1c0..27130cad 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab @@ -231,7 +231,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7706113341957618141} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0.7, z: -2.35} + m_LocalPosition: {x: 0, y: 1.4, z: -2.35} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1569394922084956443} diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_06.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_06.prefab index 35724f92..4da6c0c1 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_06.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_06.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2384675553864262066} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: -3} + m_LocalPosition: {x: 0, y: 1.76, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8552034085890034287} diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab index ac70c42a..26adc000 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2550573889791199987} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalPosition: {x: 0, y: 0.0118, z: -0.0509} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 363563590513035974}