diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index e86be7fd2..400856d58 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: bc074d00982114f0388e9c98de91d44f m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: ef672e941747c2eb6b19db828d740a6a m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat index 299c71069..cfbcbd11e 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat @@ -138,7 +138,7 @@ Material: - _CastShadows: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_BaseColor.tga b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_BaseColor.tga index 8b2293941..f0cb64af7 100644 Binary files a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_BaseColor.tga and b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_BaseColor.tga differ diff --git a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_Normal.tga b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_Normal.tga index 7e0ce25ad..5933a67ff 100644 Binary files a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_Normal.tga and b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V1_Normal.tga differ diff --git a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V2_BaseColor.tga b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V2_BaseColor.tga index ee0c8d062..f91734f5d 100644 Binary files a/Assets/Meshes/Characters/Summoner/NECRO_MAT_V2_BaseColor.tga and b/Assets/Meshes/Characters/Summoner/NECRO_MAT_V2_BaseColor.tga differ diff --git a/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab b/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab new file mode 100644 index 000000000..32c2dec39 --- /dev/null +++ b/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2517052208646740567 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalPosition.x + value: 24.771984 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalPosition.z + value: 245.35501 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.7435083 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.6687268 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -276.062 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: m_Name + value: Summoner@Summoner_BaseModel_Final + objectReference: {fileID: 0} + - target: {fileID: 1226197478650774982, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 28d918dd3e6e1b64b801b190f687e48f, type: 2} + - target: {fileID: 2351593647363901996, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e396d6eb5c1eaa84ca9b0532244af92c, type: 2} + - target: {fileID: 2351593647363901996, guid: bc665e8847fbaa64ca8b3b83154f4378, + type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 28d918dd3e6e1b64b801b190f687e48f, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc665e8847fbaa64ca8b3b83154f4378, type: 3} diff --git a/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab.meta b/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab.meta new file mode 100644 index 000000000..0febb2aa8 --- /dev/null +++ b/Assets/Meshes/Characters/Summoner/Summoner@Summoner_BaseModel_Final.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 02262f24cdc508d4a8c7ae6c4056edc3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Characters/Summoner/SummonerV1.mat b/Assets/Meshes/Characters/Summoner/SummonerV1.mat index ffca8a234..afde2a47a 100644 --- a/Assets/Meshes/Characters/Summoner/SummonerV1.mat +++ b/Assets/Meshes/Characters/Summoner/SummonerV1.mat @@ -42,7 +42,7 @@ Material: serializedVersion: 3 m_TexEnvs: - BaseTex: - m_Texture: {fileID: 2800000, guid: f5914f0e74e91304fa3717ffb3647c0a, type: 3} + m_Texture: {fileID: 2800000, guid: aca120bd4ee70864eaad747df1fd9d43, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - DissolveMask: @@ -111,15 +111,15 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - AOStrength: 1.01 + - AOStrength: 1.83 - AlphaClipThreshold: 0.5 - BASETEXTYPE: 1 - DissolveNoiseScale: 25 - EffectStrenght: 1 - FresnelPower: 4 - - Metalness: 0.25 - - NormalStrength: 1.01 - - Smoothness: 0.56 + - Metalness: 2.22 + - NormalStrength: 0.61 + - Smoothness: 0.67 - USEDISSOLVE: 0 - USEDISSOLVEMASK: 0 - USEFRESNEL: 0 @@ -138,7 +138,7 @@ Material: - _CastShadows: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/Meshes/Characters/Summoner/SummonerV2.mat b/Assets/Meshes/Characters/Summoner/SummonerV2.mat index c12ff61e3..e9bccf474 100644 --- a/Assets/Meshes/Characters/Summoner/SummonerV2.mat +++ b/Assets/Meshes/Characters/Summoner/SummonerV2.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - NOSMap: - m_Texture: {fileID: 2800000, guid: fc7e97d2b60958d43840082d4431871a, type: 3} + m_Texture: {fileID: 2800000, guid: a3c5f39ccb19b2e4b9705cb26a2399e0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -111,15 +111,15 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - AOStrength: 1.01 + - AOStrength: 3 - AlphaClipThreshold: 0.5 - BASETEXTYPE: 1 - DissolveNoiseScale: 25 - EffectStrenght: 1 - FresnelPower: 4 - - Metalness: 0.25 - - NormalStrength: 1.01 - - Smoothness: 0.56 + - Metalness: 2.66 + - NormalStrength: 1.24 + - Smoothness: 0.27 - USEDISSOLVE: 0 - USEDISSOLVEMASK: 0 - USEFRESNEL: 0 @@ -138,7 +138,7 @@ Material: - _CastShadows: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/_TerrainAutoUpgrade.meta b/Assets/_TerrainAutoUpgrade.meta new file mode 100644 index 000000000..dcc583874 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0d5f98eff445e54594680e6c861c2ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: