Commit 58e29d09 authored by Freddy's avatar Freddy
Browse files

Basically Done :P

parent 19c9efd9
......@@ -70,13 +70,23 @@
<Compile Include="Assets\DOTween\Modules\DOTweenModuleUI.cs" />
<Compile Include="Assets\DOTween\Modules\DOTweenModuleUnityVersion.cs" />
<Compile Include="Assets\DOTween\Modules\DOTweenModuleUtils.cs" />
<Compile Include="Assets\Prefabs\Johny\BodyPartScript.cs" />
<Compile Include="Assets\Scripts\Camera\BackgroundController.cs" />
<Compile Include="Assets\Scripts\HighFiveCounter.cs" />
<Compile Include="Assets\Scripts\Input\HighFiveTarget.cs" />
<Compile Include="Assets\Scripts\Input\InputController.cs" />
<Compile Include="Assets\Scripts\Input\TouchController.cs" />
<Compile Include="Assets\Scripts\Input\TouchTarget.cs" />
<Compile Include="Assets\Scripts\ShopItem.cs" />
<Compile Include="Assets\Scripts\UI\CurrentItems.cs" />
<Compile Include="Assets\Scripts\UI\ItemHolder.cs" />
<Compile Include="Assets\Scripts\UI\Shop.cs" />
<Compile Include="Assets\Scripts\UI\ShopItemPanel.cs" />
<Compile Include="Assets\Scripts\UI\SlideAnimation.cs" />
<Compile Include="Assets\Scripts\UI\SwipeRecognizer.cs" />
<Compile Include="Assets\Scripts\UI\UpdateIndicator.cs" />
<None Include="Assets\DOTween\readme.txt" />
<None Include="Assets\Scripts\Shader\StarSwipe.shader" />
<None Include="Assets\Scripts\Shader\StarSwipe_texture.shader" />
<None Include="Assets\Scripts\Shader\StarSwipe_greenScreen.shader" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.4.13f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference>
......
......@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12323, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_Name: Johnny
m_EditorClassIdentifier:
m_Presets:
- m_Name:
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Particle
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- ALWAYS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
fileFormatVersion: 2
guid: b77f9de00a14688498873acfa527c4e9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -61,7 +61,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EffectTime: 1
- _EffectTurn: 90
- _EffectTurn: 360
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
......@@ -70,7 +70,7 @@ Material:
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Points: 36
- _ReplaceThreshold: 0.5
- _ReplaceThreshold: 0.763
- _ScreenRatio: 0.5625
- _ScreenWidth: 1080
- _SmoothnessTextureChannel: 0
......@@ -82,8 +82,8 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color1: {r: 0.8599998, g: 1, b: 0.3, a: 1}
- _Color2: {r: 0.86000013, g: 0.3, b: 1, a: 1}
- _Color1: {r: 0.6745098, g: 0.83137256, b: 0.9490196, a: 1}
- _Color2: {r: 0.60784316, g: 0.8156863, b: 0.7294118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _ReplaceColor: {r: 1, g: 0, b: 1, a: 1}
- _Screen: {r: 378.3968, g: 69.25852, b: 0, a: 0}
- _Screen: {r: 275.19684, g: 1306.671, b: 0, a: 0}
......@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Animation
m_Name: Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
......
......@@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jonny (1)
m_Name: JonnyAnimator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
......
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class BodyPartScript : MonoBehaviour
{
public static BodyPartScript Instance { get; private set; }
public enum Place
{
head, body, feet, hand
}
public Transform head;
public Transform body;
public Transform footLeft;
public Transform footRight;
public Transform hand;
private void Awake()
{
Instance = this;
}
public GameObject PlaceItem(ShopItem item)
{
var itemObject = Instantiate(item.prefab, GetBone(item.place));
return itemObject;
}
private Transform GetBone(Place place)
{
switch (place)
{
case Place.head:
return head;
case Place.body:
return body;
case Place.hand:
return hand;
default:
throw new NotImplementedException();
}
}
}
fileFormatVersion: 2
guid: e0770be13a89e614cb5a755cb874f8d8
guid: 0371d38c6ecc5a54e8757109343f2e64
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
......@@ -333,9 +333,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: -0.01999185, w: 0.9998002}
m_LocalPosition: {x: 0.63910246, y: -0.0000024623637, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6944093269120704006}
- {fileID: 6944093268889981448}
m_Children: []
m_Father: {fileID: 6944093269346651276}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -463,170 +461,6 @@ Transform:
m_Father: {fileID: 6944093267790293953}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.4010003}
--- !u!1 &6944093268889981447
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6944093268889981448}
- component: {fileID: 6944093268889981449}
m_Layer: 0
m_Name: Glasses
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6944093268889981448
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093268889981447}
m_LocalRotation: {x: 0.0010418696, y: 0.0012899203, z: 0.6283403, w: -0.7779368}
m_LocalPosition: {x: 0.69486004, y: -0.050264854, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6944093268690755868}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0.041, y: -0.186, z: 12.336}
--- !u!212 &6944093268889981449
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093268889981447}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -7782159248285995603, guid: 5d4f3a85d52d142e5a4db2fe9da91564,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.82, y: 0.48}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6944093268905175090
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6944093268905175091}
- component: {fileID: 6944093268905175092}
m_Layer: 0
m_Name: Shirt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6944093268905175091
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093268905175090}
m_LocalRotation: {x: -0.00067307474, y: -0.0008022675, z: 0.6427226, w: -0.7660984}
m_LocalPosition: {x: 0.12841925, y: -0.11325139, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6944093269346651276}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0.11800001, y: 0.021000002, z: -79.990005}
--- !u!212 &6944093268905175092
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093268905175090}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_Sprite: {fileID: 7944983935325112857, guid: 5d4f3a85d52d142e5a4db2fe9da91564,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.41, y: 1.29}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6944093269020201945
GameObject:
m_ObjectHideFlags: 0
......@@ -636,7 +470,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6944093269020201946}
m_Layer: 0
- component: {fileID: 265900939952401520}
- component: {fileID: 7667051889308787548}
m_Layer: 8
m_Name: bone_8
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -657,6 +493,45 @@ Transform:
m_Father: {fileID: 6944093268412878553}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 72.422005}
--- !u!61 &265900939952401520
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093269020201945}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.5, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1.02}
m_EdgeRadius: 0
--- !u!114 &7667051889308787548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093269020201945}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da4318cddee2b2c46bac4ecb33c0eb45, type: 3}
m_Name:
m_EditorClassIdentifier:
ps: {fileID: 0}
--- !u!1 &6944093269093825113
GameObject:
m_ObjectHideFlags: 0
......@@ -670,6 +545,7 @@ GameObject:
- component: {fileID: 6944093269093825116}
- component: {fileID: 6944093269093825115}
- component: {fileID: 6944093269093825114}
- component: {fileID: 2957475233273742334}
m_Layer: 0
m_Name: Jonny (1)
m_TagString: Untagged
......@@ -815,10 +691,27 @@ MonoBehaviour:
- {fileID: 6944093269112948479}
m_Weight: 1
m_SolverEditorData:
- color: {r: 0, g: 1, b: 0, a: 1}
- color: {r: 1, g: 0, b: 0.09163618, a: 1}
showGizmo: 1
- color: {r: 0, g: 1, b: 0, a: 1}
showGizmo: 1
--- !u!114 &2957475233273742334
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093269093825113}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0371d38c6ecc5a54e8757109343f2e64, type: 3}
m_Name:
m_EditorClassIdentifier:
head: {fileID: 6944093268690755868}
body: {fileID: 6944093269346651276}
footLeft: {fileID: 6944093267838853114}
footRight: {fileID: 6944093268765964420}
hand: {fileID: 6944093269020201946}
--- !u!1 &6944093269112948478
GameObject:
m_ObjectHideFlags: 0
......@@ -883,88 +776,6 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0, w: 0}
- {x: 0, y: 0, z: 0, w: 0}
m_Flip: 1
--- !u!1 &6944093269120704005
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6944093269120704006}
- component: {fileID: 6944093269120704007}
m_Layer: 0
m_Name: Beard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6944093269120704006
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093269120704005}
m_LocalRotation: {x: -0.0006367771, y: -0.0008313698, z: 0.60806644, w: -0.79388547}
m_LocalPosition: {x: 0.13838977, y: 0.10860287, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6944093268690755868}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -0.032, y: 0.116000004, z: 15.292001}
--- !u!212 &6944093269120704007
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6944093269120704005}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1