From 239e35260fc6df19ff8ac7438e0951e9dd358eed Mon Sep 17 00:00:00 2001
From: zhandouxiaojiji <zhandouxiaojiji@gmail.com>
Date: Tue, 27 Feb 2024 11:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=EF=BC=9Alu?=
 =?UTF-8?q?a=20=3D>=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 render-process/Editor/NodePanel.tsx |  4 +--
 sample/node-config.json             |  2 +-
 sample/workdir/monster.json         | 56 ++++++++++++++++++++++++++++-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/render-process/Editor/NodePanel.tsx b/render-process/Editor/NodePanel.tsx
index 9820c03..ba3debe 100644
--- a/render-process/Editor/NodePanel.tsx
+++ b/render-process/Editor/NodePanel.tsx
@@ -211,8 +211,8 @@ export default class NodePanel extends React.Component<NodePanelProps> {
                 return <InputNumber style={{ width: "100%" }} onBlur={this.handleSubmit} />;
             } else if (e.type.indexOf("boolean") >= 0) {
                 return <Switch onChange={this.handleSubmit} />;
-            } else if (e.type.indexOf("lua") >= 0) {
-                return <Input onBlur={this.handleSubmit} placeholder={"公式"} />;
+            } else if (e.type.indexOf("code") >= 0) {
+                return <Input onBlur={this.handleSubmit} placeholder={"表达式"} />;
             } else if (e.type.indexOf("enum") >= 0 ) {
                 return <Select style={{ width: 120 }} onChange={this.handleSubmit} >
                     {
diff --git a/sample/node-config.json b/sample/node-config.json
index 622777a..ccbef76 100644
--- a/sample/node-config.json
+++ b/sample/node-config.json
@@ -1 +1 @@
-[{"name":"AlwaysFail","type":"Decorator","doc":"+ 只能有一个子节点,多个仅执行第一个\n+ 不管子节点是否成功都返回失败\n","desc":"始终返回失败"},{"name":"AlwaysSuccess","type":"Decorator","doc":"+ 只能有一个子节点,多个仅执行第一个\n+ 不管子节点是否成功都返回成功\n","desc":"始终返回成功"},{"name":"Attack","type":"Action","input":["{目标}"],"desc":"攻击"},{"name":"Cmp","type":"Condition","doc":"+ 若值为空，返回失败\n+ 非整数类型可能会报错\n","input":["值(int)"],"args":[{"name":"value","desc":"值","type":"lua?"},{"name":"gt","desc":">","type":"int?"},{"name":"ge","desc":">=","type":"int?"},{"name":"eq","desc":"==","type":"int?"},{"name":"le","desc":"<=","type":"int?"},{"name":"lt","desc":"<","type":"int?"}],"desc":"比较值大小"},{"name":"FindEnemy","output":["目标单位"],"type":"Condition","doc":"+ 没找到返回失败\n","args":[{"name":"x","desc":"x","type":"int?"},{"name":"y","desc":"y","type":"int?"},{"name":"w","desc":"宽","type":"int?"},{"name":"h","desc":"高","type":"int?"},{"name":"count","desc":"查找上限","type":"string?"}],"desc":"查找敌人"},{"name":"GetHp","output":["生命值"],"type":"Action","desc":"获取生命值"},{"name":"Idle","type":"Action","desc":"待机"},{"name":"Log","type":"Action","args":[{"name":"str","desc":"日志","type":"string"}],"desc":"打印日志"},{"name":"MoveToPos","type":"Action","args":[{"name":"x","desc":"x","type":"int"},{"name":"y","desc":"y","type":"int"}],"desc":"移动到坐标"},{"name":"MoveToTarget","type":"Action","input":["{目标}"],"desc":"移动到目标"},{"name":"Not","type":"Decorator","doc":"+ 将子节点的返回值取反\n","desc":"取反"},{"name":"Parallel","type":"Composite","doc":"执行所有子节点并返回成功\n","desc":"并行执行"},{"name":"Selector","type":"Composite","doc":"+ 一直往下执行，有子节点返回成功则返回成功，若全部节点返回失败则返回失败\n+ 子节点是或的关系\n","desc":"选择执行"},{"name":"Sequence","type":"Composite","doc":"+ 一直往下执行，有子节点返回成功则返回成功，若全部节点返回失败则返回失败\n+ 子节点是或的关系\n","desc":"顺序执行"},{"name":"Wait","type":"Action","args":[{"name":"time","desc":"时间/tick","type":"int"}],"desc":"等待"}]
\ No newline at end of file
+[{"name":"AlwaysFail","type":"Decorator","doc":"+ 只能有一个子节点,多个仅执行第一个\n+ 不管子节点是否成功都返回失败\n","desc":"始终返回失败"},{"name":"AlwaysSuccess","type":"Decorator","doc":"+ 只能有一个子节点,多个仅执行第一个\n+ 不管子节点是否成功都返回成功\n","desc":"始终返回成功"},{"name":"Attack","type":"Action","input":["{目标}"],"desc":"攻击"},{"name":"Cmp","type":"Condition","doc":"+ 若值为空，返回失败\n+ 非整数类型可能会报错\n","input":["值(int)"],"args":[{"name":"value","desc":"值","type":"code?"},{"name":"gt","desc":">","type":"int?"},{"name":"ge","desc":">=","type":"int?"},{"name":"eq","desc":"==","type":"int?"},{"name":"le","desc":"<=","type":"int?"},{"name":"lt","desc":"<","type":"int?"}],"desc":"比较值大小"},{"name":"FindEnemy","output":["目标单位"],"type":"Condition","doc":"+ 没找到返回失败\n","args":[{"name":"x","desc":"x","type":"int?"},{"name":"y","desc":"y","type":"int?"},{"name":"w","desc":"宽","type":"int?"},{"name":"h","desc":"高","type":"int?"},{"name":"count","desc":"查找上限","type":"string?"}],"desc":"查找敌人"},{"name":"GetHp","output":["生命值"],"type":"Action","desc":"获取生命值"},{"name":"Idle","type":"Action","desc":"待机"},{"name":"Log","type":"Action","args":[{"name":"str","desc":"日志","type":"string"}],"desc":"打印日志"},{"name":"MoveToPos","type":"Action","args":[{"name":"x","desc":"x","type":"int"},{"name":"y","desc":"y","type":"int"}],"desc":"移动到坐标"},{"name":"MoveToTarget","type":"Action","input":["{目标}"],"desc":"移动到目标"},{"name":"Not","type":"Decorator","doc":"+ 将子节点的返回值取反\n","desc":"取反"},{"name":"Parallel","type":"Composite","doc":"执行所有子节点并返回成功\n","desc":"并行执行"},{"name":"Selector","type":"Composite","doc":"+ 一直往下执行，有子节点返回成功则返回成功，若全部节点返回失败则返回失败\n+ 子节点是或的关系\n","desc":"选择执行"},{"name":"Sequence","type":"Composite","doc":"+ 一直往下执行，有子节点返回成功则返回成功，若全部节点返回失败则返回失败\n+ 子节点是或的关系\n","desc":"顺序执行"},{"name":"Wait","type":"Action","args":[{"name":"time","desc":"时间/tick","type":"int"}],"desc":"等待"}]
\ No newline at end of file
diff --git a/sample/workdir/monster.json b/sample/workdir/monster.json
index 6fc4aa6..72cda92 100644
--- a/sample/workdir/monster.json
+++ b/sample/workdir/monster.json
@@ -1 +1,55 @@
-{"name":"monster","root":{"id":1,"name":"Sequence","desc":"怪物测试AI","args":{},"children":[{"id":2,"name":"Sequence","desc":"攻击","args":{},"children":[{"id":3,"name":"GetHp","args":{},"output":["hp"]},{"id":4,"name":"Cmp","args":{"gt":50},"input":["hp"]},{"id":5,"name":"Log","desc":"攻击","args":{"str":"Attack!"}}]},{"id":6,"name":"Log","desc":"逃跑","args":{"str":"Run!"}}]},"desc":"怪物测试AI"}
\ No newline at end of file
+{
+  "name": "monster",
+  "root": {
+    "id": 1,
+    "name": "Sequence",
+    "desc": "怪物测试AI",
+    "args": {},
+    "children": [
+      {
+        "id": 2,
+        "name": "Sequence",
+        "desc": "攻击",
+        "args": {},
+        "children": [
+          {
+            "id": 3,
+            "name": "GetHp",
+            "args": {},
+            "output": [
+              "hp"
+            ]
+          },
+          {
+            "id": 4,
+            "name": "Cmp",
+            "args": {
+              "gt": 50,
+              "value": "hp"
+            },
+            "input": [
+              ""
+            ]
+          },
+          {
+            "id": 5,
+            "name": "Log",
+            "desc": "攻击",
+            "args": {
+              "str": "Attack!"
+            }
+          }
+        ]
+      },
+      {
+        "id": 6,
+        "name": "Log",
+        "desc": "逃跑",
+        "args": {
+          "str": "Run!"
+        }
+      }
+    ]
+  },
+  "desc": "怪物测试AI"
+}
\ No newline at end of file