Introduced Player Height offset

2023-04-03 18:54:29 +02:00
parent 85023c6d80
commit 6e177eee81
19 changed files with 1954 additions and 13 deletions
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: af92dfed6743a904c9b56cd8a5b23985
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: e79041d09dc75564dba6479d6241fd30
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 376b6a7898536054995c3fd0800ffad7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: b69cae6d413f75b489dbe534eed44336
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 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
+  - 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: 
@@ -1307,6 +1307,7 @@ GameObject:
  - component: {fileID: 4317162709733504972}
  - component: {fileID: 5338766736821448153}
  - component: {fileID: 3795912341625257883}
+  - component: {fileID: 8075745213474720708}
  m_Layer: 0
  m_Name: Chicken
  m_TagString: Untagged
@@ -1383,6 +1384,19 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
+--- !u!114 &8075745213474720708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8925129576854471352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b959c5ef3e934c4aa423304f05cb0a3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  heightOffset: 0.5
 --- !u!1 &9046182286325009016
 GameObject:
  m_ObjectHideFlags: 0
@@ -496,6 +496,7 @@ GameObject:
  - component: {fileID: 8729300990642572682}
  - component: {fileID: -2711495728694078663}
  - component: {fileID: 2908054328684870168}
+  - component: {fileID: 8231549820958033844}
  m_Layer: 0
  m_Name: Pingu
  m_TagString: Untagged
@@ -511,7 +512,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5247910453208470208}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 91.167, y: 1.05, z: 121.29}
+  m_LocalPosition: {x: 91.167, y: 1, z: 121.29}
  m_LocalScale: {x: 0.29306707, y: 0.29306707, z: 0.29306707}
  m_ConstrainProportionsScale: 0
  m_Children:
@@ -572,6 +573,19 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
+--- !u!114 &8231549820958033844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5247910453208470208}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b959c5ef3e934c4aa423304f05cb0a3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  heightOffset: 0.5
 --- !u!1 &5554566362797791428
 GameObject:
  m_ObjectHideFlags: 0
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2d961b4f1a4c4e04a9f64ace393b4b84
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -544,7 +544,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &293557777
 RectTransform:
  m_ObjectHideFlags: 0
@@ -4344,7 +4344,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1844490421
 RectTransform:
  m_ObjectHideFlags: 0
@@ -4441,7 +4441,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 57e3c75103e6feb49985654c7af4524c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b69cae6d413f75b489dbe534eed44336, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -4793,7 +4793,7 @@ MonoBehaviour:
  backgroundNameText: {fileID: 309674619}
  layoutSelectCharacter: {fileID: 813846768}
  characterFaces:
-  - {fileID: 21300000, guid: 57e3c75103e6feb49985654c7af4524c, type: 3}
+  - {fileID: 21300000, guid: b69cae6d413f75b489dbe534eed44336, type: 3}
  - {fileID: 21300000, guid: 84910def6c534a342b64c363954757f5, type: 3}
  - {fileID: 21300000, guid: 6ce91f2676559c8498bf6cf0e6db698f, type: 3}
  imageShowSelectedCharacter: {fileID: 492275789}
@@ -551,9 +551,13 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  textLeftMoves: {fileID: 2122811708}
  playerPrefab:
-  - {fileID: 8816567085985930771, guid: 5fb5cbebdcdde5e4381eed73785da900, type: 3}
+  - {fileID: 837377722559810298, guid: 2d961b4f1a4c4e04a9f64ace393b4b84, type: 3}
  - {fileID: 5247910453208470208, guid: 59e100ca14490c747a2f7e7419c67425, type: 3}
  - {fileID: 8925129576854471352, guid: dacabcc369b57cd4699cbd9028805bb8, type: 3}
+  playerPrefabsHeightInfo:
+  - {fileID: 7490900872259122966, guid: 2d961b4f1a4c4e04a9f64ace393b4b84, type: 3}
+  - {fileID: 8231549820958033844, guid: 59e100ca14490c747a2f7e7419c67425, type: 3}
+  - {fileID: 8075745213474720708, guid: dacabcc369b57cd4699cbd9028805bb8, type: 3}
  dice: {fileID: 1676575018}
  nextField: {fileID: 1406090859}
  cam: {fileID: 1328561024}
@@ -598,7 +602,7 @@ MonoBehaviour:
  - {fileID: 2101210735}
  - {fileID: 651699163}
  playerIconInfoImagesPrefabs:
-  - {fileID: 21300000, guid: 57e3c75103e6feb49985654c7af4524c, type: 3}
+  - {fileID: 21300000, guid: b69cae6d413f75b489dbe534eed44336, type: 3}
  - {fileID: 21300000, guid: 84910def6c534a342b64c363954757f5, type: 3}
  - {fileID: 21300000, guid: 6ce91f2676559c8498bf6cf0e6db698f, type: 3}
 --- !u!114 &47812149
@@ -16,6 +16,7 @@ public class Client : MonoBehaviour
    private TcpClient client;
    private Stream stream;
    [SerializeField] private GameObject[] playerPrefab;
+    [SerializeField] private PlayerHeightInfo[] playerPrefabsHeightInfo;
    private Player[] players = new Player[4];
    private Queue<Job> jobs = new Queue<Job>();
    [SerializeField] private GameObject dice;
@@ -155,7 +156,7 @@ public class Client : MonoBehaviour
                        GameObject player = Instantiate(playerPrefab[job.data[9]]);
                        playerIconInfoImages[job.data[5]].sprite = playerIconInfoImagesPrefabs[job.data[9]];

-                        player.transform.position = new Vector3(job.data[2], job.data[3] + 0.5f, job.data[4]);
+                        player.transform.position = new Vector3(job.data[2], job.data[3] + playerPrefabsHeightInfo[job.data[9]].heightOffset, job.data[4]);

                        PlayablePlayer script = player.AddComponent<PlayablePlayer>();
                        players[job.data[5]] = script;
@@ -188,7 +189,7 @@ public class Client : MonoBehaviour
                        GameObject player = Instantiate(playerPrefab[job.data[9]]);
                        playerIconInfoImages[job.data[5]].sprite = playerIconInfoImagesPrefabs[job.data[9]];

-                        player.transform.position = new Vector3(job.data[2], job.data[3] + 0.5f, job.data[4]);
+                        player.transform.position = new Vector3(job.data[2], job.data[3] + playerPrefabsHeightInfo[job.data[9]].heightOffset, job.data[4]);

                        NoPlayablePlayer script = player.AddComponent<NoPlayablePlayer>();
                        players[job.data[5]] = script;
@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerHeightInfo : MonoBehaviour
+{
+    public float heightOffset;
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b959c5ef3e934c4aa423304f05cb0a3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -39,8 +39,8 @@ public class StartHandler : MonoBehaviour
        }
        else
        {
-            PlayerPrefs.SetInt("characterID", 1);
-            imageShowSelectedCharacter.sprite = characterFaces[1];
+            PlayerPrefs.SetInt("characterID", 0);
+            imageShowSelectedCharacter.sprite = characterFaces[0];
        }
        
        copiedMessage.SetActive(false);