diff --git a/Assets/Resources/Audio/Human/Human_01_Atk.wav b/Assets/Resources/Audio/Human/Human_01_Atk.wav new file mode 100644 index 00000000..4960c864 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_01_Atk.wav differ diff --git a/Assets/Resources/Audio/Human/Human_06_Attack.wav.meta b/Assets/Resources/Audio/Human/Human_01_Atk.wav.meta similarity index 94% rename from Assets/Resources/Audio/Human/Human_06_Attack.wav.meta rename to Assets/Resources/Audio/Human/Human_01_Atk.wav.meta index fd87aef8..1508c79d 100644 --- a/Assets/Resources/Audio/Human/Human_06_Attack.wav.meta +++ b/Assets/Resources/Audio/Human/Human_01_Atk.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7fcb9463772084e7da2293736fa67540 +guid: 7f70012df2b1e43168f27cc10d880dae AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Human/Human_01_Attack.wav b/Assets/Resources/Audio/Human/Human_01_Attack.wav deleted file mode 100644 index f132ed3b..00000000 Binary files a/Assets/Resources/Audio/Human/Human_01_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_01_Hit.wav b/Assets/Resources/Audio/Human/Human_01_Hit.wav index 98653a63..7b4270d1 100644 Binary files a/Assets/Resources/Audio/Human/Human_01_Hit.wav and b/Assets/Resources/Audio/Human/Human_01_Hit.wav differ diff --git a/Assets/Resources/Audio/Human/Human_03_Atk.wav b/Assets/Resources/Audio/Human/Human_03_Atk.wav new file mode 100644 index 00000000..df8748b7 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_03_Atk.wav differ diff --git a/Assets/Resources/Audio/Human/Human_01_Attack.wav.meta b/Assets/Resources/Audio/Human/Human_03_Atk.wav.meta similarity index 94% rename from Assets/Resources/Audio/Human/Human_01_Attack.wav.meta rename to Assets/Resources/Audio/Human/Human_03_Atk.wav.meta index 240ea009..6333c0df 100644 --- a/Assets/Resources/Audio/Human/Human_01_Attack.wav.meta +++ b/Assets/Resources/Audio/Human/Human_03_Atk.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ebae5b4b1aba41429ef96f8a0c0c102 +guid: 8d8b3ac87db4e4641939b15b23b42c0d AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Human/Human_03_Hit.wav b/Assets/Resources/Audio/Human/Human_03_Hit.wav new file mode 100644 index 00000000..6a59405b Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_03_Hit.wav differ diff --git a/Assets/Resources/Audio/Human/Human_04_Hit.wav.meta b/Assets/Resources/Audio/Human/Human_03_Hit.wav.meta similarity index 100% rename from Assets/Resources/Audio/Human/Human_04_Hit.wav.meta rename to Assets/Resources/Audio/Human/Human_03_Hit.wav.meta diff --git a/Assets/Resources/Audio/Human/Human_04_Attack.wav b/Assets/Resources/Audio/Human/Human_04_Attack.wav deleted file mode 100644 index c0f4dfa4..00000000 Binary files a/Assets/Resources/Audio/Human/Human_04_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_04_Hit.wav b/Assets/Resources/Audio/Human/Human_04_Hit.wav deleted file mode 100644 index 2f066cb2..00000000 Binary files a/Assets/Resources/Audio/Human/Human_04_Hit.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_05_Atk.wav b/Assets/Resources/Audio/Human/Human_05_Atk.wav new file mode 100644 index 00000000..0c585bb0 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_05_Atk.wav differ diff --git a/Assets/Resources/Audio/Human/Human_06_Hit.wav.meta b/Assets/Resources/Audio/Human/Human_05_Atk.wav.meta similarity index 94% rename from Assets/Resources/Audio/Human/Human_06_Hit.wav.meta rename to Assets/Resources/Audio/Human/Human_05_Atk.wav.meta index e439e409..3b3353eb 100644 --- a/Assets/Resources/Audio/Human/Human_06_Hit.wav.meta +++ b/Assets/Resources/Audio/Human/Human_05_Atk.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28c91b7e0f6d54a16974940cc01d31b8 +guid: c0bf9b1da627b48f6acd91bcc7540f49 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Human/Human_05_Hit.wav b/Assets/Resources/Audio/Human/Human_05_Hit.wav new file mode 100644 index 00000000..19cd0fc3 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_05_Hit.wav differ diff --git a/Assets/Resources/Audio/Human/Human_04_Attack.wav.meta b/Assets/Resources/Audio/Human/Human_05_Hit.wav.meta similarity index 94% rename from Assets/Resources/Audio/Human/Human_04_Attack.wav.meta rename to Assets/Resources/Audio/Human/Human_05_Hit.wav.meta index ad475a6e..10d979a1 100644 --- a/Assets/Resources/Audio/Human/Human_04_Attack.wav.meta +++ b/Assets/Resources/Audio/Human/Human_05_Hit.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc4eb989abff14451ad412ca0186e5a8 +guid: f05b893b4821a444fb0748c4541d2cad AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Audio/Human/Human_06_Attack.wav b/Assets/Resources/Audio/Human/Human_06_Attack.wav deleted file mode 100644 index 4e6530d5..00000000 Binary files a/Assets/Resources/Audio/Human/Human_06_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_06_Hit.wav b/Assets/Resources/Audio/Human/Human_06_Hit.wav deleted file mode 100644 index b0d2a238..00000000 Binary files a/Assets/Resources/Audio/Human/Human_06_Hit.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_07_Atk.wav b/Assets/Resources/Audio/Human/Human_07_Atk.wav new file mode 100644 index 00000000..3f4c3329 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_07_Atk.wav differ diff --git a/Assets/Resources/Audio/Human/Human_07_Atk.wav.meta b/Assets/Resources/Audio/Human/Human_07_Atk.wav.meta new file mode 100644 index 00000000..6ce4f2e1 --- /dev/null +++ b/Assets/Resources/Audio/Human/Human_07_Atk.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 3f4b16c40027143679494a6de622c753 +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/Human/Human_07_Hit.wav b/Assets/Resources/Audio/Human/Human_07_Hit.wav new file mode 100644 index 00000000..d4499a58 Binary files /dev/null and b/Assets/Resources/Audio/Human/Human_07_Hit.wav differ diff --git a/Assets/Resources/Audio/Human/Human_07_Hit.wav.meta b/Assets/Resources/Audio/Human/Human_07_Hit.wav.meta new file mode 100644 index 00000000..7ddb8c48 --- /dev/null +++ b/Assets/Resources/Audio/Human/Human_07_Hit.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 28078d4d9b8aa4239be094339df7d272 +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/Human/Human_09_Attack.wav b/Assets/Resources/Audio/Human/Human_09_Attack.wav deleted file mode 100644 index 81184640..00000000 Binary files a/Assets/Resources/Audio/Human/Human_09_Attack.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_09_Attack.wav.meta b/Assets/Resources/Audio/Human/Human_09_Attack.wav.meta deleted file mode 100644 index 778e4ec5..00000000 --- a/Assets/Resources/Audio/Human/Human_09_Attack.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 14d0ed2eefc9241189e980f60c8125ae -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/Human/Human_09_Hit.wav b/Assets/Resources/Audio/Human/Human_09_Hit.wav deleted file mode 100644 index 5cc8e121..00000000 Binary files a/Assets/Resources/Audio/Human/Human_09_Hit.wav and /dev/null differ diff --git a/Assets/Resources/Audio/Human/Human_09_Hit.wav.meta b/Assets/Resources/Audio/Human/Human_09_Hit.wav.meta deleted file mode 100644 index 4c523fd5..00000000 --- a/Assets/Resources/Audio/Human/Human_09_Hit.wav.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: dac6b9a8ce73e454baf0bf888c76385b -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_01_Atk.wav b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav new file mode 100644 index 00000000..e90b6829 Binary files /dev/null and b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav differ diff --git a/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta new file mode 100644 index 00000000..b0f651a3 --- /dev/null +++ b/Assets/Resources/Audio/Monster/Monster_01_Atk.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 415e4a0685241434da3402fd9d653b06 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_02.prefab.meta b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_02.prefab.meta index d5a07b64..c02521ab 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_02.prefab.meta +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_02.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e98bfa3be86254fa6b18e3f4c6fdc8f7 +guid: 441d6db24fe454895aabf95f9b232e27 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_03.prefab b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_03.prefab index d5916873..06ad2709 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_03.prefab +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_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/Human/AtkFxHuman_05.prefab b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_05.prefab index 9b73ad66..f786ac6a 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_05.prefab +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_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/Human/AtkFxHuman_06.prefab b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_06.prefab index 10741d45..cc292a02 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_06.prefab +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_06.prefab @@ -28,9 +28,85 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5369959147404257646} + - {fileID: 3278629294519458225} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3278629294519255297 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 725573346534502187} + m_Modifications: + - target: {fileID: 195376, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_Name + value: GunFireYellow (1) + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.x + value: -0.8 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalPosition.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 346f3bf3686d682498113714ee132099, type: 3} +--- !u!4 &3278629294519458225 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, + type: 3} + m_PrefabInstance: {fileID: 3278629294519255297} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5369959147404325342 PrefabInstance: m_ObjectHideFlags: 0 @@ -48,19 +124,19 @@ 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 - value: 0 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab index e34f68a8..35fb8658 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab @@ -27,82 +27,190 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5369959147404257646} + - {fileID: 3089498496042208472} + - {fileID: 6330003187180729569} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5369959147404325342 +--- !u!1001 &3089498496042273116 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 + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, type: 3} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -1.05 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} + - 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: 346f3bf3686d682498113714ee132099, type: 3} ---- !u!4 &5369959147404257646 stripped + m_SourcePrefab: {fileID: 100100000, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} +--- !u!4 &3089498496042208472 stripped Transform: - m_CorrespondingSourceObject: {fileID: 465072, guid: 346f3bf3686d682498113714ee132099, + m_CorrespondingSourceObject: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} - m_PrefabInstance: {fileID: 5369959147404325342} + m_PrefabInstance: {fileID: 3089498496042273116} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6330003187180269925 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 725573346534502187} + m_Modifications: + - target: {fileID: 179066, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_Name + value: GunFireBlue (1) + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalPosition.x + value: 1.05 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, 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 +Transform: + m_CorrespondingSourceObject: {fileID: 460164, guid: bcd34d169e9abd34bb3484f9e3ddf57c, + type: 3} + m_PrefabInstance: {fileID: 6330003187180269925} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab.meta b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab.meta index bb19d4c2..15af7d1c 100644 --- a/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab.meta +++ b/Assets/Resources/Prefab/AtkFx/Human/AtkFxHuman_07.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e9b47bdc31a748eeb3f3de742828d36 +guid: 10fe2321ab40440b2b54da09bb08ddf3 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_01.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_01.prefab index 0a64e1cc..0df07ace 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_01.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_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: BulletHuman_01 @@ -47,23 +46,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 50 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: a7fab81c4d56740ceb1e2b6049f9423a, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} + mShootSound: {fileID: 8300000, guid: 7f70012df2b1e43168f27cc10d880dae, type: 3} mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} ---- !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} + mOrbit: 0 --- !u!96 &8337386484776744325 TrailRenderer: serializedVersion: 2 @@ -125,8 +112,8 @@ TrailRenderer: 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} + key0: {r: 0.9529412, g: 1, b: 0, a: 1} + key1: {r: 1, g: 0.33686084, 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} @@ -172,6 +159,10 @@ PrefabInstance: propertyPath: m_Name value: arrow01_blue objectReference: {fileID: 0} + - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab index c796a12f..3a12147f 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_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: BulletHuman_02 @@ -47,23 +46,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 50 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: a7fab81c4d56740ceb1e2b6049f9423a, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} + mShootSound: {fileID: 8300000, guid: 7f70012df2b1e43168f27cc10d880dae, type: 3} mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} ---- !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} + mOrbit: 0 --- !u!96 &8337386484776744325 TrailRenderer: serializedVersion: 2 @@ -125,8 +112,8 @@ TrailRenderer: 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} + key0: {r: 0.9529412, g: 1, b: 0, a: 1} + key1: {r: 1, g: 0.33686084, 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} @@ -172,6 +159,10 @@ PrefabInstance: propertyPath: m_Name value: arrow01_blue objectReference: {fileID: 0} + - target: {fileID: 1874979086049940, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab.meta b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab.meta index e796c123..755b2e14 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_02.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1482b99706abd495aa50cf3e62d34a21 +guid: 2948e385714204338888e62a89ba04fb PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_03.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_03.prefab index 94fa5937..f58b06a8 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_03.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_03.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: BulletHuman_03 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} @@ -47,181 +45,92 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 30 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: 5917c599385854006958739121531140, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 8d8b3ac87db4e4641939b15b23b42c0d, type: 3} + mHitSound: {fileID: 8300000, guid: b554fafba529746479d15b65b8182266, type: 3} mOrbit: 1 ---- !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.15408026 - 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: 1, g: 0.6156863, b: 0, a: 1} - key1: {r: 1, g: 0.6156863, 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 + 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/Human/BulletHuman_04.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_04.prefab index c462e684..d26156da 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_04.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_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: BulletHuman_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} @@ -47,181 +45,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 30 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: 5917c599385854006958739121531140, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 8d8b3ac87db4e4641939b15b23b42c0d, type: 3} + mHitSound: {fileID: 8300000, guid: b554fafba529746479d15b65b8182266, type: 3} mOrbit: 1 ---- !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.20380397 - 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: 1, g: 0.6154238, 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/Human/BulletHuman_04.prefab.meta b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_04.prefab.meta index 236b1c68..12c8c99e 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_04.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_04.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac0185b59975d48fc806610d75ae37d3 +guid: 2a709de60f0d2474e926c361d4ad42d6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab index db75fdc1..39ef3f40 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_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: BulletHuman_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: 50 - mPfbExplode: {fileID: 7213818210742496884, guid: 5917c599385854006958739121531140, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: 9b583d96bd16e4e1494f6a6ed880ace6, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: c0bf9b1da627b48f6acd91bcc7540f49, type: 3} + mHitSound: {fileID: 8300000, guid: f05b893b4821a444fb0748c4541d2cad, 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.254573 - 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: 1, g: 0.6156863, b: 0, a: 1} - key1: {r: 1, g: 0.6156863, 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/Human/BulletHuman_05.prefab.meta b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab.meta index 4afefb72..4f1abba7 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_05.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44eb42e732b6f409ca8d0e8ca7f5b251 +guid: 9da801ea0fb344f11a54c477e69babc8 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab index d6124cbd..a177d4e4 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.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: BulletHuman_06 m_TagString: Untagged @@ -30,7 +28,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9135409849477990309} + - {fileID: 6483067627287084188} + - {fileID: 8505755842360788707} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,182 +45,193 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 50 - mPfbExplode: {fileID: 7213818210742496884, guid: 5917c599385854006958739121531140, + mSpeed: 30 + mPfbExplode: {fileID: 7213818210742496884, guid: 9b583d96bd16e4e1494f6a6ed880ace6, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: c0bf9b1da627b48f6acd91bcc7540f49, type: 3} + mHitSound: {fileID: 8300000, guid: f05b893b4821a444fb0748c4541d2cad, 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.254573 - 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: 1, g: 0.6156863, b: 0, a: 1} - key1: {r: 1, g: 0.6156863, 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} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - 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.8 + objectReference: {fileID: 0} + - 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} +--- !u!1001 &8505755842360474559 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7707231149869136675} + m_Modifications: + - target: {fileID: 131070, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_Name + value: RocketMissileFire (1) + objectReference: {fileID: 0} + - 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: 1 + objectReference: {fileID: 0} + - 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.8 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - 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 &8505755842360788707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 474460, guid: 4b21d8abf8d26b449b109c8edb5cc78a, + type: 3} + m_PrefabInstance: {fileID: 8505755842360474559} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab.meta b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab.meta index f5ce01da..a29f343b 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_06.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9945e87f590d04d06b5441a908b3f4e9 +guid: c0e7dbfb7ca1c4d638029ab17587d0a6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab index fde14d2e..8bb7409c 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_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: BulletHuman_07 m_TagString: Untagged @@ -30,7 +28,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9135409849477990309} + - {fileID: 2804286947027406000} + - {fileID: 8665644612738455215} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46,182 +45,165 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 625f4e9863aae4c84bb5660097095e75, type: 3} m_Name: m_EditorClassIdentifier: - mSpeed: 50 - mPfbExplode: {fileID: 7213818210742496884, guid: 5917c599385854006958739121531140, + mSpeed: 40 + mPfbExplode: {fileID: 7213818210742496884, guid: b3582267204284a7c87a8c6cc4977e7b, type: 3} - mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} - mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} + mShootSound: {fileID: 8300000, guid: 3f4b16c40027143679494a6de622c753, type: 3} + mHitSound: {fileID: 8300000, guid: 28078d4d9b8aa4239be094339df7d272, 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.254573 - 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: 1, g: 0.6156863, b: 0, a: 1} - key1: {r: 1, g: 0.6156863, 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 &2804286947027243958 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_LocalPosition.x - value: 0 + value: -1.05 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 + 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: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, type: 3} + - 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 + - target: {fileID: 19812862, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19812862, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + 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: 4559779596744686, guid: 62f3111ab9274e346bbd73a7eac13658, + m_CorrespondingSourceObject: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} - m_PrefabInstance: {fileID: 9139859469233270859} + 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} + 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} + propertyPath: m_LocalPosition.x + value: 1.05 + 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} + - target: {fileID: 19812862, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: InitialModule.startRotationX.minMaxState + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 19812862, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + propertyPath: InitialModule.startRotationY.minMaxState + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8255212, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, type: 3} +--- !u!4 &8665644612738455215 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 499462, guid: 4c41ec3ab37ac8b4c9490c39838a71d1, + type: 3} + m_PrefabInstance: {fileID: 8665644612738222505} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab.meta b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab.meta index f23d714b..3f1c09aa 100644 --- a/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Human/BulletHuman_07.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: adba69b7acb4e48f388ca889187b10d4 +guid: ede800d1bb492426ba17d1a67a992370 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab index 77922ff8..4a358d34 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_01.prefab @@ -47,7 +47,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab index 1be07b4e..017c819e 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_02.prefab @@ -47,7 +47,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab index 34bd7688..e44b0164 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_03.prefab @@ -47,7 +47,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mSpeed: 40 - mPfbExplode: {fileID: 7213818210742496884, guid: 4a55bf4487ed342cd83e8fc9e0867172, + mPfbExplode: {fileID: 7213818210742496884, guid: ebbe6f2fd0b4841eb9ea6ee07a8759eb, type: 3} mShootSound: {fileID: 8300000, guid: 3ebae5b4b1aba41429ef96f8a0c0c102, type: 3} mHitSound: {fileID: 8300000, guid: 9f3cdc4b809624a5f965cf21bbb3f16c, type: 3} diff --git a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta index 3f1c09aa..0bf9cd20 100644 --- a/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta +++ b/Assets/Resources/Prefab/Bullet/Monster/BulletMonster_06.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ede800d1bb492426ba17d1a67a992370 +guid: a9edbfed7283448118118a19d9c8613a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab b/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab deleted file mode 100644 index a5e8061f..00000000 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab +++ /dev/null @@ -1,146 +0,0 @@ -%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: Fx_ArrowExplodePurple - 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: 4091316940868236798} - 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 &4091316940868118860 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4588342500070417715} - m_Modifications: - - target: {fileID: 151354, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_Name - value: BulletExplosionPink - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalScale.x - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalScale.y - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalScale.z - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8277264, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19840534, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: InitialModule.startSizeY.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19840534, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: InitialModule.startSizeZ.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19910084, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 19944118, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 19986736, guid: d1b2370788588434bb54d810e4382e74, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1b2370788588434bb54d810e4382e74, type: 3} ---- !u!4 &4091316940868236798 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 416946, guid: d1b2370788588434bb54d810e4382e74, - type: 3} - m_PrefabInstance: {fileID: 4091316940868118860} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab b/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab deleted file mode 100644 index f572f5c9..00000000 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab +++ /dev/null @@ -1,132 +0,0 @@ -%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: Fx_ExplodeLightingGreen - 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: 2719815951114703559} - 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 &2719815951114884937 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4588342500070417715} - m_Modifications: - - target: {fileID: 175232, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_Name - value: LightningExplosionGreen - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalScale.x - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalScale.y - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalScale.z - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19889918, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: InitialModule.startRotationX.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19889918, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - propertyPath: InitialModule.startRotationY.minMaxState - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 11488460, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - - {fileID: 8299672, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 8d867acabedb0f24196923f84f10c13a, type: 3} ---- !u!4 &2719815951114703559 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 443790, guid: 8d867acabedb0f24196923f84f10c13a, - type: 3} - m_PrefabInstance: {fileID: 2719815951114884937} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab.meta deleted file mode 100644 index 88e5a6f6..00000000 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingGreen.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 96a6a4ee1d54e4fa0be4bfc82459fcb9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab.meta deleted file mode 100644 index 54317be8..00000000 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1c33024f89c584c149f3f39fe5d65c86 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodeRed.prefab b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab similarity index 99% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodeRed.prefab rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab index 9908068c..eeb28435 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodeRed.prefab +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4588342500070417715} - component: {fileID: -5195902059270698307} m_Layer: 0 - m_Name: Fx_ArrowExplodeRed + m_Name: HitFxHuman_01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab.meta similarity index 74% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab.meta rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab.meta index 85dcbca9..b2d63560 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodePurple.prefab.meta +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_01.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a55bf4487ed342cd83e8fc9e0867172 +guid: a7fab81c4d56740ceb1e2b6049f9423a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballRed.prefab b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_03.prefab similarity index 99% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballRed.prefab rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_03.prefab index 34222cca..47fc122d 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballRed.prefab +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_03.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4588342500070417715} - component: {fileID: -5195902059270698307} m_Layer: 0 - m_Name: Fx_ExplodeFireballRed + m_Name: HitFxHuman_03 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballRed.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_03.prefab.meta similarity index 100% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballRed.prefab.meta rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_03.prefab.meta diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab similarity index 60% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab index cb01419e..5b37f418 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4588342500070417715} - component: {fileID: -5195902059270698307} m_Layer: 0 - m_Name: Fx_ExplodeFireballPink + m_Name: HitFxHuman_05 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4202489536005413155} + - {fileID: 4505389333441132433} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,94 +45,95 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Delay: 2 ---- !u!1001 &4202489536005112229 +--- !u!1001 &4505389333440679143 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4588342500070417715} m_Modifications: - - target: {fileID: 168108, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 130848, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_Name - value: ExplosionFireballPink + value: ExplosionFireballFire objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalScale.x - value: 1.6 + value: 2.5 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalScale.y - value: 1.6 + value: 2.5 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalScale.z - value: 1.6 + value: 2.5 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 19898306, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: InitialModule.startSizeY.minMaxState value: 3 objectReference: {fileID: 0} - - target: {fileID: 19898306, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: InitialModule.startSizeZ.minMaxState value: 3 objectReference: {fileID: 0} - - target: {fileID: 19898306, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: InitialModule.startRotationX.minMaxState value: 3 objectReference: {fileID: 0} - - target: {fileID: 19898306, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} + - target: {fileID: 19849376, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} propertyPath: InitialModule.startRotationY.minMaxState value: 3 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bfb3c07c76c2ded45934d9c1b3145128, type: 3} ---- !u!4 &4202489536005413155 stripped + m_RemovedComponents: + - {fileID: 8285908, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} +--- !u!4 &4505389333441132433 stripped Transform: - m_CorrespondingSourceObject: {fileID: 497798, guid: bfb3c07c76c2ded45934d9c1b3145128, + m_CorrespondingSourceObject: {fileID: 490358, guid: d16221e794fe16e4e8994a7f8c770561, type: 3} - m_PrefabInstance: {fileID: 4202489536005112229} + m_PrefabInstance: {fileID: 4505389333440679143} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab.meta similarity index 74% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab.meta rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab.meta index 7b8eb36c..c49f2151 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab.meta +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_05.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c11ffc4c32cc4283a87a74f8eafbf12 +guid: 9b583d96bd16e4e1494f6a6ed880ace6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab similarity index 60% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab index fdcbe4b5..56c9ad52 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballBlue.prefab +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4588342500070417715} - component: {fileID: 8465329885344687710} m_Layer: 0 - m_Name: Fx_ExplodeFireballBlue + m_Name: HitFxHuman_07 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8772557591994085546} + - {fileID: 3598971097514301396} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,79 +45,78 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Delay: 2 ---- !u!1001 &8772557591993692056 +--- !u!1001 &3598971097514140662 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4588342500070417715} m_Modifications: - - target: {fileID: 193692, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 102984, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_Name - value: ExplosionFireballBlue + value: LaserExplosionBlue objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalScale.x - value: 1.2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalScale.y - value: 1.2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalScale.z - value: 1.2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} + - target: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8254866, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 2aa1e7c21640d254492fa8035a6411e1, type: 3} ---- !u!4 &8772557591994085546 stripped + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 63782bd2b5a23754181adaf65653088a, type: 3} +--- !u!4 &3598971097514301396 stripped Transform: - m_CorrespondingSourceObject: {fileID: 401202, guid: 2aa1e7c21640d254492fa8035a6411e1, + m_CorrespondingSourceObject: {fileID: 439330, guid: 63782bd2b5a23754181adaf65653088a, type: 3} - m_PrefabInstance: {fileID: 8772557591993692056} + m_PrefabInstance: {fileID: 3598971097514140662} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab.meta b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab.meta similarity index 74% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab.meta rename to Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab.meta index 400af396..9d367449 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeFireballPink.prefab.meta +++ b/Assets/Resources/Prefab/HitFx/Human/HitFxHuman_07.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a497bfa495d1b4f49b9bd7f4fd0184cc +guid: b3582267204284a7c87a8c6cc4977e7b PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_01.prefab similarity index 57% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab rename to Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_01.prefab index f32b71ac..8d539a8d 100644 --- a/Assets/Resources/Prefab/HitFx/Human/Fx_ExplodeLightingRed.prefab +++ b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_01.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4588342500070417715} - component: {fileID: -5195902059270698307} m_Layer: 0 - m_Name: Fx_ExplodeLightingRed + m_Name: HitFxMonster_01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +28,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4708792550470081455} + - {fileID: 2262177758532979532} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,88 +45,83 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Delay: 2 ---- !u!1001 &4708792550469748587 +--- !u!1001 &2262177758532822858 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4588342500070417715} m_Modifications: - - target: {fileID: 136540, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 195742, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_Name - value: LightningExplosionPink + value: BulletExplosionFire objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalScale.x - value: 3 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalScale.y - value: 3 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalScale.z - value: 3 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalRotation.w value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} + - target: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 19893612, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} - propertyPath: InitialModule.startRotationX.minMaxState - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 19893612, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} - propertyPath: InitialModule.startRotationY.minMaxState - value: 3 + - target: {fileID: 8247018, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 11469010, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} - - {fileID: 8201972, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 215ff560badfe1d4b8391e64e82c5f4e, type: 3} ---- !u!4 &4708792550470081455 stripped + - {fileID: 11451680, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} +--- !u!4 &2262177758532979532 stripped Transform: - m_CorrespondingSourceObject: {fileID: 466116, guid: 215ff560badfe1d4b8391e64e82c5f4e, + m_CorrespondingSourceObject: {fileID: 437254, guid: c83fb3ef04bb383408bb2064b89690b2, type: 3} - m_PrefabInstance: {fileID: 4708792550469748587} + m_PrefabInstance: {fileID: 2262177758532822858} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodeRed.prefab.meta b/Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_01.prefab.meta similarity index 100% rename from Assets/Resources/Prefab/HitFx/Human/Fx_ArrowExplodeRed.prefab.meta rename to Assets/Resources/Prefab/HitFx/Monster/HitFxMonster_01.prefab.meta diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab index 7abec04e..6410d1c0 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: -7.03} + m_LocalPosition: {x: 0, y: 0.7, z: -2.35} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1569394922084956443} diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab index f309304c..da1775bf 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915172960724741332} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.28, z: 3.31} + m_LocalPosition: {x: 0, y: 0.28, z: 0.61} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7176549612062312564}