Merge branch 'master' into pr/780

This commit is contained in:
minenice55 2024-03-11 15:52:08 -04:00
commit 02eb3f48f9
18 changed files with 42 additions and 40 deletions

View file

@ -80,18 +80,20 @@
-<indent=5%>JoyShockLibrary <alpha=#88>Jibb Smart, fork by RHeavenStudio<alpha=#FF></indent>
-<indent=5%>Jukebox <alpha=#88>RHeavenStudio<alpha=#FF></indent>
-<indent=5%>SoftMaskForUGUI</indent>
-<indent=5%>UniTask</indent>
-<indent=5%>Unity-UI-Rounded-Corners</indent>
-<indent=5%>Unity-AltSourceGenerator</indent>
-<indent=5%>Unity-SpriteAssist</indent>
-<indent=5%>unity-blend-shaders</indent>
-<indent=5%>Newtonsoft.Json</indent>
-<indent=5%>Graphy</indent>
-<indent=5%>Dependencies Hunter</indent>
-<indent=5%>DOTween</indent>
-<indent=5%>StandaloneFileBrowser</indent>
-<indent=5%>unity-gui-windows</indent>
-<indent=5%>Graphy</indent>
-<indent=5%>NaughtyBezierCurves</indent>
-<indent=5%>Newtonsoft.Json</indent>
-<indent=5%>SoftMaskForUGUI</indent>
-<indent=5%>StandaloneFileBrowser</indent>
-<indent=5%>TMPro Dynamic Data Cleaner</indent>
-<indent=5%>UniTask</indent>
-<indent=5%>Unity-AltSourceGenerator</indent>
-<indent=5%>unity-blend-shaders</indent>
-<indent=5%>unity-gui-windows</indent>
-<indent=5%>Unity-UI-Rounded-Corners</indent>
-<indent=5%>Unity-SpriteAssist</indent>
-<indent=5%>Adobe Photoshop 2022</indent>
-<indent=5%>GIMP</indent>

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e26d981abcd77d5448ccaa92c574872c
guid: 694b3e744e58b2442b4ede6f2ffe61d1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a4c2f5cd7962ba546a5ddd6a668c9a5c
guid: e10c611faab584343bfd746f494757d8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4ebb2524b438ac3468d9163869e71aae
guid: 29bed73ba09f13d478fb84d2a1b2287c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6cb673ed358fb0e4eae478b10bc90078
guid: 528cdd1bfda3eb84fbf479874fff4a08
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1f0c2f500917b624eae7a1ce1b5dead1
guid: 7b3b1b4748bb6b64489f26117a9ec63f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d6856a1aa3df73846aa58b1ce0aeffbd
guid: 31ded632b1c11844f8e24cfa259e166c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8e7ad8f161670b44a83cb3c16cf475de
guid: d55e8d1a68fe0564ba271dbc9c7d128c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f18bfa81c9b45e4b951b328639605c5
guid: 2a85ff0492831f347b9f535cb9c5f8d5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8e48afda272d9974fae07d9cb1a37e6e
guid: 430c52bde91e7a14290556b1408d313c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a148ff049e28fdb48839cd13227f704e
guid: bda5b69e5ed01c24e865bfb60ef845d4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cd74d29343f572a4c98ad8ff56dee58a
guid: 56cef913220404949a36fcb0e3829e6c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cf7fe752c767d3e44b89633dba9c577d
guid: eb48cecb8dddddd4a9351918adc974c0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: aefcf24393073c243a00cbc75dbd5217
guid: b0494cddfd02426439df908de076f101
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1cde5f3b37ab37f43aa373f7e744054a
guid: caef6de8fb925954884716f9338b027b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a410f2954b767eb4b8c20b1eff8a9847
guid: b49af6e7de4f243428d0ad29c2c5d12d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View file

@ -6,6 +6,7 @@
"com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox",
"com.sator-imaging.alt-source-generator": "https://github.com/sator-imaging/Unity-AltSourceGenerator.git",
"com.sr4dev.unity-spriteassist": "https://github.com/sr4dev/Unity-SpriteAssist.git?path=Assets/SpriteAssist",
"com.starasgames.tmpro-dynamic-data-cleaner": "https://github.com/STARasGAMES/tmpro-dynamic-data-cleaner.git#upm",
"com.tayx.graphy": "https://github.com/Tayx94/graphy.git",
"com.unity.2d.sprite": "1.0.0",
"com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git",
@ -21,8 +22,8 @@
"com.unity.ugui": "1.0.0",
"com.zigurous.shaders.blending": "https://github.com/zigurous/unity-blend-shaders.git",
"jillejr.newtonsoft.json-for-unity.converters": "1.3.0",
"unity-dependencies-hunter": "https://github.com/AlexeyPerov/Unity-Dependencies-Hunter.git#upm",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
@ -47,7 +48,6 @@
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",

View file

@ -47,6 +47,13 @@
"dependencies": {},
"hash": "2ee960d718cc2ac2c4a2ae847a83df23a7b56b66"
},
"com.starasgames.tmpro-dynamic-data-cleaner": {
"version": "https://github.com/STARasGAMES/tmpro-dynamic-data-cleaner.git#upm",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "3a3607621431b0173bea325a53fb34e8d574f995"
},
"com.tayx.graphy": {
"version": "https://github.com/Tayx94/graphy.git",
"depth": 0,
@ -179,13 +186,14 @@
"dependencies": {},
"url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"unity-dependencies-hunter": {
"version": "https://github.com/AlexeyPerov/Unity-Dependencies-Hunter.git#upm",
"depth": 0,
"source": "builtin",
"dependencies": {}
"source": "git",
"dependencies": {},
"hash": "f5f9b5d2f168c7ab0f0a65d99db97e3763501a85"
},
"com.unity.modules.androidjni": {
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
@ -389,14 +397,6 @@
"com.unity.modules.imageconversion": "1.0.0"
}
},
"com.unity.modules.vehicles": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.physics": "1.0.0"
}
},
"com.unity.modules.video": {
"version": "1.0.0",
"depth": 0,