savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
Savya Bikram Shah
2026-06-07 16:59:51 +05:45
parent 176d95ec6a 435988ca70
commit 36cf9cdad1
65 changed files with 8333 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProjectSettings/AndroidResolverDependencies.xml
View File

@@ -23,6 +23,10 @@
<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>com.google.firebase:firebase-iid:21.1.0</package>
<package>com.google.firebase:firebase-messaging:25.0.2</package>
<package>com.google.firebase:firebase-messaging-unity:13.11.0</package>
<package>com.google.flatbuffers:flatbuffers-java:1.12.0</package>
<package>com.parse.bolts:bolts-android:1.4.0</package>
<package>org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10</package>
</packages>
@@ -33,6 +37,8 @@
<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>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.11.0/firebase-messaging-unity-13.11.0.aar</file>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.11.0/firebase-messaging-unity-13.11.0.pom</file>
</files>
<settings>
<setting name="androidAbis" value="arm64-v8a" />

2
ProjectSettings/EditorBuildSettings.asset
View File

@@ -15,7 +15,7 @@ EditorBuildSettings:
path: Assets/Darkmatter/Scenes/Colorbook.unity
guid: 145ae55f6571bfe4fbadaefb863ba69d
- enabled: 1
path: Assets/Darkmatter/Scenes/Gameplay.unity
path: Assets/Darkmatter/Scenes/GamePlay.unity
guid: e5f73f24e812e4a98b4c17d533fd3d6d
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 732f53b1f9e534015be7dcd28d7032bd, type: 2}