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

# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
This commit is contained in:
Mausham
2026-06-03 10:24:03 +05:45
63 changed files with 1593 additions and 685 deletions

View File

@@ -5,7 +5,6 @@
<androidPackage spec="com.appsflyer:af-android-sdk:6.17.6"></androidPackage> <androidPackage spec="com.appsflyer:af-android-sdk:6.17.6"></androidPackage>
<androidPackage spec="com.appsflyer:unity-wrapper:6.17.91"></androidPackage> <androidPackage spec="com.appsflyer:unity-wrapper:6.17.91"></androidPackage>
<androidPackage spec="com.android.installreferrer:installreferrer:2.1"></androidPackage> <androidPackage spec="com.android.installreferrer:installreferrer:2.1"></androidPackage>
<androidPackage spec="com.appsflyer:purchase-connector:2.2.0"></androidPackage>
</androidPackages> </androidPackages>
<iosPods> <iosPods>

View File

@@ -14,6 +14,11 @@ public interface IColoringController
void PaintRegion(string regionId, Color color); void PaintRegion(string regionId, Color color);
IReadOnlyDictionary<string, Color> GetCurrentColors(); IReadOnlyDictionary<string, Color> GetCurrentColors();
UniTask PlayCompletionAnimationAsync(CancellationToken ct); UniTask PlayCompletionAnimationAsync(CancellationToken ct);
// True while the completion celebration is on screen (the real drawing is hidden).
// Capture must skip these frames so it never grabs the animation instead of the art.
bool IsPlayingCompletionAnimation { get; }
bool HasNonAuthoredColors { get; } bool HasNonAuthoredColors { get; }
void ResetAll(); void ResetAll();
void Clear(); void Clear();

View File

@@ -16,6 +16,7 @@ namespace Darkmatter.Core.Data.Static.Features.ShapeBuilder
[Header("Drag")] [Header("Drag")]
[SerializeField, Range(1f, 2f)] private float dragScale = 1.15f; [SerializeField, Range(1f, 2f)] private float dragScale = 1.15f;
[SerializeField, Range(0f, 1f)] private float dragAlpha = 0.7f;
[Header("Preview easing")] [Header("Preview easing")]
[SerializeField] private AnimationCurve previewCurve = AnimationCurve.EaseInOut(0, 0, 1, 1); [SerializeField] private AnimationCurve previewCurve = AnimationCurve.EaseInOut(0, 0, 1, 1);
@@ -25,6 +26,7 @@ namespace Darkmatter.Core.Data.Static.Features.ShapeBuilder
public float SnapDuration => snapDuration; public float SnapDuration => snapDuration;
public float ReturnDuration => returnDuration; public float ReturnDuration => returnDuration;
public float DragScale => dragScale; public float DragScale => dragScale;
public float DragAlpha => dragAlpha;
public AnimationCurve PreviewCurve => previewCurve; public AnimationCurve PreviewCurve => previewCurve;
public Vector2 DragSizeDelta(ShapeSO shape) => public Vector2 DragSizeDelta(ShapeSO shape) =>

View File

