Maps/A_Map_TongYong/Texture_2/15.png
Maps/A_Map_TongYong/Texture_2/15.png.metacopy from Maps/Model/Map119_Qlzf/Effect/Textures/Water_Norm.psd.meta copy to Maps/A_Map_TongYong/Texture_2/15.png.meta
File was copied from Maps/Model/Map119_Qlzf/Effect/Textures/Water_Norm.psd.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d026aead97469b543b8dd4345b4da9c9 timeCreated: 1534312884 guid: 928a22648a75b894391c3fbc5079b908 timeCreated: 1534499171 licenseType: Pro TextureImporter: fileIDToRecycleName: {} Maps/Model/Map119_Qlzf/Effect/Effect.prefab
Diff too large Maps/Model/Map119_Qlzf/Effect/Effect.prefab.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8d8c0660c5770fa48887a792e8805145 timeCreated: 1534313189 timeCreated: 1534499828 licenseType: Pro NativeFormatImporter: mainObjectFileID: 100100000 Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_01.mat
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_04.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_04 m_Name: Effect_Qlzf_01 m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -39,7 +39,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 1e721077ba070ce4eb4c86a3f7f27c96, type: 3} m_Texture: {fileID: 2800000, guid: 7ca08b2aadf2f144db2e3bc2854a9992, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_01.mat.meta
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_fx_001.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 28f8925d8819da749972f38402ccaf5c timeCreated: 1504750582 guid: bcff7f71f37013f4399a08d9b0f9c1b6 timeCreated: 1534498524 licenseType: Pro NativeFormatImporter: mainObjectFileID: 2100000 Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_02.mat
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_00.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_00 m_Name: Effect_Qlzf_02 m_Shader: {fileID: 4800000, guid: 3a8bf4797d9494d40b159339f6593f5f, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 @@ -63,7 +63,7 @@ m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} - _WaterNorms: m_Texture: {fileID: 2800000, guid: d026aead97469b543b8dd4345b4da9c9, type: 3} m_Texture: {fileID: 2800000, guid: 928a22648a75b894391c3fbc5079b908, type: 3} m_Scale: {x: 10, y: 10} m_Offset: {x: 0, y: 0} m_Floats: Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_02.mat.meta
Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_03.mat
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_01.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_01 m_Name: Effect_Qlzf_03 m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -43,7 +43,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 760ce984486bb674aa68658d45c8ac7e, type: 3} m_Texture: {fileID: 2800000, guid: 736b47230f01f484bb0e14de4f937561, type: 3} m_Scale: {x: 2, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_03.mat.meta
Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_04.mat
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_02.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_02 m_Name: Effect_Qlzf_04 m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_04.mat.meta
Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_05.mat
File was renamed from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_03.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_03 m_Name: Effect_Qlzf_05 m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -39,7 +39,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 587685d45b42caa46aad9494e48e6198, type: 3} m_Texture: {fileID: 2800000, guid: 650256232b4b39f46a90e7876a69d6d7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_05.mat.meta
Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_06.matcopy from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_03.mat copy to Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_06.mat
File was copied from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_03.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Qlzf_water_03 m_Name: Effect_Qlzf_06 m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 @@ -39,7 +39,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 587685d45b42caa46aad9494e48e6198, type: 3} m_Texture: {fileID: 2800000, guid: 08de7d09218b8fb4ba0e1437059c7ab2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -75,4 +75,4 @@ m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.23183388, g: 0.4705882, b: 0.3816728, a: 0.2509804} - _TintColor: {r: 0.25735295, g: 0.25735295, b: 0.25735295, a: 0.5} Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_06.mat.metacopy from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_fx_001.mat.meta copy to Maps/Model/Map119_Qlzf/Effect/Material/Effect_Qlzf_06.mat.meta
File was copied from Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_fx_001.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 28f8925d8819da749972f38402ccaf5c timeCreated: 1504750582 guid: feb50618dd757594b9832428f7cf9995 timeCreated: 1506050940 licenseType: Pro NativeFormatImporter: mainObjectFileID: 2100000 Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_fx_001.mat
File was deleted Maps/Model/Map119_Qlzf/Effect/Material/Qlzf_water_04.mat.meta
File was deleted Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_01.png
Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_01.png.meta
File was renamed from Maps/Model/Map119_Qlzf/Effect/Textures/Water_Norm.psd.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d026aead97469b543b8dd4345b4da9c9 timeCreated: 1534312884 guid: 736b47230f01f484bb0e14de4f937561 timeCreated: 1534499208 licenseType: Pro TextureImporter: fileIDToRecycleName: {} Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_02.pngMaps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_02.png.meta
Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_04.pngMaps/Model/Map119_Qlzf/Effect/Textures/Effect_Qlzf_04.png.meta
Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Xsdt_06.pngBinary files differ
Maps/Model/Map119_Qlzf/Effect/Textures/Effect_Xsdt_06.png.meta
File was deleted Maps/Model/Map119_Qlzf/Effect/Textures/Qlzf_water_05.pngBinary files differ
Maps/Model/Map119_Qlzf/Effect/Textures/Qlzf_water_05.png.meta
File was deleted Maps/Model/Map119_Qlzf/Effect/Textures/Qlzf_water_bg3.pngBinary files differ
Maps/Model/Map119_Qlzf/Effect/Textures/Qlzf_water_bg3.png.meta
File was deleted Maps/Model/Map119_Qlzf/Effect/Textures/Water_Norm.psdBinary files differ
Maps/Scenes/Map119_Qlzf.unity
@@ -2206,7 +2206,7 @@ - {fileID: 1820007782} - {fileID: 941156007} m_Father: {fileID: 2132075080} m_RootOrder: 6 m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &194187302 GameObject: @@ -4538,11 +4538,6 @@ m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &372342978 stripped Transform: m_PrefabParentObject: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} m_PrefabInternal: {fileID: 1599270881} --- !u!1001 &372656089 Prefab: m_ObjectHideFlags: 0 @@ -6166,7 +6161,7 @@ m_LocalScale: {x: 0.7000003, y: 0.70000017, z: 0.70000046} m_Children: [] m_Father: {fileID: 2132075080} m_RootOrder: 5 m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 60, y: 50, z: 0} --- !u!1 &513299681 GameObject: @@ -8608,7 +8603,7 @@ - {fileID: 2113300710} - {fileID: 1273731535} m_Father: {fileID: 2132075080} m_RootOrder: 2 m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &712464357 Prefab: @@ -12514,7 +12509,7 @@ - {fileID: 1432993151} - {fileID: 1130058726} m_Father: {fileID: 2132075080} m_RootOrder: 3 m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1006990608 GameObject: @@ -13547,7 +13542,7 @@ - {fileID: 1062148981} - {fileID: 850610414} m_Father: {fileID: 2132075080} m_RootOrder: 1 m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1076844275 Prefab: @@ -17821,6 +17816,53 @@ m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &1457563626 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 2132075080} m_Modifications: - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.x value: -5.496409 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.z value: -5.764582 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} m_IsPrefabParent: 0 --- !u!4 &1457563627 stripped Transform: m_PrefabParentObject: {fileID: 4568498682003692, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} m_PrefabInternal: {fileID: 1457563626} --- !u!1 &1458898813 GameObject: m_ObjectHideFlags: 0 @@ -18044,7 +18086,7 @@ - {fileID: 1352693941} - {fileID: 542663103} m_Father: {fileID: 2132075080} m_RootOrder: 4 m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1465313424 GameObject: @@ -19298,108 +19340,6 @@ m_PrefabParentObject: {fileID: 4834500461715778, guid: a0447e6852458e24f8ddc5b50d257aa1, type: 2} m_PrefabInternal: {fileID: 1597092574} --- !u!1001 &1599270881 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 2132075080} m_Modifications: - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.x value: -5.496409 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.z value: -5.7645817 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 4046377673143176, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.x value: -0.3492017 objectReference: {fileID: 0} - target: {fileID: 4046377673143176, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.y value: -0.6148644 objectReference: {fileID: 0} - target: {fileID: 4046377673143176, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.z value: -0.6148644 objectReference: {fileID: 0} - target: {fileID: 4046377673143176, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalRotation.w value: 0.3492017 objectReference: {fileID: 0} - target: {fileID: 1974772318952870, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.x value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.y value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4923511685057418, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.z value: 0.7 objectReference: {fileID: 0} - target: {fileID: 1181656625858702, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.x value: -5.496 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.z value: -5.764 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.x value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.y value: 0.7 objectReference: {fileID: 0} - target: {fileID: 4821467188398092, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} propertyPath: m_LocalScale.z value: 0.7 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8d8c0660c5770fa48887a792e8805145, type: 2} m_IsPrefabParent: 0 --- !u!1001 &1599929371 Prefab: m_ObjectHideFlags: 0 @@ -25147,7 +25087,7 @@ - {fileID: 152325046} - {fileID: 463092016} m_Father: {fileID: 2132075080} m_RootOrder: 7 m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2113300709 Prefab: @@ -25505,7 +25445,6 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 372342978} - {fileID: 1069114437} - {fileID: 709579622} - {fileID: 1000526765} @@ -25513,6 +25452,7 @@ - {fileID: 510764706} - {fileID: 193745728} - {fileID: 2103186618} - {fileID: 1457563627} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}