squash commits
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
%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: FemaleTallShoes_Black
|
||||
m_EditorClassIdentifier:
|
||||
label:
|
||||
resourcesOnly: 0
|
||||
recipeType: Wardrobe
|
||||
DisplayValue: High Tops - Black
|
||||
compatibleRaces:
|
||||
- HumanFemale
|
||||
- HumanFemaleHighPoly
|
||||
wardrobeRecipeThumbs:
|
||||
- race: HumanFemale
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
- race: HumanFemaleHighPoly
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
wardrobeSlot: Feet
|
||||
Appended: 0
|
||||
Hides:
|
||||
- FemaleFeet
|
||||
- FR_High_FemaleFeet
|
||||
HideTags: []
|
||||
suppressWardrobeSlots: []
|
||||
activeWardrobeSet: []
|
||||
MeshHideAssets: []
|
||||
OverrideDNA:
|
||||
PreloadValues: []
|
||||
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Black","colorIdx":0,"rect":[5.0,5.0,5.0,5.0],"isTransformed":true,"scale":{"x":5.0,"y":5.0,"z":5.0},"rotation":5.0,"blendModes":[0],"Tags":[],"tiling":[false,false,false],"uvOverride":0},{"id":"Body
|
||||
Hair","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":1.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","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],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
|
||||
forceKeep: 0
|
||||
labelLocalFiles: 0
|
||||
IncompatibleRecipes: []
|
||||
UserField:
|
||||
replaces: Nothing
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f7ff3729dba08b044a2535b32a1251ba
|
||||
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/F_Shoes/FemaleTallShoes_Black.asset
|
||||
uploadId: 679826
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 90d8fdb2de54d6d4d83b01d5338800dc
|
||||
timeCreated: 1494116977
|
||||
licenseType: Store
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/F_Shoes/FemaleTallShoes_Skinned.prefab
|
||||
uploadId: 679826
|
||||
Binary file not shown.
@@ -0,0 +1,17 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c5c96e8edf9cdc4abf5fed26d977b87
|
||||
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/F_Shoes/FemaleTallShoes_Slot.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,45 @@
|
||||
%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: FemaleTallShoes_Turquoise
|
||||
m_EditorClassIdentifier:
|
||||
label:
|
||||
resourcesOnly: 0
|
||||
recipeType: Wardrobe
|
||||
DisplayValue: High Tops - Turquoise
|
||||
compatibleRaces:
|
||||
- HumanFemale
|
||||
- HumanFemaleHighPoly
|
||||
wardrobeRecipeThumbs:
|
||||
- race: HumanFemale
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
- race: HumanFemaleHighPoly
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
wardrobeSlot: Feet
|
||||
Appended: 0
|
||||
Hides:
|
||||
- FemaleFeet
|
||||
- FR_High_FemaleFeet
|
||||
HideTags: []
|
||||
suppressWardrobeSlots: []
|
||||
activeWardrobeSet: []
|
||||
MeshHideAssets: []
|
||||
OverrideDNA:
|
||||
PreloadValues: []
|
||||
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_Turquoise","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],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","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],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
|
||||
forceKeep: 0
|
||||
labelLocalFiles: 0
|
||||
IncompatibleRecipes: []
|
||||
UserField:
|
||||
replaces: Nothing
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b4204b59b1e68974997b4673544c5bfe
|
||||
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/F_Shoes/FemaleTallShoes_Turquoise.asset
|
||||
uploadId: 679826
|
||||
@@ -0,0 +1,45 @@
|
||||
%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: FemaleTallShoes_White
|
||||
m_EditorClassIdentifier:
|
||||
label:
|
||||
resourcesOnly: 0
|
||||
recipeType: Wardrobe
|
||||
DisplayValue: High Tops - White
|
||||
compatibleRaces:
|
||||
- HumanFemale
|
||||
- HumanFemaleHighPoly
|
||||
wardrobeRecipeThumbs:
|
||||
- race: HumanFemale
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
- race: HumanFemaleHighPoly
|
||||
filename:
|
||||
thumb: {fileID: 0}
|
||||
wardrobeSlot: Feet
|
||||
Appended: 0
|
||||
Hides:
|
||||
- FemaleFeet
|
||||
- FR_High_FemaleFeet
|
||||
HideTags: []
|
||||
suppressWardrobeSlots: []
|
||||
activeWardrobeSet: []
|
||||
MeshHideAssets: []
|
||||
OverrideDNA:
|
||||
PreloadValues: []
|
||||
recipeString: '{"version":3,"packedSlotDataList":[],"slotsV2":[],"slotsV3":[{"id":"FemaleTallShoes","scale":100,"copyIdx":-1,"overlays":[{"id":"TallShoes_White","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],"Tags":[],"tiling":[false,false,false],"uvOverride":0}],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0}],"colors":[],"fColors":[{"name":"-","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],"ShaderParms":[],"alwaysUpdate":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":0,"race":"HumanFemale","packedDna":[],"uvOverride":0}'
|
||||
forceKeep: 0
|
||||
labelLocalFiles: 0
|
||||
IncompatibleRecipes: []
|
||||
UserField:
|
||||
replaces: Nothing
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 47ba7be232f89084485a40d74ef0d13c
|
||||
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/F_Shoes/FemaleTallShoes_White.asset
|
||||
uploadId: 679826
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,15 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cd489a39b44ba8d4499c57aa4a9d426e
|
||||
timeCreated: 1494116977
|
||||
licenseType: Store
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 35611
|
||||
packageName: UMA 2
|
||||
packageVersion: 2.13
|
||||
assetPath: Assets/UMA/Content/Contrib/F_Shoes/shoes_tall_white_000.asset
|
||||
uploadId: 679826
|
||||
Reference in New Issue
Block a user