Fixed anchors in menus && User UI canvas

2019-05-14 10:08:59 +09:00 · 2019-05-14 10:08:59 +09:00 · 79efbfab43
commit 79efbfab43
parent 601ec863da
8 changed files with 13 additions and 112 deletions
--- a/Assets/Menus/Lobby/LobbyObjectiveInit.cs
+++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6693d0c7e75b4a65a94ccaa311cc67a6901b3267249a9e8e931f81c05929c1e
-size 987
+oid sha256:01a88c9e03a7b7556354690a68bd210516912b9cdbeeb878c7f561a6563f3aff
+size 980
--- a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
+++ b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6af8463c246acd3a42aeb7f6885b6caa5b4e76db173b29ff0335b90210ef640c
-size 1350656
+oid sha256:73f30e4bdea5de1180722029149177d7c97f061aeb36dc7f1a626f24c8d32fd0
+size 817664
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ce51c8e33b734b4db6086586558c53a3
+guid: 731f1baa9d144a9897cb1d341c2092b8
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Prefabs/Core/arrow.obj.meta
+++ b/Assets/Prefabs/Core/arrow.obj.meta
@ -1,99 +0,0 @@
-fileFormatVersion: 2
-guid: 0e8d8faeb7386b14689a7745abe865cb
-ModelImporter:
-  serializedVersion: 23
-  fileIDToRecycleName:
-    100000: //RootNode
-    100002: default
-    400000: //RootNode
-    400002: default
-    2100000: defaultMat
-    2300000: default
-    3300000: default
-    4300000: default
-  externalObjects: {}
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    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: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    useSRGBMaterialColor: 1
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    preserveHierarchy: 0
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-    previousCalculatedGlobalScale: 1
-    hasPreviousCalculatedGlobalScale: 0
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-    normalCalculationMode: 4
-    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
-    blendShapeNormalImportMode: 1
-    normalSmoothingSource: 0
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 0
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/LobbyScene.unity
+++ b/Assets/Scenes/LobbyScene.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d25cb749c289c3fcc395364dfc2f4a09738bb7732a221a19b2a940ac09cd9ef
-size 267878
+oid sha256:7ea473be3d831df127ea15471233afa3d6c12f8fadfd43011ffb8e9f1636bed0
+size 267895
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a357c351f62f235e0011e55c39f6c7f8303c0d7bc8aeb5cfbb16d200431f416f
-size 106695
+oid sha256:3db00f35a4bd00a8de737bbea8611dd267e073f57a052519894c19410670cb0e
+size 107105
--- a/Assets/Scenes/WaitingRoomScene.unity
+++ b/Assets/Scenes/WaitingRoomScene.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31f826f3f666bca6761eedaafd1236e539ea23bcb302f34b1f60161884a8e86b
-size 101425
+oid sha256:e9e27d98e59ca943805445ebf1fbf3eeb785c59f5ed6f6cdfa4523addcb738e5
+size 101828
--- a/Assets/UserUI/Canvas.prefab
+++ b/Assets/UserUI/Canvas.prefab
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b8164107e6db115e9b9588cfc54a4d5c83c630aed95c89d0c6fcce802e1a53
-size 62888
+oid sha256:a9446f0ea418d4cd1328a605247feeccdab5a10ed1f9f650cc7ed962e97e27c7
+size 62886