Skip to content

Commit

Permalink
- PlayerNametag see trough wall
Browse files Browse the repository at this point in the history
- Improved lobby name
- Fixed incorrect spawn height
  • Loading branch information
tddebart committed Aug 20, 2022
1 parent dec7bc8 commit e32bf39
Show file tree
Hide file tree
Showing 26 changed files with 3,972 additions and 373 deletions.
166 changes: 164 additions & 2 deletions Assets/Resources/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,164 @@ Transform:
m_Father: {fileID: 1974891805155746924}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &382406983
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 382406984}
- component: {fileID: 382406987}
- component: {fileID: 382406986}
- component: {fileID: 382406985}
m_Layer: 6
m_Name: PlayerNameText2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &382406984
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382406983}
m_LocalRotation: {x: -0.00000034272668, y: -0.0000031590457, z: 0.000004418194,
w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4877246073613377794}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6.515, y: -1.355}
m_SizeDelta: {x: 13.03, y: 2.71}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &382406987
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382406983}
m_CullTransparentMesh: 1
--- !u!114 &382406986
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382406983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: PlayerName
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 849e4e2334f18d4438edfea0d82bffd8, type: 2}
m_sharedMaterial: {fileID: 2668486001110959845, guid: 849e4e2334f18d4438edfea0d82bffd8,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4286611584
m_fontColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 2.25
m_fontSizeBase: 2.25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0.1, y: 0, z: 0.1, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &382406985
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382406983}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &536713584
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -666,7 +824,7 @@ Transform:
- {fileID: 2846606199269335864}
- {fileID: 6448342363989211736}
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1296084350405261150
MonoBehaviour:
Expand Down Expand Up @@ -859,6 +1017,8 @@ MonoBehaviour:
rightLeg: {fileID: 5623107104222771477}
moveDirection: {fileID: 536713585}
playerName: {fileID: 5545412619372361996}
playerName2: {fileID: 382406986}
playerNameBackground: {fileID: 1304933527569301905}
--- !u!95 &1296084350405261149
Animator:
serializedVersion: 4
Expand Down Expand Up @@ -1430,6 +1590,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand Down Expand Up @@ -1507,6 +1668,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5545412619372362012}
- {fileID: 382406984}
m_Father: {fileID: 2846606199269335864}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1535,7 +1697,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: 963506e2c180d7344999f65e768191fa, type: 2}
m_Color: {r: 0.1, g: 0.1, b: 0.1, a: 0.69803923}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
Expand Down
18 changes: 9 additions & 9 deletions Assets/Scenes/MainMenu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -3614,7 +3614,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -152.5, y: 1527107.2}
m_AnchoredPosition: {x: -152.5, y: 73135.625}
m_SizeDelta: {x: 305, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &845042230
Expand Down Expand Up @@ -6177,7 +6177,7 @@ Transform:
m_GameObject: {fileID: 1245943067}
m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0, z: 1}
m_LocalScale: {x: 5, y: 1, z: 5}
m_LocalScale: {x: 15, y: 1, z: 15}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
Expand Down Expand Up @@ -8236,7 +8236,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1663647218}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 100, y: 100, z: 100}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -8336,7 +8336,7 @@ Transform:
m_GameObject: {fileID: 1667243417}
m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0, z: 1}
m_LocalScale: {x: 5, y: 1, z: 5}
m_LocalScale: {x: 15, y: 1, z: 15}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
Expand Down Expand Up @@ -8763,7 +8763,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -152.5, y: 1409699.1}
m_AnchoredPosition: {x: -152.5, y: 1561417.8}
m_SizeDelta: {x: 305, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1737316053
Expand Down Expand Up @@ -10605,7 +10605,7 @@ PrefabInstance:
type: 3}
propertyPath: transport
value:
objectReference: {fileID: 2330286423484457793}
objectReference: {fileID: 2330286423484457794}
- target: {fileID: 2330286422166840741, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
type: 3}
propertyPath: m_Enabled
Expand All @@ -10620,16 +10620,16 @@ PrefabInstance:
- {fileID: 2330286422166840739, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
m_AddedGameObjects: []
m_SourcePrefab: {fileID: 100100000, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
--- !u!114 &2330286423484457793 stripped
--- !u!114 &2330286423484457794 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2330286422166840742, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
m_CorrespondingSourceObject: {fileID: 2330286422166840743, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
type: 3}
m_PrefabInstance: {fileID: 2330286423484457790}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61b93ff779f4ef84da855aef42076949, type: 3}
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4834870413912905276
Expand Down
77 changes: 77 additions & 0 deletions Assets/Shaders/NoZwrite.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)

Shader "NoZwrite"
{
Properties
{
_Color ("Tint", Color) = (1,1,1,1)
_doZWrite ("Do Z write", Range(0,6)) = 6
}

SubShader
{
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}

Cull Off
Lighting Off
Blend SrcAlpha OneMinusSrcAlpha

Pass
{
ZWrite off
ZTest [_doZWrite]
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0

#include "UnityCG.cginc"

#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP

struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
};

struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float4 worldPosition : TEXCOORD1;
};

fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
float4 _MainTex_ST;

v2f vert(appdata_t v)
{
v2f OUT;
OUT.worldPosition = v.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);

OUT.color = v.color * _Color;
return OUT;
}

fixed4 frag(v2f IN) : SV_Target
{
half4 color = IN.color;

return color;
}
ENDCG
}
}
}
3 changes: 3 additions & 0 deletions Assets/Shaders/NoZwrite.shader.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e32bf39

Please sign in to comment.