@@ -30,6 +30,7 @@ namespace Darkmatter.Features.AppBoot.Flow
public async UniTask StartAsync(CancellationToken cancellation = default) public async UniTask StartAsync(CancellationToken cancellation = default)
{ {
Screen.sleepTimeout = SleepTimeout.NeverSleep;
await _progression.LoadAsync(); await _progression.LoadAsync();
var tcs = new UniTaskCompletionSource(); var tcs = new UniTaskCompletionSource();

View File

@@ -1,6 +1,7 @@
using System.Threading; using System.Threading;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using Darkmatter.Core.Contracts.Features.Capture; using Darkmatter.Core.Contracts.Features.Capture;
using Darkmatter.Core.Contracts.Features.Coloring;
using Darkmatter.Core.Contracts.Features.DrawingCatalog; using Darkmatter.Core.Contracts.Features.DrawingCatalog;
using Darkmatter.Core.Contracts.Features.GameplayFlow; using Darkmatter.Core.Contracts.Features.GameplayFlow;
using Darkmatter.Core.Contracts.Features.Progression; using Darkmatter.Core.Contracts.Features.Progression;
@@ -21,6 +22,7 @@ namespace Darkmatter.Features.Capture
private readonly CaptureConfig _config; private readonly CaptureConfig _config;
private readonly IProgressionSystem _progression; private readonly IProgressionSystem _progression;
private readonly IDrawingTemplateCatalog _catalog; private readonly IDrawingTemplateCatalog _catalog;
private readonly IColoringController _coloring;
public CaptureSystem( public CaptureSystem(
ICaptureService captureService, ICaptureService captureService,
@@ -29,7 +31,8 @@ namespace Darkmatter.Features.Capture
IEventBus bus, IEventBus bus,
CaptureConfig config, CaptureConfig config,
IProgressionSystem progression, IProgressionSystem progression,
IDrawingTemplateCatalog catalog) IDrawingTemplateCatalog catalog,
IColoringController coloring)
{ {
_captureService = captureService; _captureService = captureService;
_galleryService = galleryService; _galleryService = galleryService;
@@ -38,10 +41,16 @@ namespace Darkmatter.Features.Capture
_config = config; _config = config;
_progression = progression; _progression = progression;
_catalog = catalog; _catalog = catalog;
_coloring = coloring;
} }
public async UniTask<byte[]> CapturePngAsync(bool saveToGallery = false, CancellationToken ct = default) public async UniTask<byte[]> CapturePngAsync(bool saveToGallery = false, CancellationToken ct = default)
{ {
// The completion celebration hides the real drawing and shows an animation object
// under PaperRoot. Capturing then would grab the animation, not the art, so skip.
// A null result keeps the existing thumbnail and skips the gallery write (both no-op on null).
if (_coloring.IsPlayingCompletionAnimation) return null;
var png = await _captureService.CapturePngAsync(_refs.PaperRoot.gameObject, _config.CaptureScale, ct); var png = await _captureService.CapturePngAsync(_refs.PaperRoot.gameObject, _config.CaptureScale, ct);
if (!saveToGallery || png == null || png.Length == 0) return png; if (!saveToGallery || png == null || png.Length == 0) return png;

View File

@@ -33,6 +33,7 @@ public class ColoringController : IColoringController, IDisposable
private GameObject _colorButtonPrefab; private GameObject _colorButtonPrefab;
private GameObject _completionAnimationInstance; private GameObject _completionAnimationInstance;
private CompletionAnimationView _completionAnimationView; private CompletionAnimationView _completionAnimationView;
private bool _isPlayingCompletionAnimation;
private readonly List<ColorRegionView> _regions = new(); private readonly List<ColorRegionView> _regions = new();
private readonly List<ColorButton> _buttons = new(); private readonly List<ColorButton> _buttons = new();
private readonly Dictionary<string, Color> _authoredColors = new(); private readonly Dictionary<string, Color> _authoredColors = new();
@@ -88,17 +89,21 @@ public class ColoringController : IColoringController, IDisposable
return snapshot; return snapshot;
} }
public bool IsPlayingCompletionAnimation => _isPlayingCompletionAnimation;
public async UniTask PlayCompletionAnimationAsync(CancellationToken ct) public async UniTask PlayCompletionAnimationAsync(CancellationToken ct)
{ {
if (_completionAnimationInstance == null || _completionAnimationView == null) return; if (_completionAnimationInstance == null || _completionAnimationView == null) return;
if (_colorInstance != null) _colorInstance.SetActive(false); if (_colorInstance != null) _colorInstance.SetActive(false);
_completionAnimationInstance.SetActive(true); _completionAnimationInstance.SetActive(true);
_isPlayingCompletionAnimation = true;
try try
{ {
await _completionAnimationView.PlayAsync(ct); await _completionAnimationView.PlayAsync(ct);
} }
finally finally
{ {
_isPlayingCompletionAnimation = false;
if (_completionAnimationInstance != null) if (_completionAnimationInstance != null)
_completionAnimationInstance.SetActive(false); _completionAnimationInstance.SetActive(false);
} }
@@ -133,6 +138,7 @@ public class ColoringController : IColoringController, IDisposable
public void Clear() public void Clear()
{ {
_history.Drop(); _history.Drop();
_isPlayingCompletionAnimation = false;
foreach (var button in _buttons) foreach (var button in _buttons)
if (button != null) if (button != null)

View File

@@ -136,6 +136,12 @@ namespace Darkmatter.Features.GameplayFlow.Systems
public async UniTask NextAsync(CancellationToken ct) public async UniTask NextAsync(CancellationToken ct)
{ {
// Drop any debounced autosave so it can't fire during/after the completion
// animation and capture the animation (or an empty paper) into the thumbnail.
_autosaveCts?.Cancel();
_autosaveCts?.Dispose();
_autosaveCts = null;
await SaveCurrentAsync(ct); await SaveCurrentAsync(ct);
_refs.Confetti.Play(); _refs.Confetti.Play();
_sfx.Play(SfxId.FireWorkLaunch); _sfx.Play(SfxId.FireWorkLaunch);

View File

@@ -36,6 +36,7 @@ namespace Darkmatter.Features.ShapeBuilder.UI
private Vector2 _origAnchorMax; private Vector2 _origAnchorMax;
private Vector2 _origPivot; private Vector2 _origPivot;
private bool _origPreserveAspect; private bool _origPreserveAspect;
private Vector3 _homeScale = Vector3.one;
// Per-drag state // Per-drag state
private RectTransform _rt; private RectTransform _rt;
@@ -45,6 +46,8 @@ namespace Darkmatter.Features.ShapeBuilder.UI
private Vector2 _trayPosInDragRoot; private Vector2 _trayPosInDragRoot;
private Vector2 _dragSizeDelta; private Vector2 _dragSizeDelta;
private Vector3 _dragLocalScale; private Vector3 _dragLocalScale;
private float _dragOrigAlpha;
private Tween _dragScaleTween;
private Sequence _previewSeq; private Sequence _previewSeq;
private Sequence _snapSettle; private Sequence _snapSettle;
private bool _locked; private bool _locked;
@@ -68,6 +71,14 @@ namespace Darkmatter.Features.ShapeBuilder.UI
if (image != null) image.color = color; if (image != null) image.color = color;
} }
private void SetAlpha(float a)
{
if (image == null) return;
var c = image.color;
c.a = a;
image.color = c;
}
public void Setup( public void Setup(
ShapeSO shape, ShapeSO shape,
SlotMarker[] candidateSlots, SlotMarker[] candidateSlots,
@@ -95,6 +106,7 @@ namespace Darkmatter.Features.ShapeBuilder.UI
_origAnchorMax = RectTransform.anchorMax; _origAnchorMax = RectTransform.anchorMax;
_origPivot = RectTransform.pivot; _origPivot = RectTransform.pivot;
_origPreserveAspect = image != null && image.preserveAspect; _origPreserveAspect = image != null && image.preserveAspect;
_homeScale = RectTransform.localScale;
image.sprite = shape.Sprite; image.sprite = shape.Sprite;
ApplyTrayPose(); ApplyTrayPose();
@@ -104,6 +116,10 @@ namespace Darkmatter.Features.ShapeBuilder.UI
{ {
if (_locked) return; if (_locked) return;
// Kill any tweens still running on this piece (e.g. a return/preview from a
// re-grab mid-animation) so the new drag starts from a clean, known pose.
Tween.StopAll(onTarget: RectTransform);
if (_dragRoot != null && RectTransform.parent != _dragRoot) if (_dragRoot != null && RectTransform.parent != _dragRoot)
{ {
RectTransform.SetParent(_dragRoot, worldPositionStays: true); RectTransform.SetParent(_dragRoot, worldPositionStays: true);
@@ -114,11 +130,20 @@ namespace Darkmatter.Features.ShapeBuilder.UI
_eventCam = e.pressEventCamera; _eventCam = e.pressEventCamera;
_trayPosInDragRoot = RectTransform.anchoredPosition; _trayPosInDragRoot = RectTransform.anchoredPosition;
_dragSizeDelta = RectTransform.sizeDelta; _dragSizeDelta = RectTransform.sizeDelta;
_dragLocalScale = RectTransform.localScale; // Use the canonical resting scale, not the live value, so a re-grab mid-tween
// can't bake a drifted scale into the drag base.
_dragLocalScale = _homeScale;
RectTransform.localScale = _homeScale;
_grabOffset = RectTransform.anchoredPosition - ScreenToLocal(e.position); _grabOffset = RectTransform.anchoredPosition - ScreenToLocal(e.position);
_inPreview = false; _inPreview = false;
Tween.LocalScale(RectTransform, _dragLocalScale * _cfg.DragScale, _cfg.SnapDuration, Ease.OutQuad); if (image != null)
{
_dragOrigAlpha = image.color.a;
SetAlpha(_cfg.DragAlpha);
}
_dragScaleTween = Tween.Scale(RectTransform, _dragLocalScale * _cfg.DragScale, _cfg.SnapDuration, Ease.OutQuad);
} }
public void OnDrag(PointerEventData e) public void OnDrag(PointerEventData e)
@@ -156,6 +181,12 @@ namespace Darkmatter.Features.ShapeBuilder.UI
{ {
if (_locked) return; if (_locked) return;
// Stop the begin-drag scale-up so it can't fight the return/snap pose.
// Leave _previewSeq alive — the snap path lets it settle.
if (_dragScaleTween.isAlive) _dragScaleTween.Stop();
SetAlpha(_dragOrigAlpha);
var target = FindSlotUnder(e.position); var target = FindSlotUnder(e.position);
if (target != null) if (target != null)
{ {
@@ -184,16 +215,18 @@ namespace Darkmatter.Features.ShapeBuilder.UI
private void AnimatePreviewPose(bool toSlot) private void AnimatePreviewPose(bool toSlot)
{ {
if (_dragScaleTween.isAlive) _dragScaleTween.Stop();
if (_previewSeq.isAlive) _previewSeq.Stop(); if (_previewSeq.isAlive) _previewSeq.Stop();
if (toSlot && _activeSlot != null) if (toSlot && _activeSlot != null)
{ {
var slot = _activeSlot.RectTransform; var slot = _activeSlot.RectTransform;
SlotPoseInDragSpace(out var slotRot, out var slotScale);
if (image != null) image.preserveAspect = false; if (image != null) image.preserveAspect = false;
_previewSeq = Sequence.Create() _previewSeq = Sequence.Create()
.Group(Tween.UIAnchoredPosition(RectTransform, SlotPosInDragSpace(), _cfg.SnapDuration, Ease.OutQuad)) .Group(Tween.UIAnchoredPosition(RectTransform, SlotPosInDragSpace(), _cfg.SnapDuration, Ease.OutQuad))
.Group(Tween.LocalScale(RectTransform, SlotScaleInDragSpace(), _cfg.SnapDuration, Ease.OutQuad)) .Group(Tween.LocalScale(RectTransform, slotScale, _cfg.SnapDuration, Ease.OutQuad))
.Group(Tween.LocalRotation(RectTransform, SlotRotInDragSpace(), _cfg.SnapDuration, Ease.OutQuad)) .Group(Tween.LocalRotation(RectTransform, slotRot, _cfg.SnapDuration, Ease.OutQuad))
.Group(Tween.UISizeDelta(RectTransform, slot.rect.size, _cfg.SnapDuration, Ease.OutQuad)); .Group(Tween.UISizeDelta(RectTransform, slot.rect.size, _cfg.SnapDuration, Ease.OutQuad));
} }
else else
@@ -222,19 +255,25 @@ namespace Darkmatter.Features.ShapeBuilder.UI
_inPreview = false; _inPreview = false;
} }
private Quaternion SlotRotInDragSpace() // Rotation + signed scale that make the piece (a child of the drag root) match the pose
// it will have once parented into the slot. Derived from the slot's local X/Y axes
// expressed in drag-root space: their angle gives the rotation, their lengths the scale,
// and their handedness the mirror. A quaternion + lossyScale pair can't encode a negative
// (mirrored) scale, which is why flipped slots previewed at the wrong orientation while the
// snapped piece — which inherits the slot's real transform — looked correct.
private void SlotPoseInDragSpace(out Quaternion rot, out Vector3 scale)
{ {
return Quaternion.Inverse(_parentRect.rotation) * _activeSlot.RectTransform.rotation; var slot = _activeSlot.RectTransform;
} Vector3 r = _parentRect.InverseTransformVector(slot.TransformVector(Vector3.right));
Vector3 u = _parentRect.InverseTransformVector(slot.TransformVector(Vector3.up));
private Vector3 SlotScaleInDragSpace() float angle = Mathf.Atan2(r.y, r.x) * Mathf.Rad2Deg;
{ float sx = new Vector2(r.x, r.y).magnitude;
Vector3 parentLossy = _parentRect.lossyScale; float sy = new Vector2(u.x, u.y).magnitude;
Vector3 slotLossy = _activeSlot.RectTransform.lossyScale; if (r.x * u.y - r.y * u.x < 0f) sy = -sy; // mirrored hierarchy -> flip one axis
return new Vector3(
slotLossy.x / Mathf.Max(0.0001f, parentLossy.x), rot = Quaternion.Euler(0f, 0f, angle);
slotLossy.y / Mathf.Max(0.0001f, parentLossy.y), scale = new Vector3(sx, sy, 1f);
slotLossy.z / Mathf.Max(0.0001f, parentLossy.z));
} }
internal void SnapInternal() internal void SnapInternal()
@@ -361,6 +400,7 @@ namespace Darkmatter.Features.ShapeBuilder.UI
{ {
RectTransform.sizeDelta = _traySize; RectTransform.sizeDelta = _traySize;
RectTransform.localRotation = Quaternion.identity; RectTransform.localRotation = Quaternion.identity;
RectTransform.localScale = _homeScale;
} }
private Vector2 ScreenToLocal(Vector2 screenPos) private Vector2 ScreenToLocal(Vector2 screenPos)

Binary file not shown.

Binary file not shown.

View File

@@ -281,8 +281,8 @@ RectTransform:
m_GameObject: {fileID: 2018849806684805117} m_GameObject: {fileID: 2018849806684805117}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.4066, y: 1.4066, z: 1.4066}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 86201234489763977} - {fileID: 86201234489763977}
- {fileID: 109331856778429183} - {fileID: 109331856778429183}

View File

@@ -26,8 +26,8 @@ RectTransform:
m_GameObject: {fileID: 970882496690282873} m_GameObject: {fileID: 970882496690282873}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.1503, y: 1.1503, z: 1.1503}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4862617518150298184} - {fileID: 4862617518150298184}
- {fileID: 1927978426257304632} - {fileID: 1927978426257304632}

View File

@@ -101,8 +101,8 @@ RectTransform:
m_GameObject: {fileID: 6408485857370138169} m_GameObject: {fileID: 6408485857370138169}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.2033, y: 1.2033, z: 1.2033}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 1214920657407418962} - {fileID: 1214920657407418962}
- {fileID: 6162131388587199005} - {fileID: 6162131388587199005}

View File

@@ -101,8 +101,8 @@ RectTransform:
m_GameObject: {fileID: 830151417515138702} m_GameObject: {fileID: 830151417515138702}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.2121, y: 1.2121, z: 1.2121}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 1060224653914720711} - {fileID: 1060224653914720711}
- {fileID: 3409973025274235484} - {fileID: 3409973025274235484}

View File

@@ -930,7 +930,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &3765577967584406493 --- !u!224 &3765577967584406493
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2013,8 +2013,8 @@ RectTransform:
m_GameObject: {fileID: 6684381930794325998} m_GameObject: {fileID: 6684381930794325998}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.2563, y: 1.2563, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4001251692510412888} - {fileID: 4001251692510412888}
- {fileID: 9065922355177954181} - {fileID: 9065922355177954181}
@@ -2022,7 +2022,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -324.28992} m_AnchoredPosition: {x: 18, y: -324.28992}
m_SizeDelta: {x: 484.2721, y: 79.242615} m_SizeDelta: {x: 484.2721, y: 79.242615}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6720628983119242459 --- !u!1 &6720628983119242459
@@ -3192,8 +3192,8 @@ RectTransform:
m_GameObject: {fileID: 8914662876087302500} m_GameObject: {fileID: 8914662876087302500}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.2563, y: 1.2563, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4452683220369286777} - {fileID: 4452683220369286777}
- {fileID: 1884834246100035824} - {fileID: 1884834246100035824}
@@ -3201,7 +3201,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.000030517578, y: 39.621277} m_AnchoredPosition: {x: -33, y: 39.621277}
m_SizeDelta: {x: 484.27228, y: 79.242615} m_SizeDelta: {x: 484.27228, y: 79.242615}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9047034408538749912 --- !u!1 &9047034408538749912

View File

@@ -28,8 +28,8 @@ RectTransform:
m_GameObject: {fileID: 8269026611177622940} m_GameObject: {fileID: 8269026611177622940}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.1414, y: 1.1414, z: 1.1414}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -14,6 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Services.Ads.AdUnitCatalogSO m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Services.Ads.AdUnitCatalogSO
androidAppId: ca-app-pub-3940256099942544~3347511713 androidAppId: ca-app-pub-3940256099942544~3347511713
iosAppId: ca-app-pub-3940256099942544~1458002511 iosAppId: ca-app-pub-3940256099942544~1458002511
useTestUnits: 1 useTestUnits: 0
testDeviceIds: [] testDeviceIds: []
entries: [] entries: []

View File

@@ -164,7 +164,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: Features.Capture::Darkmatter.Features.Capture.CaptureFeatureModule m_EditorClassIdentifier: Features.Capture::Darkmatter.Features.Capture.CaptureFeatureModule
captureScale: 1 captureScale: 1
galleryBackground: {fileID: 2800000, guid: 0c8e208e83531f84cb2b842025cdd232, type: 3}
captureButtonView: {fileID: 376589371} captureButtonView: {fileID: 376589371}
gallerySaveView: {fileID: 0} gallerySaveView: {fileID: 0}
--- !u!1 &64614225 --- !u!1 &64614225
@@ -551,7 +550,7 @@ RectTransform:
m_GameObject: {fileID: 259035377} m_GameObject: {fileID: 259035377}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.4399601, y: 1.4399601, z: 1.4399601} m_LocalScale: {x: 1.8345093, y: 1.8345093, z: 1.8345093}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1176170784} - {fileID: 1176170784}
@@ -559,7 +558,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -622.2647, y: 212} m_AnchoredPosition: {x: -718, y: 244}
m_SizeDelta: {x: 407.377, y: 163} m_SizeDelta: {x: 407.377, y: 163}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &259035379 --- !u!114 &259035379
@@ -821,7 +820,7 @@ RectTransform:
m_GameObject: {fileID: 376589366} m_GameObject: {fileID: 376589366}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2278218, y: 1.2278218, z: 1.2278218} m_LocalScale: {x: 1.3688985, y: 1.3688985, z: 1.3688985}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 153461769} m_Father: {fileID: 153461769}
@@ -2437,7 +2436,7 @@ RectTransform:
m_GameObject: {fileID: 1310839948} m_GameObject: {fileID: 1310839948}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.1945, y: 1.1945, z: 1.1945}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2058063738} - {fileID: 2058063738}
@@ -2446,7 +2445,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 505.82385, y: 200.40308} m_AnchoredPosition: {x: 505.82385, y: 257}
m_SizeDelta: {x: 660.4729, y: 319.02832} m_SizeDelta: {x: 660.4729, y: 319.02832}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1310839950 --- !u!114 &1310839950
@@ -3360,10 +3359,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: ArtBookView value: ArtBookView
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3521470624751981147, guid: 4dd2a1cb2754a410f9f807f563a55e7c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3765577967584406493, guid: 4dd2a1cb2754a410f9f807f563a55e7c, type: 3} - target: {fileID: 3765577967584406493, guid: 4dd2a1cb2754a410f9f807f563a55e7c, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0.5 value: 0.5

View File

@@ -1,13 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <?xml version="1.0" encoding="utf-8"?>
xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId> <groupId>com.google.firebase</groupId>
<artifactId>firebase-analytics-unity</artifactId> <artifactId>firebase-analytics-unity</artifactId>
<version>13.11.0</version> <version>13.11.0</version>
<packaging>aar</packaging> <packaging>srcaar</packaging>
<dependencies> <dependencies></dependencies>
</project>
</dependencies>
</project>

View File

@@ -1,13 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <?xml version="1.0" encoding="utf-8"?>
xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId> <groupId>com.google.firebase</groupId>
<artifactId>firebase-app-unity</artifactId> <artifactId>firebase-app-unity</artifactId>
<version>13.11.0</version> <version>13.11.0</version>
<packaging>aar</packaging> <packaging>srcaar</packaging>
<dependencies> <dependencies></dependencies>
</project>
</dependencies>
</project>

View File

@@ -1,13 +1,9 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <?xml version="1.0" encoding="utf-8"?>
xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId> <groupId>com.google.firebase</groupId>
<artifactId>firebase-crashlytics-unity</artifactId> <artifactId>firebase-crashlytics-unity</artifactId>
<version>13.11.0</version> <version>13.11.0</version>
<packaging>aar</packaging> <packaging>srcaar</packaging>
<dependencies> <dependencies></dependencies>
</project>
</dependencies>
</project>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,28 @@
fileFormatVersion: 2
guid: 29951eef4f9054aa88743cf6c4efbaae
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Android:
enabled: 0
settings: {}
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-analytics-unity</artifactId>
<version>13.11.0</version>
<packaging>aar</packaging>
<dependencies></dependencies>
</project>

View File

@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 07873cfa577e34134a09d460a78b614c
labels:
- gpsr
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@@ -0,0 +1,28 @@
fileFormatVersion: 2
guid: f6c1d3b42f439488c86ed09c55566281
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Android:
enabled: 0
settings: {}
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-app-unity</artifactId>
<version>13.11.0</version>
<packaging>aar</packaging>
<dependencies></dependencies>
</project>

View File

@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: bcd4da93c567b4aa19035656e33aaf4b
labels:
- gpsr
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@@ -0,0 +1,28 @@
fileFormatVersion: 2
guid: add8e2f66e218402db6fc41e44198373
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Android:
enabled: 0
settings: {}
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \&#xD;&#xA;http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-crashlytics-unity</artifactId>
<version>13.11.0</version>
<packaging>aar</packaging>
<dependencies></dependencies>
</project>

View File

@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: efefc32561a7c41d9b020a4f1391fa5c
labels:
- gpsr
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -9,7 +9,7 @@
<key>PLIST_VERSION</key> <key>PLIST_VERSION</key>
<string>1</string> <string>1</string>
<key>BUNDLE_ID</key> <key>BUNDLE_ID</key>
<string>com.Darkmatter.Colorbook</string> <string>com.Darkmatter.ColorbookGame</string>
<key>PROJECT_ID</key> <key>PROJECT_ID</key>
<string>colorbook-a7ceb</string> <string>colorbook-a7ceb</string>
<key>STORAGE_BUCKET</key> <key>STORAGE_BUCKET</key>
@@ -25,6 +25,6 @@
<key>IS_SIGNIN_ENABLED</key> <key>IS_SIGNIN_ENABLED</key>
<true></true> <true></true>
<key>GOOGLE_APP_ID</key> <key>GOOGLE_APP_ID</key>
<string>1:568157424262:ios:74b8e5566b3f8f09169f07</string> <string>1:568157424262:ios:689c16b54819f200169f07</string>
</dict> </dict>
</plist> </plist>

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e6141f644bb9c4f758d0190d56247d3c

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.firebase.app.unity"
android:versionCode="1"
android:versionName="1.0">
</manifest>

View File

@@ -0,0 +1,2 @@
target=android-9
android.library=true

View File

@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@string/gcm_defaultSenderId,@string/google_storage_bucket,@string/project_id,@string/google_api_key,@string/google_crash_reporting_api_key,@string/google_app_id">
<string name="gcm_defaultSenderId" translatable="false">568157424262</string>
<string name="google_storage_bucket" translatable="false">colorbook-a7ceb.firebasestorage.app</string>
<string name="project_id" translatable="false">colorbook-a7ceb</string>
<string name="google_api_key" translatable="false">AIzaSyCthjaDwaXXbGYRfe2MRazGdLVA1LuO7fo</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzaSyCthjaDwaXXbGYRfe2MRazGdLVA1LuO7fo</string>
<string name="google_app_id" translatable="false">1:568157424262:android:f1bef2a48d372257169f07</string>
</resources>

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2ff030e457b2b4eec9443a919902d0c3

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.firebase.crashlytics.unity"
android:versionCode="1"
android:versionName="1.0">
</manifest>

View File

@@ -0,0 +1,2 @@
target=android-9
android.library=true

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">b73866f8-08b2-41b7-a729-b72bb53d5a2f</string></resources>

View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?><resources><string name="com.google.firebase.crashlytics.unity_version" translatable="false">6000.4.5f1</string></resources>

View File

@@ -8,8 +8,19 @@ dependencies {
// Android Resolver Dependencies Start // Android Resolver Dependencies Start
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12 implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12
implementation 'androidx.lifecycle:lifecycle-process:2.6.2' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17 implementation 'androidx.lifecycle:lifecycle-process:2.6.2' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17
implementation 'com.android.installreferrer:installreferrer:2.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:7
implementation 'com.appsflyer:af-android-sdk:6.17.6' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:5
implementation 'com.appsflyer:unity-wrapper:6.17.91' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:6
implementation 'com.google.android.gms:play-services-ads:25.3.0' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7 implementation 'com.google.android.gms:play-services-ads:25.3.0' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7
implementation 'com.google.android.gms:play-services-base:18.10.0' // Assets/Firebase/Editor/AppDependencies.xml:20
implementation 'com.google.android.ump:user-messaging-platform:4.0.0' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 implementation 'com.google.android.ump:user-messaging-platform:4.0.0' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7
implementation 'com.google.firebase:firebase-analytics:23.2.0' // Assets/Firebase/Editor/CrashlyticsDependencies.xml:18
implementation 'com.google.firebase:firebase-analytics-unity:13.11.0' // Assets/Firebase/Editor/AnalyticsDependencies.xml:21
implementation 'com.google.firebase:firebase-app-unity:13.11.0' // Assets/Firebase/Editor/AppDependencies.xml:25
implementation 'com.google.firebase:firebase-common:22.0.1' // Assets/Firebase/Editor/AppDependencies.xml:16
implementation 'com.google.firebase:firebase-crashlytics-ndk:20.0.6' // Assets/Firebase/Editor/CrashlyticsDependencies.xml:16
implementation 'com.google.firebase:firebase-crashlytics-unity:13.11.0' // Assets/Firebase/Editor/CrashlyticsDependencies.xml:23
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10' // Assets/Smartlook/SmartlookAnalytics/Editor/SmartLookDependencies.xml:3
// Android Resolver Dependencies End // Android Resolver Dependencies End
**DEPS**} **DEPS**}

