Revert "Reorganize Assets/"

This reverts commit 1f124d1b8f.
This commit is contained in:
Jens Pitkänen 2020-08-13 22:00:49 +03:00
parent 72ffddcacc
commit b25a02c521
216 changed files with 354 additions and 362 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 79db09d2ffc88c343821646de667acb7 guid: 44e0cc6c3dbd8a04b89d2400185bf17c
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,209 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!243 &-8030293084440089681
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: EnvHits
m_AudioMixer: {fileID: 24100000}
m_GroupID: f58915c82845f9b47a322aeefeaf0116
m_Children: []
m_Volume: 8bee47ecf1719a34c9a4509adc3d7f50
m_Pitch: 3d4dde8cdd48f044b9280d72a780b260
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 4401202656874143845}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &-3601797963847308308
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 7032a42d6a82a1847b2390082d6e806e
m_EffectName: Attenuation
m_MixLevel: 7dbfe66d31191674496b12611bd9cf3a
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &-1410552352759146441
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Gunshots
m_AudioMixer: {fileID: 24100000}
m_GroupID: c95b70575255b7444a07837f795dda0c
m_Children: []
m_Volume: fbbe05ab527a8f54fa7799b791870a5f
m_Pitch: e6cca40645f05b64ea609c7286016c3f
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 325086644955213233}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MainMixer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews:
- guids:
- 3c6873f980b9fa3409038f22239e8ba7
- a1145e9de5e1d9d4980fbfb98ac09640
- c95b70575255b7444a07837f795dda0c
- 3a0a85f42d9d34f45a8e1b38e73db35a
- f58915c82845f9b47a322aeefeaf0116
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 3c6873f980b9fa3409038f22239e8ba7
m_Children:
- {fileID: 7918404018752352143}
m_Volume: 6a1ab3785e1fcad47970244d3a3b0619
m_Pitch: 203c487d8fa9c444094ebbe20077f8bb
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: d763565010ffcaa489c920bb24325aa8
m_EffectName: Attenuation
m_MixLevel: e8f7008b896d1084c80aaf8028ae657e
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: cd9ab92c44164a4469887ec968e924d7
m_FloatValues:
6a1ab3785e1fcad47970244d3a3b0619: -19.928478
m_TransitionOverrides: {}
--- !u!244 &325086644955213233
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 173cfebdcaf2a0d4eaf91aa99bd70a15
m_EffectName: Attenuation
m_MixLevel: feebefd139878d643b8909891a08c145
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &4401202656874143845
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 723bb9b90d69394469bde81e0fff9a9f
m_EffectName: Attenuation
m_MixLevel: 00c73b77a6f0a9d4584f2133fcbfa019
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &6277318630853483794
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hits
m_AudioMixer: {fileID: 24100000}
m_GroupID: 3a0a85f42d9d34f45a8e1b38e73db35a
m_Children: []
m_Volume: 7418b82d7af9f19489c2a2ab41fbd325
m_Pitch: e655b4382fdf35945a6282ac03cd8f66
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: -3601797963847308308}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &7015759513254906842
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: f1627356b166c11439092d80981a0e32
m_EffectName: Attenuation
m_MixLevel: 6deb0052677f3774c9b58b9a7a2c8739
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &7918404018752352143
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sfx
m_AudioMixer: {fileID: 24100000}
m_GroupID: a1145e9de5e1d9d4980fbfb98ac09640
m_Children:
- {fileID: -1410552352759146441}
- {fileID: 6277318630853483794}
- {fileID: -8030293084440089681}
m_Volume: 1a91e250aa8fec749b1861a5c8e7ff48
m_Pitch: c21e265de00bfe64eba2868212c34fa2
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 7015759513254906842}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ff7bf5284859d9f45a64971a67bb173a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 442dad9db0920a946bba96a06d8660e0 guid: 374ce5d2c1f043244bc5d1753ee3ec8f
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2ea8067fc50da7643928873623589245 guid: 92f50ea223ae4584d94d857571656599
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 78eefc0ef72807d428a825ae528dcea9 guid: 843ce77a9285304428883a190239fd00
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a409fe48838e78e4b9724525499fb64d guid: d2523358c32e65547b516a7c26b7290e
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8225376946869818923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1599217288880773178}
- component: {fileID: 8631085319058959107}
m_Layer: 0
m_Name: NetChaperone
m_TagString: Net
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1599217288880773178
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8225376946869818923}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 28.784727, y: -94.90361, z: 121.21231}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8631085319058959107
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8225376946869818923}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 74110215548fa9145b867baf649d14b0, type: 3}
m_Name:
m_EditorClassIdentifier:
SpawnedRemotePlayer: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b376c1b45d7ef8a4d82aa491744576ff guid: 1a03b85f19189674187c9966f5f557e3
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c5afe7f73c0751644af28475fa9657db
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f4893794e242c0a428d190db4df945d3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

Before

Width:  |  Height:  |  Size: 307 KiB

After

Width:  |  Height:  |  Size: 307 KiB

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e5509da920e35841a6845fa3d020421
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d93bc4ed675fd70409982651deaec686 guid: b2f72300026c3cc4a8cec283b11bc0d1
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d90db1be400d0fe46a2d50d6f4b6d184
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 29938b0d53e57e243a43b1941b0a82b5 guid: 109cd8129903d2f43b4add93e82e3ad6
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 976dc02f7888c94449309501628662ee guid: 7e53bc1470bac1b4790284a894601278
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f9d11a2cdeea0374f82a3b498812aed1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17d8d8bda65ee424ab60ef59190d1ecd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More