Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

Commit e32bf39

Browse files
committed
- PlayerNametag see trough wall
- Improved lobby name - Fixed incorrect spawn height
1 parent dec7bc8 commit e32bf39

26 files changed

+3972
-373
lines changed

Assets/Resources/Prefabs/Player.prefab

Lines changed: 164 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,164 @@ Transform:
115115
m_Father: {fileID: 1974891805155746924}
116116
m_RootOrder: 5
117117
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
118+
--- !u!1 &382406983
119+
GameObject:
120+
m_ObjectHideFlags: 0
121+
m_CorrespondingSourceObject: {fileID: 0}
122+
m_PrefabInstance: {fileID: 0}
123+
m_PrefabAsset: {fileID: 0}
124+
serializedVersion: 6
125+
m_Component:
126+
- component: {fileID: 382406984}
127+
- component: {fileID: 382406987}
128+
- component: {fileID: 382406986}
129+
- component: {fileID: 382406985}
130+
m_Layer: 6
131+
m_Name: PlayerNameText2
132+
m_TagString: Untagged
133+
m_Icon: {fileID: 0}
134+
m_NavMeshLayer: 0
135+
m_StaticEditorFlags: 0
136+
m_IsActive: 1
137+
--- !u!224 &382406984
138+
RectTransform:
139+
m_ObjectHideFlags: 0
140+
m_CorrespondingSourceObject: {fileID: 0}
141+
m_PrefabInstance: {fileID: 0}
142+
m_PrefabAsset: {fileID: 0}
143+
m_GameObject: {fileID: 382406983}
144+
m_LocalRotation: {x: -0.00000034272668, y: -0.0000031590457, z: 0.000004418194,
145+
w: 1}
146+
m_LocalPosition: {x: 0, y: 0, z: 0}
147+
m_LocalScale: {x: 1, y: 1, z: 1}
148+
m_ConstrainProportionsScale: 0
149+
m_Children: []
150+
m_Father: {fileID: 4877246073613377794}
151+
m_RootOrder: 0
152+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
153+
m_AnchorMin: {x: 0, y: 1}
154+
m_AnchorMax: {x: 0, y: 1}
155+
m_AnchoredPosition: {x: 6.515, y: -1.355}
156+
m_SizeDelta: {x: 13.03, y: 2.71}
157+
m_Pivot: {x: 0.5, y: 0.5}
158+
--- !u!222 &382406987
159+
CanvasRenderer:
160+
m_ObjectHideFlags: 0
161+
m_CorrespondingSourceObject: {fileID: 0}
162+
m_PrefabInstance: {fileID: 0}
163+
m_PrefabAsset: {fileID: 0}
164+
m_GameObject: {fileID: 382406983}
165+
m_CullTransparentMesh: 1
166+
--- !u!114 &382406986
167+
MonoBehaviour:
168+
m_ObjectHideFlags: 0
169+
m_CorrespondingSourceObject: {fileID: 0}
170+
m_PrefabInstance: {fileID: 0}
171+
m_PrefabAsset: {fileID: 0}
172+
m_GameObject: {fileID: 382406983}
173+
m_Enabled: 1
174+
m_EditorHideFlags: 0
175+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
176+
m_Name:
177+
m_EditorClassIdentifier:
178+
m_Material: {fileID: 0}
179+
m_Color: {r: 1, g: 1, b: 1, a: 1}
180+
m_RaycastTarget: 0
181+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
182+
m_Maskable: 1
183+
m_OnCullStateChanged:
184+
m_PersistentCalls:
185+
m_Calls: []
186+
m_text: PlayerName
187+
m_isRightToLeft: 0
188+
m_fontAsset: {fileID: 11400000, guid: 849e4e2334f18d4438edfea0d82bffd8, type: 2}
189+
m_sharedMaterial: {fileID: 2668486001110959845, guid: 849e4e2334f18d4438edfea0d82bffd8,
190+
type: 2}
191+
m_fontSharedMaterials: []
192+
m_fontMaterial: {fileID: 0}
193+
m_fontMaterials: []
194+
m_fontColor32:
195+
serializedVersion: 2
196+
rgba: 4286611584
197+
m_fontColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
198+
m_enableVertexGradient: 0
199+
m_colorMode: 3
200+
m_fontColorGradient:
201+
topLeft: {r: 1, g: 1, b: 1, a: 1}
202+
topRight: {r: 1, g: 1, b: 1, a: 1}
203+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
204+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
205+
m_fontColorGradientPreset: {fileID: 0}
206+
m_spriteAsset: {fileID: 0}
207+
m_tintAllSprites: 0
208+
m_StyleSheet: {fileID: 0}
209+
m_TextStyleHashCode: -1183493901
210+
m_overrideHtmlColors: 0
211+
m_faceColor:
212+
serializedVersion: 2
213+
rgba: 4294967295
214+
m_fontSize: 2.25
215+
m_fontSizeBase: 2.25
216+
m_fontWeight: 400
217+
m_enableAutoSizing: 0
218+
m_fontSizeMin: 18
219+
m_fontSizeMax: 72
220+
m_fontStyle: 0
221+
m_HorizontalAlignment: 4
222+
m_VerticalAlignment: 256
223+
m_textAlignment: 65535
224+
m_characterSpacing: 0
225+
m_wordSpacing: 0
226+
m_lineSpacing: 0
227+
m_lineSpacingMax: 0
228+
m_paragraphSpacing: 0
229+
m_charWidthMaxAdj: 0
230+
m_enableWordWrapping: 1
231+
m_wordWrappingRatios: 0.4
232+
m_overflowMode: 0
233+
m_linkedTextComponent: {fileID: 0}
234+
parentLinkedComponent: {fileID: 0}
235+
m_enableKerning: 1
236+
m_enableExtraPadding: 0
237+
checkPaddingRequired: 0
238+
m_isRichText: 1
239+
m_parseCtrlCharacters: 1
240+
m_isOrthographic: 1
241+
m_isCullingEnabled: 0
242+
m_horizontalMapping: 0
243+
m_verticalMapping: 0
244+
m_uvLineOffset: 0
245+
m_geometrySortingOrder: 0
246+
m_IsTextObjectScaleStatic: 0
247+
m_VertexBufferAutoSizeReduction: 0
248+
m_useMaxVisibleDescender: 1
249+
m_pageToDisplay: 1
250+
m_margin: {x: 0.1, y: 0, z: 0.1, w: 0}
251+
m_isUsingLegacyAnimationComponent: 0
252+
m_isVolumetricText: 0
253+
m_hasFontAssetChanged: 0
254+
m_baseMaterial: {fileID: 0}
255+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
256+
--- !u!114 &382406985
257+
MonoBehaviour:
258+
m_ObjectHideFlags: 0
259+
m_CorrespondingSourceObject: {fileID: 0}
260+
m_PrefabInstance: {fileID: 0}
261+
m_PrefabAsset: {fileID: 0}
262+
m_GameObject: {fileID: 382406983}
263+
m_Enabled: 1
264+
m_EditorHideFlags: 0
265+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
266+
m_Name:
267+
m_EditorClassIdentifier:
268+
m_IgnoreLayout: 1
269+
m_MinWidth: -1
270+
m_MinHeight: -1
271+
m_PreferredWidth: -1
272+
m_PreferredHeight: -1
273+
m_FlexibleWidth: -1
274+
m_FlexibleHeight: -1
275+
m_LayoutPriority: 1
118276
--- !u!1 &536713584
119277
GameObject:
120278
m_ObjectHideFlags: 0
@@ -666,7 +824,7 @@ Transform:
666824
- {fileID: 2846606199269335864}
667825
- {fileID: 6448342363989211736}
668826
m_Father: {fileID: 0}
669-
m_RootOrder: 0
827+
m_RootOrder: 17
670828
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
671829
--- !u!114 &1296084350405261150
672830
MonoBehaviour:
@@ -859,6 +1017,8 @@ MonoBehaviour:
8591017
rightLeg: {fileID: 5623107104222771477}
8601018
moveDirection: {fileID: 536713585}
8611019
playerName: {fileID: 5545412619372361996}
1020+
playerName2: {fileID: 382406986}
1021+
playerNameBackground: {fileID: 1304933527569301905}
8621022
--- !u!95 &1296084350405261149
8631023
Animator:
8641024
serializedVersion: 4
@@ -1430,6 +1590,7 @@ Canvas:
14301590
m_OverridePixelPerfect: 0
14311591
m_SortingBucketNormalizedSize: 0
14321592
m_AdditionalShaderChannelsFlag: 25
1593+
m_UpdateRectTransformForStandalone: 0
14331594
m_SortingLayerID: 0
14341595
m_SortingOrder: 0
14351596
m_TargetDisplay: 0
@@ -1507,6 +1668,7 @@ RectTransform:
15071668
m_ConstrainProportionsScale: 0
15081669
m_Children:
15091670
- {fileID: 5545412619372362012}
1671+
- {fileID: 382406984}
15101672
m_Father: {fileID: 2846606199269335864}
15111673
m_RootOrder: 0
15121674
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1535,7 +1697,7 @@ MonoBehaviour:
15351697
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
15361698
m_Name:
15371699
m_EditorClassIdentifier:
1538-
m_Material: {fileID: 0}
1700+
m_Material: {fileID: 2100000, guid: 963506e2c180d7344999f65e768191fa, type: 2}
15391701
m_Color: {r: 0.1, g: 0.1, b: 0.1, a: 0.69803923}
15401702
m_RaycastTarget: 1
15411703
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

