diff --git a/Assets/Materials/3DTextOrange.mat b/Assets/Materials/3DTextOrange.mat new file mode 100644 index 0000000000..1ab5c86473 Binary files /dev/null and b/Assets/Materials/3DTextOrange.mat differ diff --git a/Assets/Materials/3DTextOrange.mat.meta b/Assets/Materials/3DTextOrange.mat.meta new file mode 100644 index 0000000000..62301ae6ff --- /dev/null +++ b/Assets/Materials/3DTextOrange.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da773db9af58b1b44a8d189b08675cf3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/3DTextWhite.mat b/Assets/Materials/3DTextWhite.mat new file mode 100644 index 0000000000..2a067003fe Binary files /dev/null and b/Assets/Materials/3DTextWhite.mat differ diff --git a/Assets/Materials/3DTextWhite.mat.meta b/Assets/Materials/3DTextWhite.mat.meta new file mode 100644 index 0000000000..1b9cc9451c --- /dev/null +++ b/Assets/Materials/3DTextWhite.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e59e26c782b3e648a1fec0e16928ba4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab index ff5c38b177..a2ab00fcc8 100644 Binary files a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab and b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab differ diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab index ea88a12354..5f418410f1 100644 Binary files a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab and b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab differ diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab index 08d219e114..baaaa0fee6 100644 Binary files a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab and b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials.meta new file mode 100644 index 0000000000..a42e2908cb --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c93648a42d194454e930d7fa148e164f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat new file mode 100644 index 0000000000..887209ea05 Binary files /dev/null and b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat.meta new file mode 100644 index 0000000000..475492b44d --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11c2fccf55a670d44a90c80c61be07b2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat new file mode 100644 index 0000000000..31574d018b Binary files /dev/null and b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat.meta new file mode 100644 index 0000000000..eec082746a --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6b4ee4d61736864594ba7d64a3d72bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials.meta new file mode 100644 index 0000000000..5f5a99a68b --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3149cf6127f06b49a3db22b05b8b48a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat new file mode 100644 index 0000000000..913f418a76 Binary files /dev/null and b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat.meta new file mode 100644 index 0000000000..2e412a413f --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd866d05d110cbc4d835b05483d6b706 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials.meta new file mode 100644 index 0000000000..a6c3bd8f40 --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afa2a0a7261ede8438c7a6b0a60dced9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat new file mode 100644 index 0000000000..d3e099977f Binary files /dev/null and b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat.meta new file mode 100644 index 0000000000..01212ed4e7 --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2272b219cb795614188006eaa5b65ecc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials.meta new file mode 100644 index 0000000000..3325dab5d9 --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e145d7096e6ffca44b62a104192476ae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat new file mode 100644 index 0000000000..24a404a395 Binary files /dev/null and b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat differ diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat.meta new file mode 100644 index 0000000000..351e7da6df --- /dev/null +++ b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 743e8de4a8c4c5e43a7303dc2dc3925a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/View/Ship/GenericShip.cs b/Assets/Scripts/View/Ship/GenericShip.cs index 56033ec067..fe535ba713 100644 --- a/Assets/Scripts/View/Ship/GenericShip.cs +++ b/Assets/Scripts/View/Ship/GenericShip.cs @@ -165,7 +165,7 @@ public void SetShipBaseImageSecondEdition() //Ship Info newTexture = "ShipStandInsert/Universal/SecondEdition/" + this.ShipInfo.BaseSize.ToString() + "/" + this.Faction.ToString() + "/Info"; newMaterial = CreateMaterial(newTexture); - StandardShaderUtils.ChangeRenderMode(newMaterial, StandardShaderUtils.BlendMode.Fade); + StandardShaderUtils.ChangeRenderMode(newMaterial, StandardShaderUtils.BlendMode.Cutout); shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent().material = newMaterial; shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent().shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off; shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent().enabled = true; diff --git a/Assets/Shaders/3DTextOneSided.shader b/Assets/Shaders/3DTextOneSided.shader new file mode 100644 index 0000000000..186c343d67 --- /dev/null +++ b/Assets/Shaders/3DTextOneSided.shader @@ -0,0 +1,18 @@ +Shader "Custom/3D Text One Sided" { + Properties { + _MainTex ("Font Texture", 2D) = "white" {} + _Color ("Text Color", Color) = (1,1,1,1) + } + + SubShader { + Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" } + Lighting Off Cull Back ZWrite Off Fog { Mode Off } + Blend SrcAlpha OneMinusSrcAlpha + Pass { + Color [_Color] + SetTexture [_MainTex] { + combine primary, texture * primary + } + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/3DTextOneSided.shader.meta b/Assets/Shaders/3DTextOneSided.shader.meta new file mode 100644 index 0000000000..f00629854a --- /dev/null +++ b/Assets/Shaders/3DTextOneSided.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1cbcc2e908754414790b5e05a33e601f +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index c40a8fa93f..46f33f104f 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 50d66c572c..8fd5fbc38a 100644 Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