chore: update coffee tools

mob-sakai · Dec 1, 2024 · f4dfbf7 · f4dfbf7
1 parent a6cdec9
commit f4dfbf7
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 2,478 deletions.
diff --git a/Assets/ProjectSettings/NanoMonitor.prefab b/Assets/ProjectSettings/NanoMonitor.prefab
diff --git a/Assets/ProjectSettings/NanoMonitor.prefab.meta b/Assets/ProjectSettings/NanoMonitor.prefab.meta
diff --git a/Assets/ProjectSettings/NanoMonitor.asset → ...Settings/NanoMonitorProjectSettings.asset b/Assets/ProjectSettings/NanoMonitor.asset → ...Settings/NanoMonitorProjectSettings.asset
@@ -18,11 +18,12 @@ MonoBehaviour:
   m_EnabledInEditor: 1
   m_AlwaysIncludeAssembly: 1
   m_InstantiateOnLoad: 1
-  m_Prefab: {fileID: 7211429669315726685, guid: 1aecfdb937e634516a88b0876dab18ed,
+  m_Prefab: {fileID: 4567906826058368312, guid: 7cebff2d255b9433cbe23b243c193329,
     type: 3}
   m_Interval: 0.5
   m_Anchor: 0
   m_Width: 750
+  m_HelpUrl: https://github.com/mob-sakai/SoftMaskForUGUI
   m_CustomMonitorItems:
   - m_Format: Screen:{0}x{1}
     m_Arg0:

diff --git a/...ts/ProjectSettings/NanoMonitor.asset.meta → ...ngs/NanoMonitorProjectSettings.asset.meta b/...ts/ProjectSettings/NanoMonitor.asset.meta → ...ngs/NanoMonitorProjectSettings.asset.meta
diff --git a/Assets/ProjectSettings/UISoftMaskProjectSettings.asset b/Assets/ProjectSettings/UISoftMaskProjectSettings.asset
@@ -15,11 +15,23 @@ ShaderVariantCollection:
         passType: 0
       - keywords: SOFTMASKABLE UNITY_UI_ALPHACLIP
         passType: 0
+      - keywords: SOFTMASKABLE UNITY_UI_CLIP_RECT
+        passType: 0
   - first: {fileID: 4800000, guid: 2933b413a51fc4ff3a83c7ef4177ae84, type: 3}
     second:
       variants:
       - keywords: 
         passType: 0
+  - first: {fileID: 4800000, guid: 33e06cd3c50064f30a691b600fc62f3f, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 4800000, guid: 935b7be1c88464d2eb87204fdfab5a38, type: 3}
+    second:
+      variants:
+      - keywords: GLOW_ON SOFTMASKABLE
+        passType: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -37,7 +49,7 @@ MonoBehaviour:
   m_TransformSensitivity: 1
   m_HideGeneratedComponents: 1
   m_ShaderVariantRegistry:
-    m_ErrorOnUnregisteredVariant: 0
     m_OptionalShaders: []
-    m_UnregisteredVariants: []
     m_Asset: {fileID: -3771181682974605552}
+    m_ErrorOnUnregisteredVariant: 0
+    m_UnregisteredVariants: []
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.coffee.development": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/Development",
+    "com.coffee.minimal-resource": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
     "com.coffee.nano-monitor": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
     "com.unity.ide.rider": "3.0.31",
     "com.unity.test-framework": "1.1.33",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -5,7 +5,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "805474a9e49f534ff01bf75405bcd415ed57083c"
+      "hash": "066c8d232f76517762e8d0332353588eb0ca93d9"
+    },
+    "com.coffee.minimal-resource": {
+      "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "066c8d232f76517762e8d0332353588eb0ca93d9"
     },
     "com.coffee.nano-monitor": {
       "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
@@ -14,7 +21,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "hash": "2efcc6a8fc4dda8e6d4cf8492ca952cd0542641d"
+      "hash": "066c8d232f76517762e8d0332353588eb0ca93d9"
     },
     "com.coffee.softmask-for-ugui": {
       "version": "file:src",

diff --git a/Packages/src/Runtime/Coffee.SoftMaskForUGUI.R.dll b/Packages/src/Runtime/Coffee.SoftMaskForUGUI.R.dll
diff --git a/Packages/src/Runtime/Coffee.SoftMaskForUGUI.R.dll.meta b/Packages/src/Runtime/Coffee.SoftMaskForUGUI.R.dll.meta
diff --git a/Packages/src/Samples~/Demo/SoftMask_Demo.unity b/Packages/src/Samples~/Demo/SoftMask_Demo.unity
@@ -24079,7 +24079,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: SoftMask For uGUI v2.0.0
+  m_Text: SoftMask For uGUI v3.0.0
 --- !u!222 &1590748270
 CanvasRenderer:
   m_ObjectHideFlags: 0

diff --git a/ProjectSettings/MinimalResourceSettings.json b/ProjectSettings/MinimalResourceSettings.json
@@ -0,0 +1,11 @@
+{
+    "MonoBehaviour": {
+        "m_Enabled": true,
+        "m_EditorHideFlags": 0,
+        "m_Name": "",
+        "m_EditorClassIdentifier": "",
+        "m_OutputDllPaths": [
+            "Packages/com.coffee.softmask-for-ugui/Runtime/Coffee.SoftMaskForUGUI.R.dll"
+        ]
+    }
+}