Merge branch 'master' of https://github.com/marcinzelent/ngj2019

5 files changed, 289 insertions, 69 deletions

diff --git a/nGJ2019/Assets/Models/dragon_3.FBX b/nGJ2019/Assets/Models/dragon_3.FBX
new file mode 100644
index 0000000..e673d94
--- /dev/null
+++ b/nGJ2019/Assets/Models/dragon_3.FBX
diff --git a/nGJ2019/Assets/Models/dragon_3.FBX.meta b/nGJ2019/Assets/Models/dragon_3.FBX.meta
new file mode 100644
index 0000000..4e05f94
--- /dev/null
+++ b/nGJ2019/Assets/Models/dragon_3.FBX.meta
@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: aaed754ac84d08040a5accdbf4099353
+ModelImporter:
+  serializedVersion: 25
+  internalIDToNameTable: []
+  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: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/nGJ2019/Assets/Models/dragon_bones_final.FBX b/nGJ2019/Assets/Models/dragon_bones_final.FBX
new file mode 100644
index 0000000..7e7f4ea
--- /dev/null
+++ b/nGJ2019/Assets/Models/dragon_bones_final.FBX
diff --git a/nGJ2019/Assets/Models/dragon_bones_final.FBX.meta b/nGJ2019/Assets/Models/dragon_bones_final.FBX.meta
new file mode 100644
index 0000000..747d990
--- /dev/null
+++ b/nGJ2019/Assets/Models/dragon_bones_final.FBX.meta
@@ -0,0 +1,126 @@
+fileFormatVersion: 2
+guid: 7778eab16f3bf82458dd13e5bf684aec
+ModelImporter:
+  serializedVersion: 25
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
+  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:
+    - serializedVersion: 16
+      name: Take 001
+      takeName: Take 001
+      internalID: 1827226128182048838
+      firstFrame: 0
+      lastFrame: 100
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 2
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/nGJ2019/Assets/Scenes/Mian_sandbox.unity b/nGJ2019/Assets/Scenes/Mian_sandbox.unity
index fc7a03a..ab5cd1d 100644
--- a/nGJ2019/Assets/Scenes/Mian_sandbox.unity
+++ b/nGJ2019/Assets/Scenes/Mian_sandbox.unity
@@ -258,6 +258,75 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 416fae093739c55499f7dcb7d4f7f2c9, type: 3}
+--- !u!1001 &583309623
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -927199367670048503, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_Name
+      value: dragon_bones
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -12.675362
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 5.911568
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.67247695
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7401181
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 84.517006
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 450075a02616d0d43b5ca9ede22b8d7c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 450075a02616d0d43b5ca9ede22b8d7c, type: 3}
 --- !u!1001 &694316132
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -410,75 +479,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1597041709
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -927199367670048503, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_Name
-      value: dragon
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.55
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.870657
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.16
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7559996
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.6545721
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 98.226006
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: e1be0eb310d9e9f4f831374a5baf7718,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e1be0eb310d9e9f4f831374a5baf7718, type: 3}
 --- !u!1 &1636020288
 GameObject:
   m_ObjectHideFlags: 0