From 35f81fb30aa8f266dc7af416ca145657948a2f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A8=81=E6=AD=A6=E5=A0=82=E5=A0=82?= <1638241511@qq.com>
Date: Sun, 29 Jan 2023 11:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Excel/Language.xlsx                           | Bin 11853 -> 11799 bytes
 Masterdulepre/.vs/masterdulepre/v17/.suo      | Bin 1100288 -> 1101824 bytes
 .../Assets/Editor/Excel2Lua/ExcelTransfer.cs  |  22 +++++++-----------
 .../Assets/LuaFramework/Lua/Common/const.lua  |   7 ------
 .../LuaFramework/Lua/Common/debuger.lua       |   8 +++----
 .../LuaFramework/Lua/Config/Language.lua      |  13 ++++++-----
 .../Assets/LuaFramework/Lua/Logic/Main.lua    |   5 ++--
 .../LuaFramework/Lua/View/Menu/MenuPanel.lua  |  12 ++++------
 .../Assets/ResAssets/Menu/MenuPanel.prefab    |  16 ++++---------
 9 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/Excel/Language.xlsx b/Excel/Language.xlsx
index ae9e034c23a10fb083c641655d888d8449b6b2ab..f49961c31f7f524153e873f191faed4ca4f5115d 100644
GIT binary patch
delta 3122
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
ME+Yn1DgXcg0D|(=L;wH)

delta 3211
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

diff --git a/Masterdulepre/.vs/masterdulepre/v17/.suo b/Masterdulepre/.vs/masterdulepre/v17/.suo
index 4ab06dca2c6ea387d35418afd59f88552a064ee4..f6cfc5ee7e1ffbc245f01583f0cf3d35794c57ff 100644
GIT binary patch
delta 4396
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

delta 5533
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
AJpcdz

diff --git a/Masterdulepre/Assets/Editor/Excel2Lua/ExcelTransfer.cs b/Masterdulepre/Assets/Editor/Excel2Lua/ExcelTransfer.cs
index 82e0cf0..5f7b0c2 100644
--- a/Masterdulepre/Assets/Editor/Excel2Lua/ExcelTransfer.cs
+++ b/Masterdulepre/Assets/Editor/Excel2Lua/ExcelTransfer.cs
@@ -12,7 +12,7 @@ namespace Excel2Lua
         /// <summary>
         /// Excel数组开始行数
         /// </summary>
-        const int BGN_ROW = 5;
+        const int BGN_ROW = 3;
 
         /// <summary>
         /// 源字符组
@@ -129,22 +129,18 @@ namespace Excel2Lua
             stringBuilder.Append("local data = {\n");
             for (int i = BGN_ROW; i <= GetSheetRows(sheet); i++)
             {
-                string data = sheet.GetRow(i).GetCell(1).ToString().Trim();
-                if (!string.IsNullOrEmpty(data))
+                stringBuilder.AppendFormat("\t[{0}] = ", i - 2);
+                stringBuilder.Append("{");
+                for (int j = 1; j < GetSheetColonums(sheet); j++)
                 {
-                    stringBuilder.AppendFormat("\t[{0}] = ", data);
-                    stringBuilder.Append("{");
-                    for (int j = 1; j < GetSheetColonums(sheet); j++)
+                    string cellData = sheet.GetRow(i).GetCell(j).ToString().Trim();
+                    if (!string.IsNullOrEmpty(cellData))
                     {
-                        string cellData = sheet.GetRow(i).GetCell(j).ToString().Trim();
-                        if (!string.IsNullOrEmpty(cellData))
-                        {
-                            cellData = ParseCellDataByType(filedMap[j], cellData);
-                            stringBuilder.AppendFormat("[{0}]={1},", j, cellData);
-                        }
+                        cellData = ParseCellDataByType(filedMap[j], cellData);
+                        stringBuilder.AppendFormat("[{0}]={1},", j, cellData);
                     }
-                    stringBuilder.Append("},\n");
                 }
+                stringBuilder.Append("},\n");
             }
             stringBuilder.Append("}\n\n");
             #endregion 转化内容
