Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

Assets/Data/Inventory/BaseInventory.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f56bb5903eab52b34a1586319448b679a19079fdb462de4616981b16d51e2ff
+oid sha256:7abdd52fffdae58812a259189e853c543358c7c219c21b883aa0a70a621cd3bf
 size 1313

Assets/Data/Logic Blocks/Hook.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7782be9b087d45f14f38d5d7bab500769c6e345b45bb495f1b4f3af6838055ef
+size 672

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild.meta → Assets/Data/Logic Blocks/Hook.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: de7266a689379fa45b4d1886f45dfed1
-folderAsset: yes
-DefaultImporter:
+guid: 8f61bd943e67f064b85e0d549367660a
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/HookShot.prefab

@@ -0,0 +1,222 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1482075665168556804
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8576083951848435104}
+  - component: {fileID: 1606634666375724857}
+  - component: {fileID: 1432116328074662879}
+  m_Layer: 0
+  m_Name: HookShot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8576083951848435104
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1482075665168556804}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.686, y: 0, z: 0.083}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8053780789721167347}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1606634666375724857
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1482075665168556804}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 324dc3402d6edc6499badbd4ba6afbbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  hookObject: {fileID: 8053780789721167347}
+  ShotSpeed: 0.5
+  line: {fileID: 1432116328074662879}
+--- !u!120 &1432116328074662879
+LineRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1482075665168556804}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0, z: 0}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.125
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 1
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_UseWorldSpace: 0
+  m_Loop: 1
+--- !u!1 &8057027592657971139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8053780789721167347}
+  - component: {fileID: 8044437326609046371}
+  - component: {fileID: 8034666666562779457}
+  m_Layer: 0
+  m_Name: Hook
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &8053780789721167347
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8057027592657971139}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 8576083951848435104}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!33 &8044437326609046371
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8057027592657971139}
+  m_Mesh: {fileID: 4300000, guid: bb395ac37e71e2e4f8a479dcfb869e64, type: 3}
+--- !u!23 &8034666666562779457
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8057027592657971139}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 88c1fd4a9fde68d43b2a5141c61364ec, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.data.unityweb.meta → Assets/Resources/HookShot.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 10e94ddfd95c4aa4fbb055b633a15b05
-DefaultImporter:
+guid: c03e85adcd6e53d4080823f203bc743a
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Scripts/Logic/Blocks/Shoot.cs

@@ -0,0 +1,63 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+[CreateAssetMenu(menuName = "Major Project/Pick Ups/Shoot Block")]
+[System.Serializable]
+public class Shoot : LogicBlock
+{
+    [SerializeField]
+    [Header("Direction to shoot in")]
+    private Direction Direction;
+
+    [SerializeField]
+    [Header("Projectile to Shoot")]
+    private Projectile Projectile;
+
+    public override Block GetEndBlock(Block startBlock, Transform transform, LayerMask layerMask)
+    {
+        return startBlock;
+    }
+
+
+    protected override IEnumerator BlockLogic(Character player, float animationTime, bool useBlockDirection = false)
+    {
+        Projectile newProjectile = Instantiate(Projectile, player.transform.position, player.transform.rotation);
+        Vector3 direction = Direction.ToVector(player.transform);
+
+        yield return newProjectile.StartCoroutine(newProjectile.ProjectileLogic(player, animationTime, direction));
+
+        Destroy(newProjectile.gameObject);
+    }
+
+    public override void CopyToken(BlockToken token)
+    {
+        base.CopyToken(token);
+        Projectile = Resources.Load<GameObject>(((ShotToken)token).prefabName).GetComponent<Projectile>();
+        Direction = ((ShotToken)token).direction;
+    }
+
+    public override BlockToken ToToken(BlockToken token = null)
+    {
+        if (token == null)
+            token = new ShotToken(this);
+
+        Debug.Log(base.ToToken(token).GetType().Name);
+        ShotToken retVal = (ShotToken)base.ToToken(token);
+        retVal.direction = Direction;
+        retVal.prefabName = Projectile.gameObject.name;
+
+        return retVal;
+    }
+
+}
+
+[System.Serializable]
+public class ShotToken : BlockToken
+{
+    public Direction direction;
+    public string prefabName;
+
+    public ShotToken(LogicBlock block) : base(block) { }
+}

