From d8c3534cc4bb0db95dd57208f8f71e9d49a66b08 Mon Sep 17 00:00:00 2001
From: art_xcl <dsfgsdf@qq.com>
Date: 星期二, 21 八月 2018 14:25:37 +0800
Subject: [PATCH] 娲皇遗迹三层优化
---
Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_building_00.FBX | 0
Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_platform_00.FBX | 0
/dev/null | 84 ----------------------------
Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga | 0
Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga.meta | 28 ++-------
Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_rock_00.FBX | 0
Maps/Scenes/Map203_Whmj_3.unity | 58 ++++++++++---------
Maps/Model/Map203_Whmj_3/Material/Whmj_3_shrub_00.mat | 2
Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_shrub_00.FBX | 0
Maps/Model/Map203_Whmj_3/Material/Whmj_3_platform_00.mat | 2
10 files changed, 38 insertions(+), 136 deletions(-)
diff --git a/Maps/Model/Map203_Whmj_3/Material/Whmj_3_platform_00.mat b/Maps/Model/Map203_Whmj_3/Material/Whmj_3_platform_00.mat
index acc1ebc..4c64cfb 100644
--- a/Maps/Model/Map203_Whmj_3/Material/Whmj_3_platform_00.mat
+++ b/Maps/Model/Map203_Whmj_3/Material/Whmj_3_platform_00.mat
@@ -39,7 +39,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 4a4587e9b73bfdf4b804855c94ab2311, type: 3}
+ m_Texture: {fileID: 2800000, guid: c8ea930ffee198f40a4a9993aade229b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Maps/Model/Map203_Whmj_3/Material/Whmj_3_shrub_00.mat b/Maps/Model/Map203_Whmj_3/Material/Whmj_3_shrub_00.mat
index cb3a9f6..ae45276 100644
--- a/Maps/Model/Map203_Whmj_3/Material/Whmj_3_shrub_00.mat
+++ b/Maps/Model/Map203_Whmj_3/Material/Whmj_3_shrub_00.mat
@@ -39,7 +39,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: e20ae632ee55f7847a107f345212453e, type: 3}
+ m_Texture: {fileID: 2800000, guid: c8ea930ffee198f40a4a9993aade229b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_building_00.FBX b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_building_00.FBX
index 18d6fcc..459c014 100644
--- a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_building_00.FBX
+++ b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_building_00.FBX
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_platform_00.FBX b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_platform_00.FBX
index 474bc0d..3490e52 100644
--- a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_platform_00.FBX
+++ b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_platform_00.FBX
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_rock_00.FBX b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_rock_00.FBX
index de579ea..fe18397 100644
--- a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_rock_00.FBX
+++ b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_rock_00.FBX
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_shrub_00.FBX b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_shrub_00.FBX
index 99cce63..33e0f34 100644
--- a/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_shrub_00.FBX
+++ b/Maps/Model/Map203_Whmj_3/Mesh/Whmj_3_shrub_00.FBX
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd
deleted file mode 100644
index 3d74ed2..0000000
--- a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd
+++ /dev/null
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga
new file mode 100644
index 0000000..6d5d9b1
--- /dev/null
+++ b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd.meta b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga.meta
similarity index 71%
rename from Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd.meta
rename to Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga.meta
index 8ae7009..0b3e684 100644
--- a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.psd.meta
+++ b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_platform_00.tga.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
-guid: 4a4587e9b73bfdf4b804855c94ab2311
-timeCreated: 1526636448
-licenseType: Pro
+guid: c8ea930ffee198f40a4a9993aade229b
+timeCreated: 1534819339
+licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -30,7 +30,7 @@
filterMode: -1
aniso: -1
mipBias: -1
- wrapMode: 1
+ wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -41,7 +41,7 @@
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
- alphaUsage: 0
+ alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
@@ -51,22 +51,6 @@
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- - buildTarget: Standalone
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- - buildTarget: Android
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
diff --git a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd
deleted file mode 100644
index 71feee3..0000000
--- a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd
+++ /dev/null
Binary files differ
diff --git a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd.meta b/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd.meta
deleted file mode 100644
index f14a2a2..0000000
--- a/Maps/Model/Map203_Whmj_3/Texture/Whmj_3_shrub_00.psd.meta
+++ /dev/null
@@ -1,84 +0,0 @@
-fileFormatVersion: 2
-guid: e20ae632ee55f7847a107f345212453e
-timeCreated: 1526636449
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 4
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- filterMode: -1
- aniso: -1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- - buildTarget: Standalone
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- - buildTarget: Android
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Maps/Scenes/Map203_Whmj_3.unity b/Maps/Scenes/Map203_Whmj_3.unity
index 2abb1b3..fad17cc 100644
--- a/Maps/Scenes/Map203_Whmj_3.unity
+++ b/Maps/Scenes/Map203_Whmj_3.unity
@@ -78,15 +78,17 @@
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
- m_PVRFiltering: 0
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
- m_PVRFilteringAtrousColorSigma: 1
- m_PVRFilteringAtrousNormalSigma: 1
- m_PVRFilteringAtrousPositionSigma: 1
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
m_LightingDataAsset: {fileID: 112000002, guid: 900de4375a3e6b747966b3f9efc24df4,
type: 2}
m_ShadowMaskMode: 0
@@ -257,7 +259,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4311316781608850, guid: 7b2fa098775adee4a8763443a230bfc5, type: 2}
propertyPath: m_LocalPosition.z
- value: 15.1119995
+ value: 15.112
objectReference: {fileID: 0}
- target: {fileID: 4311316781608850, guid: 7b2fa098775adee4a8763443a230bfc5, type: 2}
propertyPath: m_LocalRotation.x
@@ -823,15 +825,15 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalEulerAnglesHint.y
- value: 220.65799
+ value: 220.658
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalScale.x
- value: 0.84171677
+ value: 0.8417168
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalScale.z
- value: 0.84171677
+ value: 0.8417168
objectReference: {fileID: 0}
- target: {fileID: 1578502648545458, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_Name
@@ -1130,7 +1132,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.w
- value: -0.42934006
+ value: -0.4293401
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_RootOrder
@@ -1189,7 +1191,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.x
- value: 0.000000021266379
+ value: 0.00000002126638
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.y
@@ -1201,7 +1203,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.w
- value: 0.97303516
+ value: 0.9730352
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_RootOrder
@@ -1213,11 +1215,11 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalScale.x
- value: 0.74114877
+ value: 0.7411488
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalScale.z
- value: 0.74114877
+ value: 0.7411488
objectReference: {fileID: 0}
- target: {fileID: 1578502648545458, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_Name
@@ -1256,7 +1258,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalPosition.y
- value: 0.87
+ value: 0.862
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalPosition.z
@@ -1272,7 +1274,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.z
- value: 0.0000000067922366
+ value: 0.000000006792237
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.w
@@ -1679,6 +1681,11 @@
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
+--- !u!4 &514600807 stripped
+Transform:
+ m_PrefabParentObject: {fileID: 4218296411810028, guid: b9623ae5d65baf74386d10f29e95dbaa,
+ type: 2}
+ m_PrefabInternal: {fileID: 782518937}
--- !u!1001 &568119346
Prefab:
m_ObjectHideFlags: 0
@@ -2109,7 +2116,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.z
- value: -0.000000021010505
+ value: -0.000000021010504
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.w
@@ -2323,11 +2330,6 @@
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b9623ae5d65baf74386d10f29e95dbaa, type: 2}
m_IsPrefabParent: 0
---- !u!4 &782518938 stripped
-Transform:
- m_PrefabParentObject: {fileID: 4366380488392852, guid: b9623ae5d65baf74386d10f29e95dbaa,
- type: 2}
- m_PrefabInternal: {fileID: 782518937}
--- !u!1 &819977434
GameObject:
m_ObjectHideFlags: 0
@@ -3507,7 +3509,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.w
- value: 0.89550924
+ value: 0.8955093
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_RootOrder
@@ -3702,7 +3704,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalPosition.y
- value: 0.21000001
+ value: 0.21
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalPosition.z
@@ -3710,7 +3712,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.x
- value: 0.000000019524105
+ value: 0.000000019524103
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.y
@@ -3730,7 +3732,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalEulerAnglesHint.y
- value: 53.413002
+ value: 53.413
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalScale.x
@@ -4306,7 +4308,7 @@
- {fileID: 361938325}
- {fileID: 1307259759}
- {fileID: 468704876}
- - {fileID: 782518938}
+ - {fileID: 514600807}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4319,7 +4321,7 @@
m_Modifications:
- target: {fileID: 4737782248627382, guid: f18c011ba338c004d8be758717a76b20, type: 2}
propertyPath: m_LocalPosition.x
- value: 7.0580482
+ value: 7.058048
objectReference: {fileID: 0}
- target: {fileID: 4737782248627382, guid: f18c011ba338c004d8be758717a76b20, type: 2}
propertyPath: m_LocalPosition.y
@@ -5070,7 +5072,7 @@
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.x
- value: 0.000000021272553
+ value: 0.000000021272552
objectReference: {fileID: 0}
- target: {fileID: 4665728913942368, guid: 929bd7940595d3141a2a445167847c9f, type: 2}
propertyPath: m_LocalRotation.y
--
Gitblit v1.8.0