diff --git a/Masterdulepre/Assets/LuaFramework/Lua/Common/const.lua b/Masterdulepre/Assets/LuaFramework/Lua/Common/const.lua
index da834c9..daa5563 100644
--- a/Masterdulepre/Assets/LuaFramework/Lua/Common/const.lua
+++ b/Masterdulepre/Assets/LuaFramework/Lua/Common/const.lua
@@ -1,7 +1,5 @@
 
 -- 常量管理
-is_editor = UnityEngine.Application.isEditor
-
 Protocal = {
 	Connect		= '101';	--连接服务器
 	Exception   = '102';	--异常掉线
@@ -14,11 +12,6 @@ Protocal = {
 --     LUA_NETWORK_RESEND_SUCCESSFULLY = "LUA_NETWORK_RESEND_SUCCESSFULLY",
 -- }
 
--- LANGUAGE =
--- {
---     "zh",--中文
---     "en"--英文
--- }
 
 
 const = const or {}
diff --git a/Masterdulepre/Assets/LuaFramework/Lua/Common/debuger.lua b/Masterdulepre/Assets/LuaFramework/Lua/Common/debuger.lua
index 6c0f38f..fcebf8d 100644
--- a/Masterdulepre/Assets/LuaFramework/Lua/Common/debuger.lua
+++ b/Masterdulepre/Assets/LuaFramework/Lua/Common/debuger.lua
@@ -1,6 +1,6 @@
 -- 输出日志--
 function log(str)
-    if is_editor then
+    if Is_Editor then
         local luaStackStr = debug.traceback(str, 0)
         Util.Log(luaStackStr)
     else
@@ -10,7 +10,7 @@ function log(str)
 end
 
 function logGreen(str)
-    if is_editor then
+    if Is_Editor then
         local luaStackStr = debug.traceback(str, 0)
         Util.LogGreen(luaStackStr)
     else
@@ -19,7 +19,7 @@ function logGreen(str)
 end
 
 function LogYellow(str)
-    if is_editor then
+    if Is_Editor then
         local luaStackStr = debug.traceback(str, 0)
         Util.LogYellow(luaStackStr)
     else
@@ -28,7 +28,7 @@ function LogYellow(str)
 end
 
 function LogBlue(str)
-    if is_editor then
+    if Is_Editor then
         local luaStackStr = debug.traceback(str, 0)
         Util.LogBlue(luaStackStr)
     else
diff --git a/Masterdulepre/Assets/LuaFramework/Lua/Config/Language.lua b/Masterdulepre/Assets/LuaFramework/Lua/Config/Language.lua
index e4061d5..91f2df1 100644
--- a/Masterdulepre/Assets/LuaFramework/Lua/Config/Language.lua
+++ b/Masterdulepre/Assets/LuaFramework/Lua/Config/Language.lua
@@ -1,15 +1,16 @@
 --[[Notice: This lua config file is auto generate by Language.xlsx，don't modify it manually! --]]
 
 local indexData = {
-	key = 1, --主键 
-	zh = 2, --中文 
-	des = 3, --中文描述 
+	zh = 1, --中文 
+	des = 2, --中文描述 
 }
 
 local data = {
-	[3] = {[1]=3,[2]='擂台',[3]='使用擂台主自定义规则对战',},
-	[4] = {[1]=4,[2]='构筑',[3]='制作一张卡',},
-	[5] = {[1]=5,[2]='牌库',[3]='包含系统赠送和自定义卡牌和卡组',},
+	[1] = {[1]='剧情',[2]='技巧引导和背景故事',},
+	[2] = {[1]='排位',[2]='使用标准规则进行对战',},
+	[3] = {[1]='擂台',[2]='使用擂台主自定义规则对战',},
+	[4] = {[1]='构筑',[2]='制作一张卡',},
+	[5] = {[1]='牌库',[2]='包含系统赠送和自定义卡牌和卡组',},
 }
 
 local mt = {}
diff --git a/Masterdulepre/Assets/LuaFramework/Lua/Logic/Main.lua b/Masterdulepre/Assets/LuaFramework/Lua/Logic/Main.lua
index 7f35f6c..3bb4545 100644
--- a/Masterdulepre/Assets/LuaFramework/Lua/Logic/Main.lua
+++ b/Masterdulepre/Assets/LuaFramework/Lua/Logic/Main.lua
@@ -1,9 +1,10 @@
 -- 入口脚本
 Main = Main or {}
+Is_Editor = UnityEngine.Application.isEditor
 
 function Main.Init()
-   log("Lua Main.Init")
-   const:Init()
+    log("Lua Main.Init")
+    const:Init()
 end
 
 function Main.Start()
diff --git a/Masterdulepre/Assets/LuaFramework/Lua/View/Menu/MenuPanel.lua b/Masterdulepre/Assets/LuaFramework/Lua/View/Menu/MenuPanel.lua
index 6446d92..2c90d66 100644
--- a/Masterdulepre/Assets/LuaFramework/Lua/View/Menu/MenuPanel.lua
+++ b/Masterdulepre/Assets/LuaFramework/Lua/View/Menu/MenuPanel.lua
@@ -2,18 +2,16 @@
 MenuPanel = ViewBase:New("MenuPanel", true)
 
 function MenuPanel:OnShow()
-    local Par_snow = self.binder:GetObj("Par_snow")
-    Par_snow:Play()
-    local Ani_box = self.binder:GetObj("Ani_box")
-    Ani_box:Play("UI3d_Box_chuxian")
+    self.binder:GetObj("Par_snow"):Play()
+    self.binder:GetObj("Ani_box"):Play("UI3d_Box_chuxian")
 end
 
 function MenuPanel:OnHide()
-    Par_snow:Stop()
+    self.binder:GetObj("Par_snow"):Stop()
 end
 
-function MenuPanel:OnClick_Btn_chess()
-    
+function MenuPanel:OnClick_Btn_rank()
+    self.binder:GetObj("Te_rank").text = ""
 end
 
 
diff --git a/Masterdulepre/Assets/ResAssets/Menu/MenuPanel.prefab b/Masterdulepre/Assets/ResAssets/Menu/MenuPanel.prefab
index e15abe1..f01306f 100644
--- a/Masterdulepre/Assets/ResAssets/Menu/MenuPanel.prefab
+++ b/Masterdulepre/Assets/ResAssets/Menu/MenuPanel.prefab
@@ -5955,13 +5955,13 @@ MonoBehaviour:
     obj: {fileID: 4765649833677787987}
   - name: Btn_story
     obj: {fileID: 7731447238900948756}
-  - name: Te_war
+  - name: Te_rank
     obj: {fileID: 87621599633251042}
-  - name: Btn_war
+  - name: Btn_rank
     obj: {fileID: 2621985431312564303}
-  - name: Btn_other
+  - name: Btn_arena
     obj: {fileID: 2673485502122126147}
-  - name: Te_other
+  - name: Te_arena
     obj: {fileID: 87621599141157135}
   - name: Btn_cards
     obj: {fileID: 4561376170413005867}
@@ -5971,14 +5971,6 @@ MonoBehaviour:
     obj: {fileID: 281550965111508810}
   - name: Te_build
     obj: {fileID: 87621598770888904}
-  - name: sdasda
-    obj: {fileID: 1796881594}
-  - name: sdasdasa
-    obj: {fileID: 471395263}
-  - name: sdasad
-    obj: {fileID: 471395263}
-  - name: asdasda
-    obj: {fileID: 1796881594}
 --- !u!95 &87621597751403527
 Animator:
   serializedVersion: 4
-- 
GitLab