From 43d34f274eee6f5a888b44c1f879312a655c3821 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Wed, 20 Sep 2023 15:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=8E=A9=E5=8A=9F=E8=83=BD=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=8A=A0=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BoardEditorTools/BoardEditorWindow.cs     |  40 ++++++++++++++++++
 ...battle_controller_full_moon_skin.lua.bytes | Bin 3228 -> 4027 bytes
 2 files changed, 40 insertions(+)

diff --git a/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs b/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs
index 124f5856b..c40f47066 100644
--- a/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs
+++ b/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs
@@ -29,6 +29,7 @@ namespace BFEditor
         string boardFiledName = "board";
         string boardEdgeFiledName = "grid_edge";
         string randomTypeStr = "";
+        string boardEdgeStr = "";
         int curIndex = 1;
         int maxRow = 7;
         Dictionary<int, Dictionary<string, string>> boardGridTypeDict = new Dictionary<int, Dictionary<string, string>>();
@@ -341,6 +342,45 @@ namespace BFEditor
                 boardDict[curIndex] = ja;
             }
             GUILayout.EndHorizontal();
+            GUILayout.EndVertical();
+            GUILayout.EndArea();
+            GUILayout.BeginArea(new Rect(730, 650, 500, 100));
+            GUILayout.BeginVertical();
+            GUILayout.Label("棋盘边缘元素");
+            boardEdgeStr = GUILayout.TextField(boardEdgeStr, GUILayout.Width(500), GUILayout.Height(300));
+            if(GUILayout.Button("重新加载边缘元素"))
+            {
+                string[] units = boardEdgeStr.Split('{');
+                List<string> edgeList = new List<string>();
+                for (int i = 0; i < units.Length; i++)
+                {
+                    string formatStr = units[i].Replace("[", "").Replace("]", "").Replace(" ", "").Replace("}", "");
+                    string[] unitList = formatStr.Split(',');
+                    if (unitList.Length >= 3)
+                    {
+                        string str = "[";
+                        for(int j = 0; j < 3; j++)
+                        {
+                            str = str + unitList[j];
+                            if (j != 2)
+                            {
+                                str = str + ",";
+                            }
+                        }
+                        str = str + "]";
+                        edgeList.Add(str);
+                    }
+                }
+
+                JArray ja = new JArray();
+                for (int i = 0; i < edgeList.Count; i++)
+                {
+                    JArray unit = (JArray)JsonConvert.DeserializeObject(edgeList[i]);
+                    ja.Add(unit);
+                }
+                edgeDict[curIndex] = ja;
+            }
+            GUILayout.EndVertical();
             GUILayout.EndArea();
             if(GUI.Button(new Rect(1050, 10, 100, 30), "导出到Excel"))
             {
diff --git a/Assets/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.bytes
index 32702d2db0e90b6e39f7c2255b497243a10c7940..299af53b1b97d1d04c8f5c6be356bfb162a2bcf6 100644
GIT binary patch
literal 4027
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
M@SlC3Hs|qw0;UkNssI20

literal 3228
zcmb`K-BV)s8OITM6VL@g5amS>5C!!BN8|uUzy$??C@il6tL};};>$T8h$4EOOxu~X
z$zRakB$>&$yUEtfbfy>CPMXQ=v~@a}Ui3DTY}1$3bW=0aG<^=M+f1)|(aX<#`906`
zd*05EJ8MgY?YrfDVs~k?x>6iAr;UNpOZ#lVQLU~ZT&oYO2hq|*B!-X~Wxb+jq&ZkW
zYjJoeC%(<gu!M$OY9!0_y78Ps+%FX{kcik+;w%p8r<Dq3p61Ym#kvw}QRCX7_tBEM
z4s-gYJz{ILT=2Q;9q33k5)+@3_l_=fzSGkn`VRPupP%1*1N6#e@X<%0ADo|m`Nl<y
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