feat: Dialogue system text should not be raycast target

jcs090218 · Aug 23, 2024 · b61fb23 · b61fb23
1 parent 6bfdf4b
commit b61fb23
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/Assets/JCSUnity/Resources/UI/JCS_DialogueSystem (Game Pad).prefab b/Assets/JCSUnity/Resources/UI/JCS_DialogueSystem (Game Pad).prefab
@@ -231,7 +231,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -688,7 +688,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2906,7 +2906,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -4124,7 +4124,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &764007139224113502
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4231,7 +4231,6 @@ MonoBehaviour:
   mSelectTextIndex: 0
   mRenderSelectTextIndex: 0
   mMakeHoverSelect: 1
-  mTransparentSprite: {fileID: 21300000, guid: e1c46e9108b163a43a4756374739521a, type: 3}
   mCenterImage: {fileID: 123926847607488668}
   mLeftImage: {fileID: 3259919901683074881}
   mRightImage: {fileID: 6393945804426866846}

diff --git a/Assets/JCSUnity/Resources/UI/JCS_DialogueSystem.prefab b/Assets/JCSUnity/Resources/UI/JCS_DialogueSystem.prefab
@@ -908,7 +908,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1940,7 +1940,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2338,7 +2338,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &984955064616139632
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2445,7 +2445,6 @@ MonoBehaviour:
   mSelectTextIndex: 0
   mRenderSelectTextIndex: 0
   mMakeHoverSelect: 1
-  mTransparentSprite: {fileID: 21300000, guid: e1c46e9108b163a43a4756374739521a, type: 3}
   mCenterImage: {fileID: 2786463899866065582}
   mLeftImage: {fileID: 8909120425116114928}
   mRightImage: {fileID: 6546777816282174048}
@@ -4168,7 +4167,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

diff --git a/Assets/JCSUnity/Scenes/Utilities/JCS_ScriptTester.unity b/Assets/JCSUnity/Scenes/Utilities/JCS_ScriptTester.unity
@@ -1290,6 +1290,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: JCS_DialogueSystem (Game Pad)
       objectReference: {fileID: 0}
+    - target: {fileID: 7657870147620464614, guid: c7ea891da8aadd741a2b75f708a50d65,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1408,6 +1413,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: JCS_DialogueSystem
       objectReference: {fileID: 0}
+    - target: {fileID: 4431048296620540127, guid: 11e5c739135b1e34d8a1164d3c66f6f8,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

diff --git a/Assets/PackageExporter/unityignore/JCSUnity.unityignore b/Assets/PackageExporter/unityignore/JCSUnity.unityignore
@@ -3,7 +3,7 @@
 # unityignore file.
 #
 # Package Name: JCSUnity
-# Version: 2.1.4
+# Version: 2.4.1
 # Creation Date: 2019-02-04 20:44:15
 #
 # Package Link: https://github.com/Pixisoft/PackageExporter

diff --git a/Assets/PackageExporter/unityignore/JCSUnity_ExampleProjects.unityignore b/Assets/PackageExporter/unityignore/JCSUnity_ExampleProjects.unityignore
@@ -3,7 +3,7 @@
 # unityignore file.
 #
 # Package Name: JCSUnity_ExampleProjects
-# Version: 2.1.4
+# Version: 2.4.1
 # Creation Date: 2019-02-04 20:44:15
 #
 # Package Link: https://github.com/Pixisoft/PackageExporter

diff --git a/Assets/PackageExporter/unityignore/JCSUnity_Release.unityignore b/Assets/PackageExporter/unityignore/JCSUnity_Release.unityignore
@@ -3,7 +3,7 @@
 # unityignore file.
 #
 # Package Name: JCSUnity_Release
-# Version: 2.1.4
+# Version: 2.4.1
 # Creation Date: 2019-02-04 20:44:15
 #
 # Package Link: https://github.com/Pixisoft/PackageExporter

diff --git a/Assets/PackageExporter/unityignore/JCSUnity_Trimmed.unityignore b/Assets/PackageExporter/unityignore/JCSUnity_Trimmed.unityignore
@@ -3,7 +3,7 @@
 # unityignore file.
 #
 # Package Name: JCSUnity_Trimmed
-# Version: 2.2.0
+# Version: 2.4.1
 # Creation Date: 2021-08-16 02:14:17
 #
 # Package Link: https://github.com/Pixisoft/PackageExporter