...
 
Commits (2)
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: robot_0
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []
fileFormatVersion: 2
guid: 5744f3f73d9dcb14bbd7e35c07325ded
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Robot Idle Animation
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 7c2059b8024047b40bc778e37d132cce
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5003fee0be0253e469f8fb0713ca0e19
TextureImporter:
internalIDToNameTable:
- first:
213: -2185472608353246101
second: robot_0
- first:
213: 406595380662849328
second: robot_1
- first:
213: 9048603163218632696
second: robot_2
externalObjects: {}
serializedVersion: 8
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: robot_0
rect:
serializedVersion: 2
x: 1
y: 4
width: 64
height: 96
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 79bcf6e1ccf63164a890153b046c0afb
internalID: -2185472608353246101
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: robot_1
rect:
serializedVersion: 2
x: 66
y: 4
width: 64
height: 96
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ba3abb34e6fe28943a3b61f7192f5a87
internalID: 406595380662849328
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: robot_2
rect:
serializedVersion: 2
x: 130
y: 4
width: 64
height: 96
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a7350af508b7e074bbbbe381279a3528
internalID: 9048603163218632696
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 6b76ab677ed5efb44b8307ea0024d140
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -9,6 +9,13 @@ public class NewMainMenu : MonoBehaviour
public LineController Player2Line;
public RodController Player2Rod;
public Image SpashScreen;
public SpriteRenderer Player2Sprite;
public Animator Player2Animator;
public Sprite BearSprite;
public Sprite RobotSprite;
public RuntimeAnimatorController BearAnimator;
public RuntimeAnimatorController RobotAnimator;
private void Start()
{
......@@ -22,6 +29,8 @@ public class NewMainMenu : MonoBehaviour
Player2Line.HumanControlled = false;
Player2Rod.HumanControlled = false;
gameObject.SetActive(false);
Player2Sprite.sprite = RobotSprite;
Player2Animator.runtimeAnimatorController = RobotAnimator;
}
public void On2PlayerClicked()
......@@ -30,5 +39,7 @@ public class NewMainMenu : MonoBehaviour
Player2Line.HumanControlled = true;
Player2Rod.HumanControlled = true;
gameObject.SetActive(false);
Player2Sprite.sprite = BearSprite;
Player2Animator.runtimeAnimatorController = BearAnimator;
}
}
......@@ -10,3 +10,16 @@ The following packages were updated:
com.unity.analytics from version 2.0.16 to 3.0.9
com.unity.package-manager-ui from version 1.9.11 to 2.0.0-preview.7
com.unity.textmeshpro from version 1.2.4 to 1.3.0
=== Thu Jan 31 10:57:42 2019
Packages were changed.
Update Mode: updateDependencies
The following packages were added:
com.unity.timeline@1.0.0
com.unity.xr.legacyinputhelpers@1.0.0
The following packages were updated:
com.unity.analytics from version 3.0.9 to 3.2.2
com.unity.collab-proxy from version 1.2.9 to 1.2.15
com.unity.package-manager-ui from version 2.0.0-preview.7 to 2.1.1
{
"dependencies": {
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.0.9",
"com.unity.collab-proxy": "1.2.9",
"com.unity.package-manager-ui": "2.0.0-preview.7",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.1.1",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.3.0",
"com.unity.timeline": "1.0.0",
"com.unity.xr.legacyinputhelpers": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
......
m_EditorVersion: 2018.3.0b4
m_EditorVersion: 2019.1.0b1
m_EditorVersionWithRevision: 2019.1.0b1 (83b3ba1f99df)
{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
],
"m_SettingValues": [
"False",
"False"
]
}
\ No newline at end of file