Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
This commit is contained in:
commit
0ae3c10412
@ -78492,6 +78492,137 @@ MeshCollider:
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 4300000, guid: 2b8031cd6af234142a66fca3cb72b981, type: 3}
|
||||
--- !u!1 &935087255
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 935087259}
|
||||
- component: {fileID: 935087258}
|
||||
- component: {fileID: 935087257}
|
||||
- component: {fileID: 935087256}
|
||||
m_Layer: 0
|
||||
m_Name: Spine GameObject (02_character)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &935087256
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 935087255}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
skeletonDataAsset: {fileID: 11400000, guid: a41bc8bf8b7a18b47b488257d1373394, type: 2}
|
||||
initialSkinName:
|
||||
fixPrefabOverrideViaMeshFilter: 2
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
updateWhenInvisible: 3
|
||||
separatorSlotNames: []
|
||||
zSpacing: 0
|
||||
useClipping: 1
|
||||
immutableTriangles: 0
|
||||
pmaVertexColors: 1
|
||||
clearStateOnDisable: 0
|
||||
tintBlack: 0
|
||||
singleSubmesh: 0
|
||||
fixDrawOrder: 0
|
||||
addNormals: 0
|
||||
calculateTangents: 0
|
||||
maskInteraction: 0
|
||||
maskMaterials:
|
||||
materialsMaskDisabled: []
|
||||
materialsInsideMask: []
|
||||
materialsOutsideMask: []
|
||||
disableRenderingOnOverride: 1
|
||||
updateTiming: 1
|
||||
unscaledTime: 0
|
||||
_animationName: clean
|
||||
loop: 1
|
||||
timeScale: 1
|
||||
--- !u!23 &935087257
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 935087255}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: 518159fecabaa4e41b2e1d35e795a325, type: 2}
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: b6b3b4d5d43470947aca8dae7b5aa1ff, type: 2}
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: b6b3b4d5d43470947aca8dae7b5aa1ff, type: 2}
|
||||
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: 1
|
||||
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_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &935087258
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 935087255}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!4 &935087259
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 935087255}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078}
|
||||
m_LocalPosition: {x: -6.992, y: 1.829, z: 2.355}
|
||||
m_LocalScale: {x: 0.05706087, y: 0.05706087, z: 0.05706087}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0}
|
||||
--- !u!1 &936339857
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -129020,7 +129151,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
skeletonDataAsset: {fileID: 11400000, guid: a41bc8bf8b7a18b47b488257d1373394, type: 2}
|
||||
skeletonDataAsset: {fileID: 0}
|
||||
initialSkinName:
|
||||
fixPrefabOverrideViaMeshFilter: 2
|
||||
initialFlipX: 0
|
||||
@ -129070,12 +129201,12 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: 518159fecabaa4e41b2e1d35e795a325, type: 2}
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: b6b3b4d5d43470947aca8dae7b5aa1ff, type: 2}
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: b6b3b4d5d43470947aca8dae7b5aa1ff, type: 2}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
@ -161322,7 +161453,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1870779162}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.22975291, y: 0.000000016746089, z: -0.0000000039532155, w: 0.973249}
|
||||
m_LocalRotation: {x: 0.22975291, y: -0.000000016746096, z: 0.0000000039532173, w: 0.973249}
|
||||
m_LocalPosition: {x: 3.88, y: 9.1380005, z: -16.524}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@ -168809,7 +168940,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1948908411}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.22975291, y: 0.000000016746089, z: -0.0000000039532155, w: 0.973249}
|
||||
m_LocalRotation: {x: 0.22975291, y: -0.000000016746096, z: 0.0000000039532173, w: 0.973249}
|
||||
m_LocalPosition: {x: 3.88, y: 9.1380005, z: -16.524}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
@ -203360,3 +203491,4 @@ SceneRoots:
|
||||
- {fileID: 530797244}
|
||||
- {fileID: 2073486040}
|
||||
- {fileID: 1533313707}
|
||||
- {fileID: 935087259}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/New Terrain.asset.meta
|
||||
guid: 036182aa544341547ae1adc87b766605
|
||||
guid: 5e78ff65d842eed45bf77d23ca78cd13
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 14c71f1c3921e024bbc929757a2cdad4
|
||||
|
||||
@ -1,13 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/NewBrush.brush.meta
|
||||
guid: 49e3c3345d27ff0458304847ed4a1706
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 33ac88468b44c764e9671396b6c43a88
|
||||
guid: 337672b8637f6e449bca70f0ca66ebbc
|
||||
TextScriptImporter:
|
||||
>>>>>>>> 8dbc1078d (씬 99타이쿤 추가작업(애니메이션)):BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.atlas.txt.meta
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -1,13 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/05.Prefabs/Terrains/OceanTerrainPalette.asset.meta
|
||||
guid: d50f66bceda4a694cb78b6449cfae29c
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 945b3e5c0f2ded2499020ffe9c9e1af4
|
||||
guid: 3734f6a774f815d4f8d55bf6ac4ad308
|
||||
TextScriptImporter:
|
||||
>>>>>>>> 8dbc1078d (씬 99타이쿤 추가작업(애니메이션)):BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.skel.bytes.meta
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -14,7 +14,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
textureLoadingMode: 0
|
||||
onDemandTextureLoader: {fileID: 0}
|
||||
atlasFile: {fileID: 4900000, guid: 33ac88468b44c764e9671396b6c43a88, type: 3}
|
||||
atlasFile: {fileID: 4900000, guid: 337672b8637f6e449bca70f0ca66ebbc, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
|
||||
- {fileID: 2100000, guid: 518159fecabaa4e41b2e1d35e795a325, type: 2}
|
||||
|
||||
@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
atlasAssets:
|
||||
- {fileID: 11400000, guid: a503d2b30b26ec143892d6e15c968375, type: 2}
|
||||
scale: 0.01
|
||||
skeletonJSON: {fileID: 4900000, guid: 945b3e5c0f2ded2499020ffe9c9e1af4, type: 3}
|
||||
skeletonJSON: {fileID: 4900000, guid: 3734f6a774f815d4f8d55bf6ac4ad308, type: 3}
|
||||
isUpgradingBlendModeMaterials: 0
|
||||
blendModeMaterials:
|
||||
requiresBlendModeMaterials: 0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/05.Prefabs/Terrains/OceanTerrainPalette.asset.meta
|
||||
guid: d50f66bceda4a694cb78b6449cfae29c
|
||||
guid: 7a3d519fa6f34364bb88cb5c8e1d3688
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 945b3e5c0f2ded2499020ffe9c9e1af4
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/New Terrain.asset.meta
|
||||
guid: 036182aa544341547ae1adc87b766605
|
||||
guid: 2e4616655292db74e9f00f8c53371149
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 14c71f1c3921e024bbc929757a2cdad4
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:BlueWater/Assets/NewBrush.brush.meta
|
||||
guid: 49e3c3345d27ff0458304847ed4a1706
|
||||
guid: e58e0dae31f1a7d4bbe518cf4f167a02
|
||||
NativeFormatImporter:
|
||||
========
|
||||
guid: 33ac88468b44c764e9671396b6c43a88
|
||||
|
||||
Loading…
Reference in New Issue
Block a user