Assets/Scenes/MainMenu.unity

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3614,7 +3614,7 @@ RectTransform:
36143614
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36153615
m_AnchorMin: {x: 0.5, y: 1}
36163616
m_AnchorMax: {x: 0.5, y: 1}
3617-
m_AnchoredPosition: {x: -152.5, y: 1527107.2}
3617+
m_AnchoredPosition: {x: -152.5, y: 73135.625}
36183618
m_SizeDelta: {x: 305, y: 0}
36193619
m_Pivot: {x: 0, y: 1}
36203620
--- !u!114 &845042230
@@ -6177,7 +6177,7 @@ Transform:
61776177
m_GameObject: {fileID: 1245943067}
61786178
m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071068}
61796179
m_LocalPosition: {x: 0, y: -0, z: 1}
6180-
m_LocalScale: {x: 5, y: 1, z: 5}
6180+
m_LocalScale: {x: 15, y: 1, z: 15}
61816181
m_ConstrainProportionsScale: 0
61826182
m_Children: []
61836183
m_Father: {fileID: 0}
@@ -8236,7 +8236,7 @@ Transform:
82368236
m_PrefabAsset: {fileID: 0}
82378237
m_GameObject: {fileID: 1663647218}
82388238
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
8239-
m_LocalPosition: {x: 0, y: 0, z: 0}
8239+
m_LocalPosition: {x: 0, y: 1, z: -10}
82408240
m_LocalScale: {x: 100, y: 100, z: 100}
82418241
m_ConstrainProportionsScale: 0
82428242
m_Children:
@@ -8336,7 +8336,7 @@ Transform:
83368336
m_GameObject: {fileID: 1667243417}
83378337
m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071068}
83388338
m_LocalPosition: {x: 0, y: -0, z: 1}
8339-
m_LocalScale: {x: 5, y: 1, z: 5}
8339+
m_LocalScale: {x: 15, y: 1, z: 15}
83408340
m_ConstrainProportionsScale: 0
83418341
m_Children: []
83428342
m_Father: {fileID: 0}
@@ -8763,7 +8763,7 @@ RectTransform:
87638763
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
87648764
m_AnchorMin: {x: 0.5, y: 1}
87658765
m_AnchorMax: {x: 0.5, y: 1}
8766-
m_AnchoredPosition: {x: -152.5, y: 1409699.1}
8766+
m_AnchoredPosition: {x: -152.5, y: 1561417.8}
87678767
m_SizeDelta: {x: 305, y: 0}
87688768
m_Pivot: {x: 0, y: 1}
87698769
--- !u!114 &1737316053
@@ -10605,7 +10605,7 @@ PrefabInstance:
1060510605
type: 3}
1060610606
propertyPath: transport
1060710607
value:
10608-
objectReference: {fileID: 2330286423484457793}
10608+
objectReference: {fileID: 2330286423484457794}
1060910609
- target: {fileID: 2330286422166840741, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
1061010610
type: 3}
1061110611
propertyPath: m_Enabled
@@ -10620,16 +10620,16 @@ PrefabInstance:
1062010620
- {fileID: 2330286422166840739, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
1062110621
m_AddedGameObjects: []
1062210622
m_SourcePrefab: {fileID: 100100000, guid: ed098faebcb7c0a46a1b8cbc9753bb43, type: 3}
10623-
--- !u!114 &2330286423484457793 stripped
10623+
--- !u!114 &2330286423484457794 stripped
1062410624
MonoBehaviour:
10625-
m_CorrespondingSourceObject: {fileID: 2330286422166840742, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
10625+
m_CorrespondingSourceObject: {fileID: 2330286422166840743, guid: ed098faebcb7c0a46a1b8cbc9753bb43,
1062610626
type: 3}
1062710627
m_PrefabInstance: {fileID: 2330286423484457790}
1062810628
m_PrefabAsset: {fileID: 0}
1062910629
m_GameObject: {fileID: 0}
1063010630
m_Enabled: 1
1063110631
m_EditorHideFlags: 0
10632-
m_Script: {fileID: 11500000, guid: 61b93ff779f4ef84da855aef42076949, type: 3}
10632+
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
1063310633
m_Name:
1063410634
m_EditorClassIdentifier:
1063510635
--- !u!224 &4834870413912905276

Assets/Shaders/NoZwrite.shader

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
2+
3+
Shader "NoZwrite"
4+
{
5+
Properties
6+
{
7+
_Color ("Tint", Color) = (1,1,1,1)
8+
_doZWrite ("Do Z write", Range(0,6)) = 6
9+
}
10+
11+
SubShader
12+
{
13+
Tags
14+
{
15+
"Queue"="Transparent"
16+
"IgnoreProjector"="True"
17+
"RenderType"="Transparent"
18+
"PreviewType"="Plane"
19+
"CanUseSpriteAtlas"="True"
20+
}
21+
22+
Cull Off
23+
Lighting Off
24+
Blend SrcAlpha OneMinusSrcAlpha
25+
26+
Pass
27+
{
28+
ZWrite off
29+
ZTest [_doZWrite]
30+
CGPROGRAM
31+
#pragma vertex vert
32+
#pragma fragment frag
33+
#pragma target 2.0
34+
35+
#include "UnityCG.cginc"
36+
37+
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
38+
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
39+
40+
struct appdata_t
41+
{
42+
float4 vertex : POSITION;
43+
float4 color : COLOR;
44+
};
45+
46+
struct v2f
47+
{
48+
float4 vertex : SV_POSITION;
49+
fixed4 color : COLOR;
50+
float4 worldPosition : TEXCOORD1;
51+
};
52+
53+
fixed4 _Color;
54+
fixed4 _TextureSampleAdd;
55+
float4 _ClipRect;
56+
float4 _MainTex_ST;
57+
58+
v2f vert(appdata_t v)
59+
{
60+
v2f OUT;
61+
OUT.worldPosition = v.vertex;
62+
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
63+
64+
OUT.color = v.color * _Color;
65+
return OUT;
66+
}
67+
68+
fixed4 frag(v2f IN) : SV_Target
69+
{
70+
half4 color = IN.color;
71+
72+
return color;
73+
}
74+
ENDCG
75+
}
76+
}
77+
}

Assets/Shaders/NoZwrite.shader.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)