diff --git a/Assets/GFX/Shaders/Backup/FaTerrainShader 1.shader b/Assets/GFX/Shaders/Backup/FaTerrainShader 1.shader index 76302023..9a4f773b 100644 --- a/Assets/GFX/Shaders/Backup/FaTerrainShader 1.shader +++ b/Assets/GFX/Shaders/Backup/FaTerrainShader 1.shader @@ -15,12 +15,6 @@ Properties { _DepthLevel ("Depth Level", float) = 0.078125 _AbyssLevel ("Abyss Level", float) = 0.078125 - [MaterialToggle] _Area("Area", Int) = 0 - _AreaX ("Area X", Range (0, 2048)) = 0 - _AreaY ("Area Y", Range (0, 2048)) = 0 - _AreaWidht ("Area Widht", Range (0, 2048)) = 0 - _AreaHeight ("Area Height", Range (0, 2048)) = 0 - // set by terrain engine _Control ("Control (RGBA)", 2D) = "black" {} _ControlXP ("ControlXP (RGBA)", 2D) = "black" {} @@ -174,11 +168,8 @@ Properties { half _BrushUvX; half _BrushUvY; - int _Area; - half _AreaX; - half _AreaY; - half _AreaWidht; - half _AreaHeight; + uniform int _Area; + uniform half4 _AreaRect; @@ -399,19 +390,19 @@ Properties { if(_Area > 0){ fixed3 BlackEmit = -1; fixed3 Albedo = 0; - if(IN.worldPos.x < _AreaX){ + if(IN.worldPos.x < _AreaRect.x){ o.Emission = BlackEmit; o.Albedo = Albedo; } - else if(IN.worldPos.x > _AreaWidht){ + else if(IN.worldPos.x > _AreaRect.z){ o.Emission = BlackEmit; o.Albedo = Albedo; } - else if(IN.worldPos.z < _AreaY - _GridScale){ + else if(IN.worldPos.z < _AreaRect.y - _GridScale){ o.Emission = BlackEmit; o.Albedo = Albedo; } - else if(IN.worldPos.z > _AreaHeight - _GridScale){ + else if(IN.worldPos.z > _AreaRect.w - _GridScale){ o.Emission = BlackEmit; o.Albedo = Albedo; } diff --git a/Assets/GFX/Shaders/FaWater.shader b/Assets/GFX/Shaders/FaWater.shader index b0a4ce2a..6fa4d4d8 100644 --- a/Assets/GFX/Shaders/FaWater.shader +++ b/Assets/GFX/Shaders/FaWater.shader @@ -19,6 +19,8 @@ Shader "MapEditor/FaWater" { NormalSampler1 ("NormalSampler1", 2D) = "white" {} NormalSampler2 ("NormalSampler2", 2D) = "white" {} NormalSampler3 ("NormalSampler3", 2D) = "white" {} + + _GridScale ("Grid Scale", Range (0, 2048)) = 512 //_WaterScaleX ("Water Scale X", float) = 1024 //_WaterScaleZ ("Water Scale Z", float) = 1024 } @@ -71,8 +73,10 @@ Shader "MapEditor/FaWater" { float SunGlow; fixed4 waterColor, sunColor; - - + half _GridScale; + + int _Area; + half4 _AreaRect; //*********** End Water Params sampler2D _WaterGrabTexture; @@ -96,6 +100,7 @@ Shader "MapEditor/FaWater" { float4 mScreenPos : TEXCOORD6; float4 AddVar : TEXCOORD7; float4 grabUV; + float3 worldPos; }; void vert (inout appdata_full v, out Input o){ @@ -260,6 +265,24 @@ Shader "MapEditor/FaWater" { clip(waterDepth - 0.01); + if(_Area > 0){ + fixed3 BlackEmit = -1; + fixed3 Albedo = 0; + if(IN.worldPos.x < _AreaRect.x){ + returnPixels.rgb = 0; + } + else if(IN.worldPos.x > _AreaRect.z){ + returnPixels.rgb = 0; + } + else if(IN.worldPos.z < _AreaRect.y - _GridScale){ + returnPixels.rgb = 0; + } + else if(IN.worldPos.z > _AreaRect.w - _GridScale){ + returnPixels.rgb = 0; + } + } + + o.Albedo = 0; //color.rgb = exp2(-color.rgb); o.Emission = returnPixels.rgb; diff --git a/Assets/GFX/Terrain/ScmapTerrain.asset b/Assets/GFX/Terrain/ScmapTerrain.asset index cf10fd3b..53944df3 100644 Binary files a/Assets/GFX/Terrain/ScmapTerrain.asset and b/Assets/GFX/Terrain/ScmapTerrain.asset differ diff --git a/Assets/GFX/Terrain/TerrainShader.mat b/Assets/GFX/Terrain/TerrainShader.mat index cbf91c97..f7a1dc09 100644 --- a/Assets/GFX/Terrain/TerrainShader.mat +++ b/Assets/GFX/Terrain/TerrainShader.mat @@ -231,22 +231,22 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _AbyssLevel: 0.25 - - _Area: 0 - - _AreaHeight: 25.6 - - _AreaWidht: 25.6 + - _AbyssLevel: 0.3 + - _Area: 1 + - _AreaHeight: 128 + - _AreaWidht: 204.8 - _AreaX: 0 - - _AreaY: 0 + - _AreaY: 76.8 - _Brush: 0 - _BrushSize: 0 - - _BrushUvX: 0.12903841 - - _BrushUvY: 0.35758018 + - _BrushUvX: 0.85578656 + - _BrushUvY: 0.053629737 - _DeepLevel: 1.675625 - - _DepthLevel: 1.5 + - _DepthLevel: 2 - _GeneratingNormal: 0 - _Grid: 0 - _GridCamDist: 0.049673967 - - _GridScale: 102.4 + - _GridScale: 51.2 - _HideSplat0: 0 - _HideSplat1: 0 - _HideSplat2: 0 @@ -257,32 +257,32 @@ Material: - _HideSplat7: 0 - _HideSplat8: 0 - _LightingMultiplier: 1.27 - - _LowerScale: 256 - - _LowerScaleNormal: 117.02857 + - _LowerScale: 128 + - _LowerScaleNormal: 58.514286 - _Shininess: 0.03 - _Slope: 0 - - _Splat0Scale: 256 - - _Splat0ScaleNormal: 256 - - _Splat1Scale: 292.57144 - - _Splat1ScaleNormal: 89.04348 - - _Splat2Scale: 60.952385 - - _Splat2ScaleNormal: 512 - - _Splat3Scale: 170.66667 - - _Splat3ScaleNormal: 256 - - _Splat4Scale: 256 - - _Splat4ScaleNormal: 256 - - _Splat5Scale: 256 - - _Splat5ScaleNormal: 256 - - _Splat6Scale: 256 - - _Splat6ScaleNormal: 256 - - _Splat7Scale: 256 - - _Splat7ScaleNormal: 256 + - _Splat0Scale: 128 + - _Splat0ScaleNormal: 128 + - _Splat1Scale: 128 + - _Splat1ScaleNormal: 128 + - _Splat2Scale: 128 + - _Splat2ScaleNormal: 128 + - _Splat3Scale: 128 + - _Splat3ScaleNormal: 128 + - _Splat4Scale: 128 + - _Splat4ScaleNormal: 128 + - _Splat5Scale: 128 + - _Splat5ScaleNormal: 128 + - _Splat6Scale: 128 + - _Splat6ScaleNormal: 128 + - _Splat7Scale: 128 + - _Splat7ScaleNormal: 128 - _TTerrainXP: 0 - - _UpperScale: 8 - - _UpperScaleNormal: 1024 + - _UpperScale: 4 + - _UpperScaleNormal: 512 - _UseSlopeTex: 1 - _Water: 1 - - _WaterLevel: 1.75 + - _WaterLevel: 2.8 - _WaterScaleX: 1024 - _WaterScaleZ: 1024 m_Colors: diff --git a/Assets/GFX/Terrain/WaterShader.mat b/Assets/GFX/Terrain/WaterShader.mat index 7972d474..bd602e53 100644 --- a/Assets/GFX/Terrain/WaterShader.mat +++ b/Assets/GFX/Terrain/WaterShader.mat @@ -104,6 +104,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _Glossiness: 0.5 + - _GridScale: 51.2 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -117,5 +118,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - sunColor: {r: 0.26, g: 0.235, b: 0.175, a: 1} + - sunColor: {r: 0.40637136, g: 0.2370499, b: 0.16932134, a: 1} - waterColor: {r: 0, g: 0.35, b: 0.75, a: 1} diff --git a/Assets/MapEditor.unity b/Assets/MapEditor.unity index 35ad6313..f0d97db3 100644 --- a/Assets/MapEditor.unity +++ b/Assets/MapEditor.unity @@ -88,6 +88,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 112000002, guid: 796c07b062b5047418ed144284278cae, type: 2} m_UseShadowmask: 0 @@ -18603,7 +18604,7 @@ Prefab: type: 2} propertyPath: m_Group value: - objectReference: {fileID: 266053376} + objectReference: {fileID: 514662302} - target: {fileID: 1822058447359452, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_Name value: Toggle (2) @@ -35999,7 +36000,7 @@ Camera: serializedVersion: 2 m_Bits: 2560 m_RenderingPath: 1 - m_TargetTexture: {fileID: 1424933682} + m_TargetTexture: {fileID: 1306081321} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -47184,7 +47185,7 @@ Prefab: - target: {fileID: 114173077333384758, guid: 30131436e7e207b4f82d0dedb78a89a4, type: 2} propertyPath: m_MaxValue - value: 8 + value: 16 objectReference: {fileID: 0} - target: {fileID: 114173077333384758, guid: 30131436e7e207b4f82d0dedb78a89a4, type: 2} @@ -47211,6 +47212,11 @@ Prefab: propertyPath: m_SizeDelta.x value: -27 objectReference: {fileID: 0} + - target: {fileID: 114208810250179934, guid: 30131436e7e207b4f82d0dedb78a89a4, + type: 2} + propertyPath: m_CharacterLimit + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 30131436e7e207b4f82d0dedb78a89a4, type: 2} m_IsPrefabParent: 0 @@ -75887,6 +75893,130 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1168837922} +--- !u!1 &1168910111 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1168910113} + - component: {fileID: 1168910112} + - component: {fileID: 1168910114} + - component: {fileID: 1168910116} + - component: {fileID: 1168910115} + m_Layer: 0 + m_Name: Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1168910112 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1168910111} + m_Enabled: 0 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 35 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 17680 + m_RenderingPath: 3 + m_TargetTexture: {fileID: 8400000, guid: 3fffb8677da01ab4898dcc3e0fad9195, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1168910113 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1168910111} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 51.2, y: 282, z: -51} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1334852570} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &1168910114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1168910111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066e7c1ae754e3d4fb14b096095c5a8e, type: 3} + m_Name: + m_EditorClassIdentifier: + Cam: {fileID: 1168910112} + RT: {fileID: 8400000, guid: 3fffb8677da01ab4898dcc3e0fad9195, type: 2} +--- !u!114 &1168910115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1168910111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4975a6e437fc3b149a8cd508ce5bdd69, type: 3} + m_Name: + m_EditorClassIdentifier: + threshold: 0 + intensity: 0.75 + blurSize: 1 + blurIterations: 1 + blurType: 0 + fastBloomShader: {fileID: 4800000, guid: 68a00c837b82e4c6d92e7da765dc5f1d, type: 3} +--- !u!114 &1168910116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1168910111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 646b5bc27a658f447b1d929fd5ffbd70, type: 3} + m_Name: + m_EditorClassIdentifier: + mode: 3 + showGeneratedNormals: 0 + offsetScale: 0.2 + blurRadius: 18 + edgeThresholdMin: 0.05 + edgeThreshold: 0.2 + edgeSharpness: 4 + dlaaSharp: 0 + ssaaShader: {fileID: 4800000, guid: b3728d1488b02490cbd196c7941bf1f8, type: 3} + dlaaShader: {fileID: 4800000, guid: 017ca72b9e8a749058d13ebd527e98fa, type: 3} + nfaaShader: {fileID: 4800000, guid: ce0cb2621f6d84e21a87414e471a3cce, type: 3} + shaderFXAAPreset2: {fileID: 4800000, guid: 6f1418cffd12146f2a83be795f6fa5a7, type: 3} + shaderFXAAPreset3: {fileID: 4800000, guid: c182fa94a5a0a4c02870641efcd38cd5, type: 3} + shaderFXAAII: {fileID: 4800000, guid: cd5b323dcc592457790ff18b528f5e67, type: 3} + shaderFXAAIII: {fileID: 4800000, guid: c547503fff0e8482ea5793727057041c, type: 3} --- !u!1 &1171704399 GameObject: m_ObjectHideFlags: 0 @@ -77430,7 +77560,7 @@ Prefab: type: 2} propertyPath: m_Group value: - objectReference: {fileID: 1191281474} + objectReference: {fileID: 514662302} - target: {fileID: 1822058447359452, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_Name value: Toggle (3) @@ -84920,6 +85050,37 @@ RectTransform: m_AnchoredPosition: {x: 292.3, y: -39.24999} m_SizeDelta: {x: 262, y: 30} m_Pivot: {x: 0, y: 1} +--- !u!84 &1306081321 +RenderTexture: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_DepthFormat: 1 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1307749638 GameObject: m_ObjectHideFlags: 0 @@ -86571,6 +86732,8 @@ MonoBehaviour: WaterMaterial: {fileID: 2100000, guid: 9596d04246b657a43abb7394f3101040, type: 2} PostProcessing: {fileID: 11400000, guid: d407b6acfc327d34daa5764388b8cc33, type: 2} BloomOpt: {fileID: 436319624} + BloomOptPreview: {fileID: 1168910115} + PreviewRenderer: {fileID: 1168910114} Textures: - Albedo: {fileID: 0} Normal: {fileID: 0} @@ -86851,14 +87014,33 @@ MonoBehaviour: EnvCubemapsFile: [] AdditionalSkyboxData: Data: - BeginBytes: + Position: {x: 256, y: 0, z: 256} + Scale: {x: -35.45, y: 1171.581, z: 1256637} + SubdivisionsAxis: 16 + SubdivisionsHeight: 6 + Value3: 174.5082 + HorizoColor: {r: 0, g: 0, b: 0, a: 0} + ZenithColor: {r: 0, g: 0, b: 0, a: 0} + Value6: 0.1 Albedo: /textures/environment/Decal_test_Albedo001.dds Glow: /textures/environment/Decal_test_Glow001.dds - Length: 0 - MidBytes: - MidBytesStatic: + Planets: [] + MidRgbColor: + serializedVersion: 2 + rgba: 0 + Mid0: 1.8 + Mid1: 0.97 + Mid2: 0.97 + Mid3: 0.97 Clouds: /textures/environment/cirrus000.dds - EndBytes: + CloudsInt: 4 + Clouds1: {x: 0, y: 0, z: 0} + Clouds2: {x: 0, y: 0, z: 0} + Clouds3: {x: 0, y: 0, z: 0} + Clouds4: {x: 0, y: 0, z: 0} + Clouds5: {x: 0, y: 0, z: 0} + Clouds6: {x: 0, y: 0, z: 0} + Clouds7: {x: 0, y: 0, z: 0} TerrainTypeData: Layers: [] VersionMinor: 0 @@ -86904,14 +87086,33 @@ MonoBehaviour: UncompressedWatermapTex: {fileID: 0} UncompressedNormalmapTex: {fileID: 0} DefaultSkyboxData: - BeginBytes: 00000044000000000000004400002ac29b7212457bd9a03f1000000006000000e8c092433d0a263f3d0a523f3d0a573fac47613e84ebd13eeb51383fcdcccc3d + Position: {x: 256, y: 0, z: 256} + Scale: {x: -35.45, y: 1171.581, z: 1256637} + SubdivisionsAxis: 16 + SubdivisionsHeight: 6 + Value3: 174.5082 + HorizoColor: {r: 0, g: 0, b: 0, a: 0} + ZenithColor: {r: 0, g: 0, b: 0, a: 0} + Value6: 0.1 Albedo: /textures/environment/Decal_test_Albedo003.dds Glow: /textures/environment/Decal_test_Glow003.dds - Length: 9 - MidBytes: 4ae9084588af0e442c007fc461d9cabf0000374300003743000000000000003f0000003f0000003f0d752c4560474e4348d8ecc249f7e0bf00005c4200005c42000000000000003f0000003f0000003f40412c4547842144dea99f43000000000000b0410000b0410000003f000000000000003f0000003f7fb1e344cda3484436990e450000000000007041000070410000003f000000000000003f0000003fd7cd2d4580ed1144fff2e9430000000000002041000020410000003f000000000000003f0000003fe1c42f457088d3436b3fb943000000000000e0400000e0400000003f000000000000003f0000003f3aebc6c4e9599f430cc7ba440000000000002042000020420000003f000000000000003f0000003f980578c4d2b9e743c6fc98c40000000000009041000090410000003f000000000000003f0000003f705d29c4baaf8243383abac40000000000002041000020410000003f000000000000003f0000003f - MidBytesStatic: 0000006666e63fe17a943fe17a943fa4709d3f + Planets: [] + MidRgbColor: + serializedVersion: 2 + rgba: 0 + Mid0: 1.8 + Mid1: 0.97 + Mid2: 0.97 + Mid3: 0.97 Clouds: /textures/environment/cirrus000.dds - EndBytes: 0400000017b7d13817b7d1389999f940563add3e7fde66bfd27c843a30fb503b0ad7a33f0000803f00000000aaf3283ad27c843a000000005f31733f5bea9f3ee3a85c3b94b3c13bcdcc0c3f28e37f3f8306f33c00000000 + CloudsInt: 4 + Clouds1: {x: 0, y: 0, z: 0} + Clouds2: {x: 0, y: 0, z: 0} + Clouds3: {x: 0, y: 0, z: 0} + Clouds4: {x: 0, y: 0, z: 0} + Clouds5: {x: 0, y: 0, z: 0} + Clouds6: {x: 0, y: 0, z: 0} + Clouds7: {x: 0, y: 0, z: 0} Slope: 0 --- !u!114 &1334852569 MonoBehaviour: @@ -87106,6 +87307,7 @@ Transform: - {fileID: 1834432995} - {fileID: 504156400} - {fileID: 1408753504} + - {fileID: 1168910113} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -91819,7 +92021,7 @@ Prefab: - target: {fileID: 114733048155632102, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_Text - value: Center by angle (2 - 8) + value: Center by angle (2 - 16) objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b68527975f2edce489c9336fa9650c39, type: 2} @@ -93532,37 +93734,6 @@ RectTransform: m_AnchoredPosition: {x: 42.9, y: -36.7} m_SizeDelta: {x: 85.5, y: 28.4} m_Pivot: {x: 0.5, y: 0.5} ---- !u!84 &1424933682 -RenderTexture: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 256 - m_Height: 256 - m_AntiAliasing: 1 - m_DepthFormat: 1 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &1425656183 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecal.cs b/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecal.cs index fc7706e7..f1fb5c9d 100644 --- a/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecal.cs +++ b/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecal.cs @@ -128,6 +128,7 @@ public void Bake() _Dec.CutOffLOD = CutOffLOD; _Dec.NearCutOffLOD = NearCutOffLOD; _Dec.TexPathes = new string[2]; + _Dec.Shared.FixPaths(); _Dec.TexPathes[0] = _Dec.Shared.Tex1Path; _Dec.TexPathes[1] = _Dec.Shared.Tex2Path; _Dec.Obj = this; diff --git a/Assets/Scripts/HazardX SCMAP Code/DecalShared.cs b/Assets/Scripts/HazardX SCMAP Code/DecalShared.cs index 349848b1..35c4a659 100644 --- a/Assets/Scripts/HazardX SCMAP Code/DecalShared.cs +++ b/Assets/Scripts/HazardX SCMAP Code/DecalShared.cs @@ -70,6 +70,20 @@ public class DecalSharedSettings bool _Hidden; + public void FixPaths() + { + if (!Tex1Path.StartsWith("/")) + { + Tex1Path = Tex1Path.Replace("env", "/env"); + } + + if (!Tex2Path.StartsWith("/")) + { + Tex2Path = Tex2Path.Replace("env", "/env"); + } + + } + public bool Hidden { get diff --git a/Assets/Scripts/HazardX SCMAP Code/Map.cs b/Assets/Scripts/HazardX SCMAP Code/Map.cs index 20f77e62..5714e3b0 100644 --- a/Assets/Scripts/HazardX SCMAP Code/Map.cs +++ b/Assets/Scripts/HazardX SCMAP Code/Map.cs @@ -33,6 +33,7 @@ public class Map public GetGamedataFile.HeaderClass WatermapHeader; public Texture2D PreviewTex; + [HideInInspector] public short[] HeightmapData = new short[0]; public short HeightMin; public short HeightMax; @@ -46,10 +47,13 @@ public class Map public Texture2D NormalmapTex; public Texture2D WatermapTex; public Texture2D WaterDataTexture; - public byte[] WaterFoamMask = new byte[0]; - public byte[] WaterFlatnessMask = new byte[0]; + [HideInInspector] + public byte[] WaterFoamMask = new byte[0]; + [HideInInspector] + public byte[] WaterFlatnessMask = new byte[0]; - public byte[] WaterDepthBiasMask = new byte[0]; + [HideInInspector] + public byte[] WaterDepthBiasMask = new byte[0]; public int Width = 0; public int Height = 0; @@ -742,8 +746,8 @@ public bool Load(string Filename) fs.Dispose(); PreviewTextHeader = GetGamedataFile.GetDdsFormat(PreviewData); - PreviewTextHeader.Format = TextureFormat.RGBA32; - PreviewTex = TextureLoader.LoadTextureDXT(PreviewData, PreviewTextHeader); + PreviewTextHeader.Format = TextureFormat.BGRA32; + PreviewTex = TextureLoader.ConvertToRGBA(TextureLoader.LoadTextureDXT(PreviewData, PreviewTextHeader)); TextureMapHeader = GetGamedataFile.GetDdsFormat(TexturemapData); TextureMapHeader.Format = TextureFormat.BGRA32; @@ -926,14 +930,15 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(Unknown12); //? always 0 _with2.Write(Unknown13); - //? always 0 + //? always 0 //byte[] SaveData = new byte[0]; //SaveData = PreviewTex.GetRawTextureData(); //_with2.Write(SaveData.Length); //_with2.Write(SaveData); //Debug.Log(PreviewTex.GetRawTextureData().Length); - SaveTexture(_with2, PreviewTex, PreviewTextHeader); + TextureLoader.GetHeaderBGRA(PreviewTex, ref PreviewTextHeader); + SaveTexture(_with2, TextureLoader.ConvertToBGRA(PreviewTex), PreviewTextHeader); //_with2.Write(PreviewImageLength); //_with2.Write(PreviewData); //Debug.Log( _with2.BaseStream.Length ); @@ -991,12 +996,12 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(FogStart); _with2.Write(FogEnd); - Water.Save(Stream); + Water.Save(_with2); _with2.Write(WaveGenerators.Count); for (int i = 0; i < WaveGenerators.Count; i++) { - WaveGenerators[i].Save(Stream); + WaveGenerators[i].Save(_with2); } if (VersionMinor < 56) @@ -1006,9 +1011,9 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(6); for (int i = 0; i <= 4; i++) { - Layers[i].Save(Stream); + Layers[i].Save(_with2); } - Layers[Layers.Count - 1].Save(Stream); + Layers[Layers.Count - 1].Save(_with2); } else { @@ -1055,11 +1060,11 @@ public bool Save(string Filename, int MapFileVersion) for (int i = 0; i < Layers.Count; i++) { - Layers[i].SaveAlbedo(Stream); + Layers[i].SaveAlbedo(_with2); } for (int i = 0; i < Layers.Count - 1; i++) { - Layers[i].SaveNormal(Stream); + Layers[i].SaveNormal(_with2); } } @@ -1073,13 +1078,13 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(Decals.Count); for (int i = 0; i < Decals.Count; i++) { - Decals[i].Save(Stream, i); + Decals[i].Save(_with2, i); } _with2.Write(DecalGroups.Count); for (int i = 0; i < DecalGroups.Count; i++) { - DecalGroups[i].Save(Stream); + DecalGroups[i].Save(_with2); } _with2.Write(Width); @@ -1089,21 +1094,25 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(1); - SaveTexture(Stream, NormalmapTex, NormalmapHeader); + TextureLoader.GetHeaderDxt5(NormalmapTex, ref NormalmapHeader); + SaveTexture(_with2, NormalmapTex, NormalmapHeader); //Format.Dxt5 if (VersionMinor < 56) _with2.Write(1); - SaveTexture(Stream, TextureLoader.ConvertToBGRA(TexturemapTex), TextureMapHeader); + TextureLoader.GetHeaderBGRA(TexturemapTex, ref TextureMapHeader); + SaveTexture(_with2, TextureLoader.ConvertToBGRA(TexturemapTex), TextureMapHeader); if (VersionMinor >= 56) { - SaveTexture(Stream, TextureLoader.ConvertToBGRA(TexturemapTex2), TextureMap2Header); + TextureLoader.GetHeaderBGRA(TexturemapTex2, ref TextureMap2Header); + SaveTexture(_with2, TextureLoader.ConvertToBGRA(TexturemapTex2), TextureMap2Header); } _with2.Write(1); - SaveTexture(Stream, WatermapTex, WatermapHeader); + TextureLoader.GetHeaderDxt5(WatermapTex, ref WatermapHeader); + SaveTexture(_with2, WatermapTex, WatermapHeader); _with2.Write(WaterFoamMask); _with2.Write(WaterFlatnessMask); @@ -1123,7 +1132,7 @@ public bool Save(string Filename, int MapFileVersion) _with2.Write(Props.Count); for (int i = 0; i <= Props.Count - 1; i++) { - Props[i].Save(Stream); + Props[i].Save(_with2); } _with2.Close(); diff --git a/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs b/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs index c0463bc3..d21ac4a6 100644 --- a/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs +++ b/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs @@ -535,20 +535,29 @@ public void UpdateArea() if (bigestAreaRect.width > 0 && bigestAreaRect.height > 0) { + Shader.SetGlobalInt("_Area", 1); + Shader.SetGlobalVector("_AreaRect", new Vector4(bigestAreaRect.x / 10f, bigestAreaRect.y / 10f, bigestAreaRect.width / 10f, bigestAreaRect.height / 10f)); + + /* HeightmapControler.TerrainMaterial.SetInt("_Area", 1); HeightmapControler.TerrainMaterial.SetFloat("_AreaX", bigestAreaRect.x / 10f); HeightmapControler.TerrainMaterial.SetFloat("_AreaY", bigestAreaRect.y / 10f); HeightmapControler.TerrainMaterial.SetFloat("_AreaWidht", bigestAreaRect.width / 10f); HeightmapControler.TerrainMaterial.SetFloat("_AreaHeight", bigestAreaRect.height / 10f); + */ } else { - HeightmapControler.TerrainMaterial.SetInt("_Area", 0); + //HeightmapControler.TerrainMaterial.SetInt("_Area", 0); + Shader.SetGlobalInt("_Area", 0); } } else - HeightmapControler.TerrainMaterial.SetInt("_Area", 0); + { + Shader.SetGlobalInt("_Area", 0); + //HeightmapControler.TerrainMaterial.SetInt("_Area", 0); + } } #endregion diff --git a/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs b/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs index be3f54f1..a51356aa 100644 --- a/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs +++ b/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs @@ -24,6 +24,8 @@ public class ScmapEditor : MonoBehaviour public Material WaterMaterial; public PostProcessingProfile PostProcessing; public BloomOptimized BloomOpt; + public BloomOptimized BloomOptPreview; + public PreviewTex PreviewRenderer; [Header("Loaded variables")] public TerrainTexture[] Textures; // Loaded textures @@ -82,6 +84,7 @@ public void UpdateLighting() PostProcessing.bloom.settings = Bs; BloomOpt.intensity = map.Bloom; + BloomOptPreview.intensity = map.Bloom; RenderSettings.fogColor = new Color(map.FogColor.x, map.FogColor.y, map.FogColor.z, 1); RenderSettings.fogStartDistance = map.FogStart * 2; @@ -208,7 +211,7 @@ public IEnumerator LoadScmapFile() WaterLevel.transform.localScale = new Vector3(HalfxRes, 1, HalfzRes); TerrainMaterial.SetFloat("_GridScale", HalfxRes); TerrainMaterial.SetTexture("_UtilitySamplerC", map.UncompressedWatermapTex); - + WaterMaterial.SetFloat("_GridScale", HalfxRes); @@ -629,6 +632,9 @@ public void SaveScmapFile() map.NormalmapTex.Compress(true); map.NormalmapTex.Apply(); + map.PreviewTex = PreviewRenderer.RenderPreview(); + + for (int i = 0; i < map.Layers.Count; i++) { diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs new file mode 100644 index 00000000..0bd08cca --- /dev/null +++ b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PreviewTex : MonoBehaviour { + + public Camera Cam; + public RenderTexture RT; + + public Texture2D RenderPreview() { + + Vector3 CamPos = MapLuaParser.Current.MapCenterPoint; + float Size = Mathf.Max(ScmapEditor.Current.map.Width, ScmapEditor.Current.map.Height) * 0.1f; + float distance = Size * (2.0f * Mathf.Tan(0.5f * Cam.fieldOfView * Mathf.Deg2Rad)); + CamPos.y = distance * 2; + transform.position = CamPos; + + Cam.Render(); + + RenderTexture currentActiveRT = RenderTexture.active; + + RenderTexture.active = RT; + + Texture2D PreviewRender = new Texture2D(256, 256, TextureFormat.RGBA32, false); + PreviewRender.ReadPixels(new Rect(0, 0, PreviewRender.width, PreviewRender.height), 0, 0); + PreviewRender.Apply(); + + //Texture2D Preview = TextureLoader.ConvertToBGRA(PreviewRender); + //Graphics.ConvertTexture(PreviewRender, Preview); + + //Preview = TextureFlip.FlipTextureVertical(Preview, false); + //Preview.Compress(true); + //Preview.Apply(); + + RenderTexture.active = currentActiveRT; + + return TextureFlip.FlipTextureVertical(PreviewRender, false); + + } + +} diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs.meta b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs.meta new file mode 100644 index 00000000..c670cae8 --- /dev/null +++ b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTex.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 066e7c1ae754e3d4fb14b096095c5a8e +timeCreated: 1513836351 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture new file mode 100644 index 00000000..e1b6fd24 --- /dev/null +++ b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: PreviewTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_DepthFormat: 1 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture.meta b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture.meta new file mode 100644 index 00000000..0b3e1456 --- /dev/null +++ b/Assets/Scripts/Ozone SCMAP Code/Texture/PreviewTexture.renderTexture.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3fffb8677da01ab4898dcc3e0fad9195 +timeCreated: 1513835828 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/TextureLoader.cs b/Assets/Scripts/Ozone SCMAP Code/Texture/TextureLoader.cs index 716bb311..36f3c278 100644 --- a/Assets/Scripts/Ozone SCMAP Code/Texture/TextureLoader.cs +++ b/Assets/Scripts/Ozone SCMAP Code/Texture/TextureLoader.cs @@ -64,7 +64,87 @@ public static T[] Concat(this T[] x, T[] y) Array.Copy(y, 0, x, oldLen, y.Length); return x; } - + + public static void GetHeaderBGRA(Texture2D texture, ref GetGamedataFile.HeaderClass header) + { + header = new GetGamedataFile.HeaderClass(); + header.Format = TextureFormat.BGRA32; + header.Magic = 542327876; + header.size = 124; + header.flags = 4103; + header.width = (uint)texture.width; + header.height = (uint)texture.height; + + header.sizeorpitch = 0; + header.depth = 0; + header.mipmapcount = 0; + header.alphabitdepth = 0; + header.reserved0 = 0; + header.reserved1 = 0; + header.reserved2 = 0; + header.reserved3 = 0; + header.reserved4 = 0; + header.reserved5 = 0; + header.reserved6 = 0; + header.reserved7 = 0; + header.reserved8 = 0; + header.reserved9 = 0; + + + header.pixelformatSize = 32; + header.pixelformatflags = 65; + header.pixelformatFourcc = 0; + header.pixelformatRgbBitCount = 32; + header.pixelformatRbitMask = 16711680; + header.pixelformatGbitMask = 65280; + header.pixelformatBbitMask = 255; + header.pixelformatAbitMask = 4278190080; + header.caps1 = 4098; + header.caps2 = 0; + header.caps3 = 0; + header.caps4 = 0; + } + + public static void GetHeaderDxt5(Texture2D texture, ref GetGamedataFile.HeaderClass header) + { + header = new GetGamedataFile.HeaderClass(); + header.Format = TextureFormat.BGRA32; + header.Magic = 542327876; + header.size = 124; + header.flags = 4103; + header.width = (uint)texture.width; + header.height = (uint)texture.height; + + header.sizeorpitch = 0; + header.depth = 0; + header.mipmapcount = 0; + header.alphabitdepth = 0; + header.reserved0 = 0; + header.reserved1 = 0; + header.reserved2 = 0; + header.reserved3 = 0; + header.reserved4 = 0; + header.reserved5 = 0; + header.reserved6 = 0; + header.reserved7 = 0; + header.reserved8 = 0; + header.reserved9 = 0; + + + header.pixelformatSize = 32; + header.pixelformatflags = 4; + header.pixelformatFourcc = 894720068; + header.pixelformatRgbBitCount = 0; + header.pixelformatRbitMask = 0; + header.pixelformatGbitMask = 0; + header.pixelformatBbitMask = 0; + header.pixelformatAbitMask = 0; + header.caps1 = 4098; + header.caps2 = 0; + header.caps3 = 0; + header.caps4 = 0; + } + const uint dwReserved2 = 0; public static byte[] SaveTextureDDS(Texture2D texture, GetGamedataFile.HeaderClass header) { diff --git a/FAForeverMapEditor.Editor.Plugins.csproj b/FAForeverMapEditor.Editor.Plugins.csproj index 2383e701..987de9d1 100644 --- a/FAForeverMapEditor.Editor.Plugins.csproj +++ b/FAForeverMapEditor.Editor.Plugins.csproj @@ -27,7 +27,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -37,7 +37,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -251,9 +251,6 @@ Library\UnityAssemblies\UnityEditor.Graphs.dll - - Library\UnityAssemblies\UnityEditor.WSA.Extensions.dll - Library\UnityAssemblies\UnityEditor.WindowsStandalone.Extensions.dll diff --git a/FAForeverMapEditor.Editor.csproj b/FAForeverMapEditor.Editor.csproj index 6807ba41..962f90d0 100644 --- a/FAForeverMapEditor.Editor.csproj +++ b/FAForeverMapEditor.Editor.csproj @@ -27,7 +27,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -37,7 +37,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -251,9 +251,6 @@ Library\UnityAssemblies\UnityEditor.Graphs.dll - - Library\UnityAssemblies\UnityEditor.WSA.Extensions.dll - Library\UnityAssemblies\UnityEditor.WindowsStandalone.Extensions.dll diff --git a/FAForeverMapEditor.Plugins.csproj b/FAForeverMapEditor.Plugins.csproj index b5fa6549..262b6741 100644 --- a/FAForeverMapEditor.Plugins.csproj +++ b/FAForeverMapEditor.Plugins.csproj @@ -27,7 +27,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -37,7 +37,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -251,9 +251,6 @@ Library\UnityAssemblies\UnityEditor.Graphs.dll - - Library\UnityAssemblies\UnityEditor.WSA.Extensions.dll - Library\UnityAssemblies\UnityEditor.WindowsStandalone.Extensions.dll diff --git a/FAForeverMapEditor.csproj b/FAForeverMapEditor.csproj index 79278f42..8c8f867b 100644 --- a/FAForeverMapEditor.csproj +++ b/FAForeverMapEditor.csproj @@ -27,7 +27,7 @@ Temp\UnityVS_obj\Debug\ prompt 4 - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -37,7 +37,7 @@ Temp\UnityVS_obj\Release\ prompt 4 - TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS + TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_3_0;UNITY_2017_3;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_3D;USE_KOPILUA;LUA_CORE;CATCH_EXCEPTIONS true @@ -251,9 +251,6 @@ Library\UnityAssemblies\UnityEditor.Graphs.dll - - Library\UnityAssemblies\UnityEditor.WSA.Extensions.dll - Library\UnityAssemblies\UnityEditor.WindowsStandalone.Extensions.dll @@ -487,6 +484,7 @@ +