Show current Item

This commit is contained in:
brausjonas
2023-03-31 20:58:20 +02:00
parent 0b1be485d5
commit 5cbb59e60c
9 changed files with 1522 additions and 175 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

@@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 5307f3fc4b4d60c4aabb937ffab2a546
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
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
- serializedVersion: 3
buildTarget: Server
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: Android
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: iPhone
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: WebGL
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: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
+36 -1
View File
@@ -28,13 +28,16 @@ public class Client : MonoBehaviour
[SerializeField] private GameObject[] playerInfo;
private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
[SerializeField] private GameObject layout2;
[SerializeField] private Item[] items;
[SerializeField] public Item[] items;
[SerializeField] private Button[] itemButtons;
[SerializeField] private TMP_Text fpsText;
private int playerAmount = 0;
[SerializeField] private Image imageCurrentItem;
[SerializeField] private Image[] playerItemInfoImages;
private static Client thisClient;
public static Client GetCurrentInstance()
@@ -153,6 +156,22 @@ public class Client : MonoBehaviour
script.nextField = nextField;
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
//ITEM INFO IMAGES
Image[] temp = new Image[3];
int itemInfoImagesStartIndex = job.data[5] * 3;
int idx = 0;
for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
{
temp[idx] = playerItemInfoImages[i];
temp[idx].color = new Color(0, 0, 0, 0);
idx++;
}
script.itemInfoImages = temp;
//END
itemButtons[job.data[5]].interactable = true;
}
@@ -168,7 +187,23 @@ public class Client : MonoBehaviour
script.nextField = nextField;
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
//ITEM INFO IMAGES
Image[] temp = new Image[3];
int itemInfoImagesStartIndex = job.data[5] * 3;
int idx = 0;
for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
{
temp[idx] = playerItemInfoImages[i];
temp[idx].color = new Color(0, 0, 0, 0);
idx++;
}
script.itemInfoImages = temp;
//END
itemButtons[job.data[5]].interactable = false;
}
@@ -289,6 +289,7 @@ public class PlayablePlayer : Player
private void Finish()
{
imageCurrentItem.color = new Color(0, 0, 0, 0);
client.SendFinished();
}
@@ -352,7 +353,10 @@ public class PlayablePlayer : Player
public void ActivateItem(int index)
{
activeItem = items[index].type;
imageCurrentItem.sprite = items[index].sprite;
imageCurrentItem.color = new Color(1, 1, 1, 1);
items[index] = null;
itemInfoImages[index].color = new Color(0, 0, 0, 0);
client.SendActiveItem((byte)index);
}
}
@@ -24,6 +24,8 @@ public abstract class Player : MonoBehaviour
public Item[] items = new Item[3];
public Item.Type activeItem = Item.Type.None;
protected float rotationDamping = 10;
public Image imageCurrentItem;
public Image[] itemInfoImages;
protected Animator animator;
@@ -39,6 +41,7 @@ public abstract class Player : MonoBehaviour
//Aktiviert den Player
public void Activate()
{
imageCurrentItem.color = new Color(0, 0, 0, 0);
activated = true;
wurfelt = false;
}
@@ -87,6 +90,8 @@ public abstract class Player : MonoBehaviour
if (items[i] == null)
{
items[i] = item;
itemInfoImages[i].sprite = item.sprite;
itemInfoImages[i].color = new Color(1, 1, 1, 1);
break;
}
}
@@ -97,7 +102,11 @@ public abstract class Player : MonoBehaviour
public void ActivateItem(int index)
{
activeItem = items[index].type;
imageCurrentItem.sprite = items[index].sprite;
imageCurrentItem.color = new Color(1, 1, 1, 1);
itemInfoImages[index].color = new Color(0, 0, 0, 0);
items[index] = null;
}
public void OnTriggerEnter(Collider c)