浏览代码
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
/devlogs-3-input
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
/devlogs-3-input
Ciro Continisio
4 年前
当前提交
b15b206e
共有 10 个文件被更改,包括 1510 次插入 和 0 次删除
-
8UOP1_Project/Assets/Art/Props/WoodenBench.meta
-
76UOP1_Project/Assets/Prefabs/Furniture/WoodenBench.prefab
-
7UOP1_Project/Assets/Prefabs/Furniture/WoodenBench.prefab.meta
-
1001UOP1_Project/Assets/Art/Props/WoodenBench/BenchTextureCombined2.png
-
92UOP1_Project/Assets/Art/Props/WoodenBench/BenchTextureCombined2.png.meta
-
107UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.fbx.meta
-
145UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.mat
-
8UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.mat.meta
-
66UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.fbx
|
|||
fileFormatVersion: 2 |
|||
guid: 71210c96cabb30f47bb2bf16dc05d217 |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!1001 &5934761996929322665 |
|||
PrefabInstance: |
|||
m_ObjectHideFlags: 0 |
|||
serializedVersion: 2 |
|||
m_Modification: |
|||
m_TransformParent: {fileID: 0} |
|||
m_Modifications: |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalPosition.x |
|||
value: -2.7853966 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalPosition.y |
|||
value: 0.0000000834465 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalPosition.z |
|||
value: -4.021866 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalRotation.x |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalRotation.y |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalRotation.z |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalRotation.w |
|||
value: 1 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_RootOrder |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalEulerAnglesHint.x |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalEulerAnglesHint.y |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_LocalEulerAnglesHint.z |
|||
value: 0 |
|||
objectReference: {fileID: 0} |
|||
- target: {fileID: -1848364327098884977, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_Materials.Array.data[0] |
|||
value: |
|||
objectReference: {fileID: 2100000, guid: 5b2ffc78155b95d4089248e8c087729d, type: 2} |
|||
- target: {fileID: 919132149155446097, guid: 2aae116101adc3646bd2ede6a10564e9, |
|||
type: 3} |
|||
propertyPath: m_Name |
|||
value: WoodenBench |
|||
objectReference: {fileID: 0} |
|||
m_RemovedComponents: [] |
|||
m_SourcePrefab: {fileID: 100100000, guid: 2aae116101adc3646bd2ede6a10564e9, type: 3} |
|
|||
fileFormatVersion: 2 |
|||
guid: dfee6f41f09d9354d9c13429b3bbc666 |
|||
PrefabImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
1001
UOP1_Project/Assets/Art/Props/WoodenBench/BenchTextureCombined2.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: f9222abb4aea72f41be8159a444c852f |
|||
TextureImporter: |
|||
internalIDToNameTable: [] |
|||
externalObjects: {} |
|||
serializedVersion: 11 |
|||
mipmaps: |
|||
mipMapMode: 0 |
|||
enableMipMap: 1 |
|||
sRGBTexture: 1 |
|||
linearTexture: 0 |
|||
fadeOut: 0 |
|||
borderMipMap: 0 |
|||
mipMapsPreserveCoverage: 0 |
|||
alphaTestReferenceValue: 0.5 |
|||
mipMapFadeDistanceStart: 1 |
|||
mipMapFadeDistanceEnd: 3 |
|||
bumpmap: |
|||
convertToNormalMap: 0 |
|||
externalNormalMap: 0 |
|||
heightScale: 0.25 |
|||
normalMapFilter: 0 |
|||
isReadable: 0 |
|||
streamingMipmaps: 0 |
|||
streamingMipmapsPriority: 0 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: -1 |
|||
aniso: -1 |
|||
mipBias: -100 |
|||
wrapU: -1 |
|||
wrapV: -1 |
|||
wrapW: -1 |
|||
nPOTScale: 1 |
|||
lightmap: 0 |
|||
compressionQuality: 50 |
|||
spriteMode: 0 |
|||
spriteExtrude: 1 |
|||
spriteMeshType: 1 |
|||
alignment: 0 |
|||
spritePivot: {x: 0.5, y: 0.5} |
|||
spritePixelsToUnits: 100 |
|||
spriteBorder: {x: 0, y: 0, z: 0, w: 0} |
|||
spriteGenerateFallbackPhysicsShape: 1 |
|||
alphaUsage: 1 |
|||
alphaIsTransparency: 0 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 0 |
|||
textureShape: 1 |
|||
singleChannelComponent: 0 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
applyGammaDecoding: 0 |
|||
platformSettings: |
|||
- serializedVersion: 3 |
|||
buildTarget: DefaultTexturePlatform |
|||
maxTextureSize: 2048 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: -1 |
|||
textureCompression: 1 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
androidETC2FallbackOverride: 0 |
|||
forceMaximumCompressionQuality_BC6H_BC7: 0 |
|||
spriteSheet: |
|||
serializedVersion: 2 |
|||
sprites: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
bones: [] |
|||
spriteID: |
|||
internalID: 0 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
secondaryTextures: [] |
|||
spritePackingTag: |
|||
pSDRemoveMatte: 0 |
|||
pSDShowRemoveMatteOption: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: 2aae116101adc3646bd2ede6a10564e9 |
|||
ModelImporter: |
|||
serializedVersion: 19301 |
|||
internalIDToNameTable: [] |
|||
externalObjects: |
|||
- first: |
|||
type: UnityEngine:Material |
|||
assembly: UnityEngine.CoreModule |
|||
name: Bench_Top_Wood |
|||
second: {fileID: 2100000, guid: f657668e157b7b9419cda1f450f3263c, type: 2} |
|||
- first: |
|||
type: UnityEngine:Material |
|||
assembly: UnityEngine.CoreModule |
|||
name: No Name |
|||
second: {fileID: 2100000, guid: a38c2800cdfa8e04b9f2587c3c77a3ca, type: 2} |
|||
materials: |
|||
materialImportMode: 0 |
|||
materialName: 0 |
|||
materialSearch: 1 |
|||
materialLocation: 1 |
|||
animations: |
|||
legacyGenerateAnimations: 4 |
|||
bakeSimulation: 0 |
|||
resampleCurves: 1 |
|||
optimizeGameObjects: 0 |
|||
motionNodeName: |
|||
rigImportErrors: |
|||
rigImportWarnings: |
|||
animationImportErrors: |
|||
animationImportWarnings: |
|||
animationRetargetingWarnings: |
|||
animationDoRetargetingWarnings: 0 |
|||
importAnimatedCustomProperties: 0 |
|||
importConstraints: 0 |
|||
animationCompression: 1 |
|||
animationRotationError: 0.5 |
|||
animationPositionError: 0.5 |
|||
animationScaleError: 0.5 |
|||
animationWrapMode: 0 |
|||
extraExposedTransformPaths: [] |
|||
extraUserProperties: [] |
|||
clipAnimations: [] |
|||
isReadable: 0 |
|||
meshes: |
|||
lODScreenPercentages: [] |
|||
globalScale: 1 |
|||
meshCompression: 0 |
|||
addColliders: 0 |
|||
useSRGBMaterialColor: 1 |
|||
sortHierarchyByName: 1 |
|||
importVisibility: 0 |
|||
importBlendShapes: 0 |
|||
importCameras: 0 |
|||
importLights: 0 |
|||
fileIdsGeneration: 2 |
|||
swapUVChannels: 0 |
|||
generateSecondaryUV: 1 |
|||
useFileUnits: 1 |
|||
keepQuads: 0 |
|||
weldVertices: 1 |
|||
preserveHierarchy: 0 |
|||
skinWeightsMode: 0 |
|||
maxBonesPerVertex: 4 |
|||
minBoneWeight: 0.001 |
|||
meshOptimizationFlags: -1 |
|||
indexFormat: 0 |
|||
secondaryUVAngleDistortion: 8 |
|||
secondaryUVAreaDistortion: 15 |
|||
secondaryUVHardAngle: 88 |
|||
secondaryUVPackMargin: 8 |
|||
useFileScale: 1 |
|||
tangentSpace: |
|||
normalSmoothAngle: 60 |
|||
normalImportMode: 0 |
|||
tangentImportMode: 3 |
|||
normalCalculationMode: 4 |
|||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 |
|||
blendShapeNormalImportMode: 1 |
|||
normalSmoothingSource: 0 |
|||
referencedClips: [] |
|||
importAnimation: 0 |
|||
humanDescription: |
|||
serializedVersion: 3 |
|||
human: [] |
|||
skeleton: [] |
|||
armTwist: 0.5 |
|||
foreArmTwist: 0.5 |
|||
upperLegTwist: 0.5 |
|||
legTwist: 0.5 |
|||
armStretch: 0.05 |
|||
legStretch: 0.05 |
|||
feetSpacing: 0 |
|||
globalScale: 1 |
|||
rootMotionBoneName: |
|||
hasTranslationDoF: 0 |
|||
hasExtraRoot: 1 |
|||
skeletonHasParents: 1 |
|||
lastHumanDescriptionAvatarSource: {instanceID: 0} |
|||
autoGenerateAvatarMappingIfUnspecified: 1 |
|||
animationType: 0 |
|||
humanoidOversampling: 1 |
|||
avatarSetup: 0 |
|||
additionalBone: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: WoodenBench |
|||
m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62, |
|||
type: 3} |
|||
m_ShaderKeywords: |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BaseMap: |
|||
m_Texture: {fileID: 2800000, guid: f9222abb4aea72f41be8159a444c852f, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 2800000, guid: f9222abb4aea72f41be8159a444c852f, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTexture: |
|||
m_Texture: {fileID: 2800000, guid: f9222abb4aea72f41be8159a444c852f, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _SpecGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _SpecularMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- Foam_Amount: 5 |
|||
- Foam_Cutoff: 3.5 |
|||
- Foam_Evolution_Speed: 1.25 |
|||
- Foam_Scale: 5 |
|||
- Global_Fading: 30 |
|||
- Light_Probe_Contribution: 2.5 |
|||
- Refaction_Scale: 5 |
|||
- Refraction_Evolution_Speed: 1.5 |
|||
- Refraction_Height: 0.2 |
|||
- Vector1_398E6F7F: 0.5 |
|||
- Vector1_495DBFDC: 0 |
|||
- Vector1_551A8284: 0.1 |
|||
- Vector1_5BC4323: 8 |
|||
- Vector1_6B55B4E: 2 |
|||
- Vector1_77A997E: 0.5 |
|||
- Vector1_93E6CC20: 0 |
|||
- Vector1_A4EAD20D: 0.1 |
|||
- Vector1_CCBA7087: 0 |
|||
- Vector1_EA388E7D: 10 |
|||
- Vector1_F8AD0BCD: 8 |
|||
- Water_Depth: 1.5 |
|||
- Wave_Height: 0.25 |
|||
- Wave_Scale: 10 |
|||
- Wave_Speed: 2 |
|||
- _AlphaClip: 0 |
|||
- _Blend: 0 |
|||
- _BumpScale: 1 |
|||
- _Cull: 2 |
|||
- _Cutoff: 0.5 |
|||
- _Dissolve: 0 |
|||
- _DstBlend: 0 |
|||
- _EnvironmentReflections: 1 |
|||
- _FresnelOpacity: 0.5 |
|||
- _Fresnel_Power: 3 |
|||
- _GlossMapScale: 0 |
|||
- _Glossiness: 0 |
|||
- _GlossyReflections: 0 |
|||
- _LightProbeContribution: 3.5 |
|||
- _MainTint_VariationIntensity: 0 |
|||
- _Metallic: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _OutlineDepthSensitivity: 1 |
|||
- _OutlineNormalsSensitivity: 1 |
|||
- _OutlineThickness: 1 |
|||
- _QueueOffset: 0 |
|||
- _ReceiveShadows: 1 |
|||
- _Smoothness: 0 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _Surface: 0 |
|||
- _Wind_Density: 0 |
|||
- _Wind_Direction: 0 |
|||
- _Wind_Speed: 0 |
|||
- _Wind_Strength: 0 |
|||
- _WorkflowMode: 1 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- Color_4818C45D: {r: 0, g: 0, b: 0, a: 0} |
|||
- Color_9BF846A1: {r: 0.55998576, g: 0.8301887, b: 0.7961739, a: 0.2705882} |
|||
- Color_E53190CD: {r: 0, g: 0, b: 0, a: 0} |
|||
- Foam_Color: {r: 1, g: 1, b: 1, a: 0.5450981} |
|||
- Shallow_Water_Color: {r: 0.44313726, g: 0.8750768, b: 0.8980392, a: 0.3176471} |
|||
- Trough_Color: {r: 0, g: 0.03410326, b: 0.7215686, a: 0.4627451} |
|||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} |
|||
- _Color: {r: 1, g: 1, b: 1, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _MainColor: {r: 1, g: 1, b: 1, a: 0} |
|||
- _MainTint: {r: 1, g: 1, b: 1, a: 0} |
|||
- _Offset: {r: 0, g: 0, b: 0, a: 0} |
|||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} |
|||
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0} |
|||
- _Tiling: {r: 1, g: 1, b: 0, a: 0} |
|||
--- !u!114 &8633878897990286939 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 11 |
|||
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} |
|||
m_Name: |
|||
m_EditorClassIdentifier: |
|||
version: 2 |
|
|||
fileFormatVersion: 2 |
|||
guid: 5b2ffc78155b95d4089248e8c087729d |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
Kaydara FBX Binary � _ FBXHeaderExtension\ FBXHeaderVersionI� x |
|||
FBXVersionI� � EncryptionTypeI � CreationTimeStamp� VersionI� � YearI� � MonthI DayI ' HourI ? MinuteI8 W SecondI+ t MillisecondI� � 4 CreatorS/ Blender (stable FBX IO) - 2.79 (sub 0) - 3.7.13R ' |