Merge remote-tracking branch 'origin/savya' into work_branch

Assets/Darkmatter/Data/Ads/AdUnitCatalog.asset

@@ -12,8 +12,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e6352f0162df4adf99a5945e25c6bf40, type: 3}
   m_Name: AdUnitCatalog
   m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Services.Ads.AdUnitCatalogSO
-  androidAppId: ca-app-pub-3940256099942544~3347511713
-  iosAppId: ca-app-pub-3940256099942544~1458002511
+  androidAppId: ca-app-pub-3810264200292720~3342731243
+  iosAppId: ca-app-pub-3810264200292720~5597889728
   useTestUnits: 0
   testDeviceIds: []
-  entries: []
+  entries:
+  - Format: 1
+    AndroidUnitId: ca-app-pub-3810264200292720/8753612666
+    IosUnitId: ca-app-pub-3810264200292720/8064711900
+  - Format: 2
+    AndroidUnitId: ca-app-pub-3810264200292720/9189954299
+    IosUnitId: ca-app-pub-3810264200292720/3366781979

Assets/Darkmatter/Data/Settings/ShapeBuilder/ShapeBuilderConfig.asset

@@ -12,32 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 52d6fdba64cc3491880636e34ed593d0, type: 3}
   m_Name: ShapeBuilderConfig
   m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.ShapeBuilder.ShapeBuilderConfig
-  snapRadius: 200
-  previewRadius: 300
+  catchRadiusScale: 1.5
   snapDuration: 0.25
   returnDuration: 0.25
   dragScale: 1.15
-  previewCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
+  dragAlpha: 0.7

Assets/Darkmatter/Data/Tutorial/TutorialStepsConfig.asset

@@ -17,6 +17,24 @@ MonoBehaviour:
   finishText: Now finish the puzzle!
   colorText: Choose a color!
   paintText: Tap the picture to color it!
+  finishColoringText: Color the whole picture!
   nextText: Tap Next when you're done!
   doneText: Yay! You did it!
+  pickBubble: 0
+  pickBubbleOffset: {x: 0, y: 0}
+  dragBubble: 1
+  dragBubbleOffset: {x: 200, y: 0}
+  finishBubble: 1
+  finishBubbleOffset: {x: 200, y: 0}
+  colorBubble: 0
+  colorBubbleOffset: {x: 0, y: 0}
+  paintBubble: 0
+  paintBubbleOffset: {x: 0, y: 0}
+  finishColoringBubble: 1
+  finishColoringBubbleOffset: {x: 200, y: 0}
+  nextBubble: 0
+  nextBubbleOffset: {x: 0, y: 0}
+  doneBubble: 0
+  doneBubbleOffset: {x: 0, y: 0}
   stepTimeoutSeconds: 45
+  actionTimeoutSeconds: 0