From 678bd02878d3afbac25b16aa38829a29795b13ab Mon Sep 17 00:00:00 2001
From: Meeeyo <meeeyo@163.com>
Date: Sun, 27 Apr 2025 09:14:41 +0800
Subject: [PATCH] Add files via upload

---
 __init__.py         | 12 ++++++++++++
 meyo_node_String.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/__init__.py b/__init__.py
index 2089e00..93e56ab 100644
--- a/__init__.py
+++ b/__init__.py
@@ -24,16 +24,22 @@ NODE_CLASS_MAPPINGS = {
     #字符串处理：meyo_node_String
     "SingleTextInput": SingleTextInput,  
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
     "TextToList": TextToList,  
     "TextConcatenator": TextConcatenator,  
     "MultiParamInputNode": MultiParamInputNode,
     "NumberExtractor": NumberExtractor, 
+<<<<<<< HEAD
+=======
 =======
     "TextConcatenator": TextConcatenator,  
     "MultiParamInputNode": MultiParamInputNode,
     "NumberExtractor": NumberExtractor, 
 
 >>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
     "AddPrefixSuffix": AddPrefixSuffix,
     "ExtractSubstring": ExtractSubstring,
     "ExtractSubstringByIndices": ExtractSubstringByIndices,
@@ -96,6 +102,9 @@ NODE_DISPLAY_NAME_MAPPINGS = {
 
    #字符串处理：meyo_node_String
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
    "SingleTextInput": "文本输入🐠meeeyo.com",
    "TextToList": "文本到列表🐠meeeyo.com",
    "TextConcatenator": "文本拼接🐠meeeyo.com",  
@@ -129,6 +138,8 @@ NODE_DISPLAY_NAME_MAPPINGS = {
    "ExtractSpecificData": "提取多层指定数据🐠meeeyo.com",
    "FindFirstLineContent": "指定字符行参数🐠meeeyo.com",
    "GenerateVideoPrompt": "视频指令词模板🐠meeeyo.com",
+<<<<<<< HEAD
+=======
 =======
    "SingleTextInput": "文本输入(meeeyo.com)",  
    "TextConcatenator": "文本拼接(meeeyo.com)",  
@@ -163,6 +174,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
    "FindFirstLineContent": "指定字符行参数(meeeyo.com)",
    "GenerateVideoPrompt": "视频指令词模板(meeeyo.com)",
 >>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
 
    #文件处理：meyo_node_File
    "LoadAndAdjustImage": "加载重置图像🐠meeeyo.com",
diff --git a/meyo_node_String.py b/meyo_node_String.py
index 2beb442..2af0723 100644
--- a/meyo_node_String.py
+++ b/meyo_node_String.py
@@ -113,6 +113,8 @@ class TextConcatenator:
         except Exception as e:
             return (f"Error: {str(e)}",)
         
+<<<<<<< HEAD
+=======
 
 #======文本拼接
 class TextConcatenator:
@@ -159,6 +161,7 @@ class TextConcatenator:
         except Exception as e:
             return (f"Error: {str(e)}",)
         
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
 
 #======多参数输入
 class MultiParamInputNode:
@@ -176,6 +179,16 @@ class MultiParamInputNode:
     RETURN_TYPES = ("STRING", "STRING", "INT", "INT")  # 返回两个字符串和两个整数
     FUNCTION = "process_inputs"
     OUTPUT_NODE = False
+<<<<<<< HEAD
+    CATEGORY = "Meeeyo/String"
+    DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo"
+    
+    def IS_CHANGED():
+        return float("NaN")
+    
+    def process_inputs(self, text1, text2, int1, int2):
+        return (text1, text2, int1, int2)
+=======
     CATEGORY = "Meeeyo/String"
     DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo"
     
@@ -216,6 +229,32 @@ class NumberExtractor:
     def process_inputs(self, int1, int2):
         return (int1, int2)
 
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
+
+
+#======整数参数
+class NumberExtractor:
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "int1": ("INT", {"default": 0, "min": -1000000, "max": 1000000}),  # 第一个整数输入框
+                "int2": ("INT", {"default": 0, "min": -1000000, "max": 1000000}),  # 第二个整数输入框
+            }
+        }
+
+    RETURN_TYPES = ("INT", "INT")  # 返回两个整数
+    FUNCTION = "process_inputs"
+    OUTPUT_NODE = False
+    CATEGORY = "Meeeyo/String"
+    DESCRIPTION = "如需更多帮助或商务需求(For tech and business support)+VX/WeChat: meeeyo"
+    
+    def IS_CHANGED():
+        return float("NaN")
+    
+    def process_inputs(self, int1, int2):
+        return (int1, int2)
+
 
 
 #======添加前后缀
@@ -1417,8 +1456,14 @@ class GenerateVideoPrompt:
     def IS_CHANGED():
         return float("NaN")
     
+=======
+<<<<<<< HEAD
+    def IS_CHANGED():
+        return float("NaN")
+    
 =======
 >>>>>>> b7ed81e9e5c54e5f2fa5775e72a7718ed2b72f70
+>>>>>>> 5ca49a6a21427c2123b3fa353c9270990af0b82a
     def generate_prompt(self, input_text, mode):
         try:
             if mode == "原文本":