Assets/Scripts/Logic/Blocks/Shoot.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b23d6f915496d5d488f08ded025dd94b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets.meta → Assets/Scripts/Projectiles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 269e12cf8d71c0e4ea7c8cc043915cac
+guid: 7e78c88568b176349892beb5fe0cc13b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Projectiles/Hookshot.cs

@@ -0,0 +1,91 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Hookshot : Projectile
+{
+
+    [SerializeField]
+    private Transform hookObject;
+
+    [SerializeField]
+    private float ShotSpeed = 1;
+
+    [SerializeField]
+    private LineRenderer line;
+
+
+    public override IEnumerator ProjectileLogic(Character player, float animationTime, Vector3 direction)
+    {
+        Block hitBlock = GetEndBlock(player.CurrentBlock, direction, ~player.Ignore);
+
+        if (hitBlock == player.CurrentBlock)
+            yield break;
+
+        yield return StartCoroutine(lerpShot(hookObject, player.transform.position, hitBlock.VisualPosition, ShotSpeed * Vector3.Distance(player.transform.position,hitBlock.VisualPosition)/10));
+
+        if (hitBlock.CurrentPlayer != null)
+        {
+            Block pullBlock = Block.GetOrCreateBlockAtPosition(player.CurrentBlock.position + direction, 1, ~player.Ignore);
+            StartCoroutine(lerpShot(hookObject, hookObject.position, pullBlock.VisualPosition, ShotSpeed * Vector3.Distance(hookObject.position, pullBlock.VisualPosition) / 10));
+            yield return player.StartCoroutine(hitBlock.CurrentPlayer.MoveToBlock(pullBlock, Character.Animation.Hit, ShotSpeed));
+        }
+        else
+        {
+            line.enabled = false;
+            yield return player.StartCoroutine(player.MoveToBlock(hitBlock, Character.Animation.Jump, ShotSpeed * Vector3.Distance(player.transform.position, hitBlock.VisualPosition) / 10));
+        }
+    }
+
+    private Block GetEndBlock(Block startBlock, Vector3 direction, LayerMask layerMask)
+    {
+        //setting up variables
+        Vector3 position; // position wanted
+        Block hit; //output of block detection
+        Block retVal = startBlock; //block we'll actually move to
+
+        //Check blocks in front until we hit an obstruction or went the distance
+        for (int i = 1; i <= 30; i++)
+        {
+            //Next position to MoveTo
+            position = startBlock.position + (direction * i);
+
+            //if position is off the screen there is nothing to hit
+            if (!Block.isPositionVisible(position))
+                return startBlock;
+
+            //if hit player return block they are standing on
+            if (Block.isBlockAtPosition(position, 1, layerMask, out hit))
+            {
+                if (hit.CurrentPlayer != null)
+                    return hit;
+            }
+
+            //if block block paths return block infront of it
+            if (Block.isBlockAtPosition(position + Vector3.up, 1, layerMask))
+            {
+                return Block.GetOrCreateBlockAtPosition(position - direction, 1, layerMask);
+            }
+
+        }
+
+        return retVal;
+    }
+
+    private IEnumerator lerpShot(Transform target, Vector3 startPosition, Vector3 endPosition, float time)
+    {
+
+        float elapsedTime = 0;
+
+        while (elapsedTime < time)
+        {
+            target.position = Vector3.Lerp(startPosition, endPosition, elapsedTime / time);
+            line.SetPosition(1, target.localPosition);
+
+            yield return new WaitForEndOfFrame();
+            elapsedTime += Time.deltaTime;
+        }
+
+        target.position = endPosition;
+    }
+}

Assets/Scripts/Projectiles/Hookshot.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 324dc3402d6edc6499badbd4ba6afbbb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Projectiles/Projectile.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class Projectile : MonoBehaviour
+{
+    public abstract IEnumerator ProjectileLogic(Character player, float animationTime, Vector3 direction);
+}

Assets/Scripts/Projectiles/Projectile.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5634403e4725fd54d82986efcdc4524f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/LogicElementUI.cs

@@ -67,7 +67,7 @@ public class LogicElementUI : Dragable
             nameText.outlineWidth = 0.1f;
 
             backGround.color = LogicElement.Color;