View File

@@ -19,6 +19,9 @@ dependencyResolutionManagement {
mavenCentral() mavenCentral()
// Android Resolver Repos Start // Android Resolver Repos Start
def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
maven {
url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AnalyticsDependencies.xml:21, Assets/Firebase/Editor/AppDependencies.xml:25, Assets/Firebase/Editor/CrashlyticsDependencies.xml:23
}
maven { maven {
url "https://maven.google.com/" // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 url "https://maven.google.com/" // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7
} }

8
Assets/Resources.meta Normal file
View File

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

View File

@@ -47,11 +47,11 @@ MonoBehaviour:
m_BuildSubtarget: 0 m_BuildSubtarget: 0
m_BuildSystem: 1 m_BuildSystem: 1
m_ExportAsGoogleAndroidProject: 0 m_ExportAsGoogleAndroidProject: 0
m_DebugSymbolLevel: 1 m_DebugSymbolLevel: 4
m_DebugSymbolFormat: 5 m_DebugSymbolFormat: 5
m_CurrentDeploymentTargetId: __builtin__target_default m_CurrentDeploymentTargetId: __builtin__target_default
m_BuildType: 2 m_BuildType: 2
m_LinkTimeOptimization: 0 m_LinkTimeOptimization: 0
m_BuildAppBundle: 0 m_BuildAppBundle: 1
m_IPAddressToConnect: m_IPAddressToConnect:
m_SymlinkSources: 0 m_SymlinkSources: 0

View File

@@ -2,10 +2,28 @@
<packages> <packages>
<package>androidx.constraintlayout:constraintlayout:2.1.4</package> <package>androidx.constraintlayout:constraintlayout:2.1.4</package>
<package>androidx.lifecycle:lifecycle-process:2.6.2</package> <package>androidx.lifecycle:lifecycle-process:2.6.2</package>
<package>com.android.installreferrer:installreferrer:2.1</package>
<package>com.appsflyer:af-android-sdk:6.17.6</package>
<package>com.appsflyer:unity-wrapper:6.17.91</package>
<package>com.google.android.gms:play-services-ads:25.3.0</package> <package>com.google.android.gms:play-services-ads:25.3.0</package>
<package>com.google.android.gms:play-services-base:18.10.0</package>
<package>com.google.android.ump:user-messaging-platform:4.0.0</package> <package>com.google.android.ump:user-messaging-platform:4.0.0</package>
<package>com.google.firebase:firebase-analytics:23.2.0</package>
<package>com.google.firebase:firebase-analytics-unity:13.11.0</package>
<package>com.google.firebase:firebase-app-unity:13.11.0</package>
<package>com.google.firebase:firebase-common:22.0.1</package>
<package>com.google.firebase:firebase-crashlytics-ndk:20.0.6</package>
<package>com.google.firebase:firebase-crashlytics-unity:13.11.0</package>
<package>org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10</package>
</packages> </packages>
<files /> <files>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.11.0/firebase-analytics-unity-13.11.0.aar</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.11.0/firebase-analytics-unity-13.11.0.pom</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.11.0/firebase-app-unity-13.11.0.aar</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.11.0/firebase-app-unity-13.11.0.pom</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.11.0/firebase-crashlytics-unity-13.11.0.aar</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.11.0/firebase-crashlytics-unity-13.11.0.pom</file>
</files>
<settings> <settings>
<setting name="androidAbis" value="arm64-v8a" /> <setting name="androidAbis" value="arm64-v8a" />
<setting name="bundleId" value="com.Darkmatter.Colorbook" /> <setting name="bundleId" value="com.Darkmatter.Colorbook" />

View File

@@ -146,6 +146,7 @@ PlayerSettings:
bundleVersion: 1.0 bundleVersion: 1.0
preloadedAssets: preloadedAssets:
- {fileID: 11400000, guid: cc969dbecb228fa49b16da9273753a8f, type: 2} - {fileID: 11400000, guid: cc969dbecb228fa49b16da9273753a8f, type: 2}
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
xboxOneDisableKinectGpuReservation: 1 xboxOneDisableKinectGpuReservation: 1
@@ -167,7 +168,7 @@ PlayerSettings:
applicationIdentifier: applicationIdentifier:
Android: com.Darkmatter.Colorbook Android: com.Darkmatter.Colorbook
Standalone: com.DefaultCompany.2D-URP Standalone: com.DefaultCompany.2D-URP
iPhone: com.Darkmatter.Colorbook iPhone: com.Darkmatter.ColorbookGame
buildNumber: buildNumber:
Standalone: 0 Standalone: 0
VisionOS: 0 VisionOS: 0