squash commits
This commit is contained in:
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 157a4bd45f8a79447b6d4e320310ded5
|
||||
labels:
|
||||
- UMA_Overlay
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/MaleShortHair_Overlay.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,40 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f0188188c253e0c4bb9b46e19fa7312e, type: 3}
|
||||
m_Name: MaleShortHair_Recipe
|
||||
m_EditorClassIdentifier:
|
||||
label:
|
||||
resourcesOnly: 0
|
||||
recipeType: Wardrobe
|
||||
DisplayValue: MaleShortHair
|
||||
compatibleRaces:
|
||||
- HumanMale
|
||||
wardrobeRecipeThumbs:
|
||||
- race: HumanMale
|
||||
filename:
|
||||
thumb: {fileID: 21300000, guid: 7a3ea9eb047d3214cab1d44cf68cafbd, type: 3}
|
||||
wardrobeSlot: Hair
|
||||
Appended: 0
|
||||
Hides: []
|
||||
HideTags: []
|
||||
suppressWardrobeSlots: []
|
||||
activeWardrobeSet: []
|
||||
MeshHideAssets: []
|
||||
OverrideDNA:
|
||||
PreloadValues: []
|
||||
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"MaleShortHair","scale":100,"copyIdx":-1,"overlays":[{"id":"MaleShortHair_Overlay","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0],"Tags":["Smooshable"],"tiling":[false,false],"uvOverride":0}],"Tags":["smooshable"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false},{"id":"M_High
|
||||
poly Head","scale":100,"copyIdx":-1,"overlays":[{"id":"Maincap_Overlay","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0,0,0],"Tags":["Smooshable"],"tiling":[false,false,false,false,false],"uvOverride":0}],"Tags":["smooshtarget"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false}],"colors":[],"fColors":[{"name":"Hair","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":1,"race":"HumanMale","packedDna":[],"uvOverride":0}'
|
||||
forceKeep: 0
|
||||
labelLocalFiles: 0
|
||||
IncompatibleRecipes: []
|
||||
UserField:
|
||||
replaces: Nothing
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8e67f8d6f30659a4d9202b2e6b8809b1
|
||||
labels:
|
||||
- UMA_Text Recipe
|
||||
- UMA_Wardrobe Recipe
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/MaleShortHair_Recipe.asset
|
||||
uploadId: 679826
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4334a6e2bd28ee64cb7cfc22e5dd82fc
|
||||
timeCreated: 1499463014
|
||||
licenseType: Store
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/MaleShortHair_Skinned.prefab
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6c205402b9dc47943b10ac61ce5639e6
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/MaleShortHair_Slot.asset
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 948be3b7076b1194ab1f335624c88fb2
|
||||
labels:
|
||||
- UMA_Slot
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/MaleShortHair_Slot_Old.asset
|
||||
uploadId: 679826
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 24721ef91a702b44ba4e82c64a997b4d
|
||||
timeCreated: 1499463013
|
||||
licenseType: Store
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/MaleShortHair/bb_male_haircut.asset
|
||||
uploadId: 679826
|
||||
Reference in New Issue
Block a user