-            Sprite elementIcon = Resources.Load<Sprite>(LogicElement.name.ToString());
+            Sprite elementIcon = Resources.Load<Sprite>(LogicElement.DisplayName.ToString());
             if(elementIcon != null)
             {
                 icon.sprite = elementIcon;

Assets/StreamingAssets/WebGLBuild/Build/WebGLBuild.data.unityweb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3280ae5e8e35f80671e30d7d140dcd4cb94de5e6ecddd5feac34ba3bb22ae853
-size 13778627
+oid sha256:834fe6f79e87b4c9405e154dd7b134071eab631a9249ae12236ec5a2eb184a3b
+size 16005156

Assets/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.code.unityweb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f977da72338c4dde19aca4804692c86419a54d08bccc5dead644e8a602177787
-size 5554755
+oid sha256:05156bb919e16298a443fdebf2f3cccf02e96620b0565b6e70907e03abeb2fbb
+size 5571695

Assets/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.framework.unityweb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:876e3462c81100655179ae1b01473a80a895d1d9947828da34db3ff4f2e9f655
+oid sha256:fa5edb82d981cae999718d88218ba8e83c79c11da3be1f4d12e0dc4dbd440591
 size 96976

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0dc367cfdbbdece44853b72983d92874
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/UnityLoader.js.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9c6125f8999b5ef4eafe8b677a2e7605
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.data.unityweb

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3b63b387237263b0d53dd2426329f9badf2795062af614a355597e3a2b0c2c6
-size 12036029

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.json

@@ -1,13 +0,0 @@
-{
-"companyName": "Pet.Move()",
-"productName": "Pet.Move()",
-"dataUrl": "WebGLBuild.data.unityweb",
-"wasmCodeUrl": "WebGLBuild.wasm.code.unityweb",
-"wasmFrameworkUrl": "WebGLBuild.wasm.framework.unityweb",
-"TOTAL_MEMORY": 268435456,
-"graphicsAPI": ["WebGL 2.0", "WebGL 1.0"],
-"webglContextAttributes": {"preserveDrawingBuffer": false},
-"splashScreenStyle": "Dark",
-"backgroundColor": "#231F20",
-"cacheControl": {"default": "must-revalidate"}
-}

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: edfa63ec69385dd44ab24ec8a6a1a6b7
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.code.unityweb

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:187c75f0c272a04e9ee92922facff177067b3d4829c6653d1896ebf8f7dd06ab
-size 5553639

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.code.unityweb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7af6aaa3a1109d54b905b7c3e642af5f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.framework.unityweb

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7d98daddd07e869e7e35bd082d9725f075c437c5c9459f5535c8dc50cb435c3
-size 96936

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/Build/WebGLBuild.wasm.framework.unityweb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 955d0b6668704c640a677e8955597716
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e69dc6ac4bf777f4190885633330b45a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/UnityProgress.js

@@ -1,24 +0,0 @@
-function UnityProgress(gameInstance, progress) {
-  if (!gameInstance.Module)
-    return;
-  if (!gameInstance.logo) {
-    gameInstance.logo = document.createElement("div");
-    gameInstance.logo.className = "logo " + gameInstance.Module.splashScreenStyle;
-    gameInstance.container.appendChild(gameInstance.logo);
-  }
-  if (!gameInstance.progress) {    
-    gameInstance.progress = document.createElement("div");
-    gameInstance.progress.className = "progress " + gameInstance.Module.splashScreenStyle;
-    gameInstance.progress.empty = document.createElement("div");
-    gameInstance.progress.empty.className = "empty";
-    gameInstance.progress.appendChild(gameInstance.progress.empty);
-    gameInstance.progress.full = document.createElement("div");
-    gameInstance.progress.full.className = "full";
-    gameInstance.progress.appendChild(gameInstance.progress.full);
-    gameInstance.container.appendChild(gameInstance.progress);
-  }
-  gameInstance.progress.full.style.width = (100 * progress) + "%";
-  gameInstance.progress.empty.style.width = (100 * (1 - progress)) + "%";
-  if (progress == 1)
-    gameInstance.logo.style.display = gameInstance.progress.style.display = "none";
-}

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/UnityProgress.js.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 46db953f16927a6469202f195e76f605
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/favicon.ico.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ba577b328d6893b44801975001786548
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/fullscreen.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:922b2a609219c96962e2e7af9d27c1f1935881de617c9d5cb08fdb0d034cafdc
-size 345

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/fullscreen.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2918e2093142c2c468438dcf2c2f8fed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressEmpty.Dark.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c901e72986f57b3dd474c5b8db981da26ec1d9ad92af9edc722172678c07d44
-size 155

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressEmpty.Dark.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9913ad1bd1d2c7c49ab42e56b8198e08
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressEmpty.Light.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efbfdb9313bdc0489d96339cf4352c1a80bc953050cf9a6c06a7ced0c0f1a4e2
-size 159

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressEmpty.Light.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2efd6ecdb123c894a8da58d7865f4061
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressFull.Dark.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2832fafec86b420ee29e0e2126b95767a22bff85d30dc90ed8de36246b395fd8
-size 137

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressFull.Dark.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8f19bef98138c954fae3ec8e9adc1a10
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressFull.Light.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:706765aced698c9790bb31eafd12b8161fadc46a62214926788a7a84cdc5fb51
-size 142

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressFull.Light.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a37656c44ad6b9249b9d77182ea93c1c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressLogo.Dark.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b95da4db2adc10af8bee6bfccb5246cc356b3164ce7caf6c7581c1002d64b71b
-size 2343

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressLogo.Dark.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f908e42f232c07b4a83aec7e85477d88
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressLogo.Light.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270d4f3c53ec8acbef1657520116e9bbd5efe074e4fc12db05fdb9a745ae96bb
-size 2259

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/progressLogo.Light.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 248ce049d0211024484022b0a41c733a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/style.css

@@ -1,18 +0,0 @@
-.webgl-content * {border: 0; margin: 0; padding: 0}
-.webgl-content {position: absolute; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
-
-.webgl-content .logo, .progress {position: absolute; left: 50%; top: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
-.webgl-content .logo {background: url('progressLogo.Light.png') no-repeat center / contain; width: 154px; height: 130px;}
-.webgl-content .progress {height: 18px; width: 141px; margin-top: 90px;}
-.webgl-content .progress .empty {background: url('progressEmpty.Light.png') no-repeat right / cover; float: right; width: 100%; height: 100%; display: inline-block;}
-.webgl-content .progress .full {background: url('progressFull.Light.png') no-repeat left / cover; float: left; width: 0%; height: 100%; display: inline-block;}
-
-.webgl-content .logo.Dark {background-image: url('progressLogo.Dark.png');}
-.webgl-content .progress.Dark .empty {background-image: url('progressEmpty.Dark.png');}
-.webgl-content .progress.Dark .full {background-image: url('progressFull.Dark.png');}
-
-.webgl-content .footer {margin-top: 5px; height: 38px; line-height: 38px; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 18px;}
-.webgl-content .footer .webgl-logo, .title, .fullscreen {height: 100%; display: inline-block; background: transparent center no-repeat;}
-.webgl-content .footer .webgl-logo {background-image: url('webgl-logo.png'); width: 204px; float: left;}
-.webgl-content .footer .title {margin-right: 10px; float: right;}
-.webgl-content .footer .fullscreen {background-image: url('fullscreen.png'); width: 38px; float: right;}

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/style.css.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 90965324ba3f03648886ea07992e8529
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/webgl-logo.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f02bcd2abdd299a100ab8e2a339b3f414727816901ecda211d68cb7ba0705da0
-size 3587

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/TemplateData/webgl-logo.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0896f760ed637eb4393e9acbafc00bad
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/index.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Unity WebGL Player | Pet.Move()</title>
-    <link rel="shortcut icon" href="TemplateData/favicon.ico">
-    <link rel="stylesheet" href="TemplateData/style.css">
-    <script src="TemplateData/UnityProgress.js"></script>
-    <script src="Build/UnityLoader.js"></script>
-    <script>
-      var gameInstance = UnityLoader.instantiate("gameContainer", "Build/WebGLBuild.json", {onProgress: UnityProgress});
-    </script>
-  </head>
-  <body>
-    <div class="webgl-content">
-      <div id="gameContainer" style="width: 960px; height: 600px"></div>
-      <div class="footer">
-        <div class="webgl-logo"></div>
-        <div class="fullscreen" onclick="gameInstance.SetFullscreen(1)"></div>
-        <div class="title">Pet.Move()</div>
-      </div>
-    </div>
-  </body>
-</html>

Assets/StreamingAssets/WebGLBuild/StreamingAssets/WebGLBuild/index.html.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6a9718922a68b0642a781eb4d512fba5
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e
+oid sha256:81dc2bb76c1a5b7639713c40b44bce40b5757f89e1fe33e7033950ea47e88071
 size 1282