Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-24 23:37:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

king lobby stubbed & fixed clipping issue

Browse Source
This commit is contained in:
Melbyj1125 2022-03-09 15:00:01 -06:00
parent 7ae4b643a1
commit f8fc2da95d
10 changed files with 748 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Lobby/LobbyPlayerCard.prefab
View File

@ -276,7 +276,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 6621380958853746498, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3}
m_Sprite: {fileID: 8953198066205750476, guid: 827eb2c03f1391542975f74191d7c32f, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

835
Assets/Prefabs/Lobby/LobbyUI.prefab
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs
View File

@ -16,7 +16,6 @@ public class MoveRagdollState : MoveBaseState
mSM.capCol.enabled = true; // enable capsule collider
mSM.moveController.enabled = false; // disable move controller
mSM.rB.isKinematic = false; // disable kinematic
mSM.rB.detectCollisions = true; // detect collisions
//apply force
mSM.rB.AddForce(mSM.dirHit, ForceMode.Impulse);

1
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRecoveringState.cs
View File

@ -11,7 +11,6 @@ public class MoveRecoveringState : MoveBaseState
mSM.capCol.enabled = false; // disable capsule collider
mSM.moveController.enabled = true; // enable move controller
mSM.rB.isKinematic = true; // enable kinematic
mSM.rB.detectCollisions = false; // detect collisions false
mSM.CancelMomentum(); // reset player variables
mSM.moveController.Move(new Vector3(0,2,0));
}

29
Assets/Scripts/UI/Lobby/LobbySwap.cs Normal file
View File

@ -0,0 +1,29 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class LobbySwap : MonoBehaviour
{
GameObject playerLobby;
GameObject kingLobby;
// Start is called before the first frame update
void Start()
{
playerLobby = GameObject.Find("PlayerLobby");
kingLobby = GameObject.Find("KingLobby");
kingLobby.SetActive(false);
}
public void SwapLobby(){
if(playerLobby.active){
kingLobby.SetActive(true);
playerLobby.SetActive(false);
}
else{
playerLobby.SetActive(true);
kingLobby.SetActive(false);
}
}
}

11
Assets/Scripts/UI/Lobby/LobbySwap.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e0ba335dd24406440bdb8aefabd610b1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scripts/UI/Lobby/Tooltip.cs
View File

@ -14,11 +14,11 @@ public class Tooltip : MonoBehaviour
}
public void ShowTooltip(string curTooltip){
gameObject.SetActive(true);
this.gameObject.SetActive(true);
tooltipText.text = curTooltip;
}
public void HideTooltip(){
gameObject.SetActive(false);
this.gameObject.SetActive(false);
}
}

BIN
Assets/Sprites/Lobby/KR-UIPaper-CamO.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 MiB

252
Assets/Sprites/Lobby/KR-UIPaper-CamO.png.meta Normal file
View File

@ -0,0 +1,252 @@
fileFormatVersion: 2
guid: 827eb2c03f1391542975f74191d7c32f
TextureImporter:
internalIDToNameTable:
- first:
213: -4961362372881410234
second: KR-UIPaper-CamO_0
- first:
213: -7878662621293769924
second: KR-UIPaper-CamO_1
- first:
213: 8953198066205750476
second: KR-UIPaper-CamO_2
- first:
213: -6103285600961616840
second: KR-UIPaper-CamO_3
- first:
213: -8487237290780451639
second: KR-UIPaper-CamO_4
- first:
213: -8077703910084242262
second: KR-UIPaper-CamO_5
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: KR-UIPaper-CamO_0
rect:
serializedVersion: 2
x: 5460
y: 200
width: 1600
height: 1200
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6471a625533b52bb0800000000000000
internalID: -4961362372881410234
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: KR-UIPaper-CamO_1
rect:
serializedVersion: 2
x: 7032
y: 200
width: 1600
height: 1200
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c3b03a0c61e59a290800000000000000
internalID: -7878662621293769924
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: KR-UIPaper-CamO_2
rect:
serializedVersion: 2
x: 8514
y: 200
width: 1600
height: 1200
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cc478e38436204c70800000000000000
internalID: 8953198066205750476
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: KR-UIPaper-CamO_3
rect:
serializedVersion: 2
x: 5160
y: 3200
width: 5000
height: 3400
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8342def1516cc4ba0800000000000000
internalID: -6103285600961616840
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: KR-UIPaper-CamO_4
rect:
serializedVersion: 2
x: 5160
y: 1517
width: 5000
height: 1600
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9cc159eb6a6473a80800000000000000
internalID: -8487237290780451639
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: KR-UIPaper-CamO_5
rect:
serializedVersion: 2
x: 60
y: 170
width: 5000
height: 6500
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: aa415ae571b36ef80800000000000000
internalID: -8077703910084242262
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 1c6b5603df0255f4889d9dbd49600e39
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

18
UserSettings/EditorUserSettings.asset
View File

@ -12,29 +12,29 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-4:
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-8:
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0