Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage

2019-06-11 15:55:18 +09:00 · 2019-06-11 15:55:18 +09:00 · fd55832727
commit fd55832727
parent ef6c76f18c a510f42799
6 changed files with 10 additions and 109 deletions
--- a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs
+++ b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8920ac90a6b807e86dc8e1aa228d5112f384558d761d146b74e621d863b62e8
-size 3335
+oid sha256:bc08cdd15268b1ad24587ea0bd9127f673dabb2e9c9f10cdb61cb46ec4004b9d
+size 3353
--- a/Assets/Menus/Lobby/LobbyCountdown.cs
+++ b/Assets/Menus/Lobby/LobbyCountdown.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68b79b92f18279918ec5d683a489fe9afe501c83cf808da2365afc52f599f9ac
-size 1216
+oid sha256:5c60202526c2c05bd485b73e031414b1866fc6ac9d1d2d642e16da4f02d3d08e
+size 1229
--- a/Assets/Menus/Network/MenuNetPlayer.cs
+++ b/Assets/Menus/Network/MenuNetPlayer.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e8decfa2c75ec6e9f53b681e35b040fdb1d251569d78ea8d8c59b9eabaa326a
-size 2485
+oid sha256:d5bfbe261416dcfe6effa151e0f0a1fc166d07e65e957eb2c2767da85765a1da
+size 2980
--- a/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs
+++ b/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae317aed30374c719da34fe895c5f570998e3432373759355ff06da3c509883f
-size 1411
+oid sha256:26491e5681afb52125394a4bbced85f87364a67b3ba029d072bd5b276fb2f2d9
+size 1459
--- a/Assets/Menus/WaitingRoom/WaitingUserInit.cs
+++ b/Assets/Menus/WaitingRoom/WaitingUserInit.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4799345e8b48495c533b12a9c859c69153546e658590897fc43db80c524d1ba0
-size 1024
+oid sha256:1fa12502b903c8fd8681a8b20a1a5e20f27d34d8709be6a2c3f21031e2ba1397
+size 1065
--- a/Assets/Prefabs/Core/arrow
+++ b/Assets/Prefabs/Core/arrow
@ -1,99 +0,0 @@
-fileFormatVersion: 2
-guid: e86111f9f7a3a234abd1278e518d1426
-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: