0.12.5.0

Buizz · Jun 24, 2021 · 3858154 · 3858154
1 parent 2ff93a7
commit 3858154
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git a/EUD Editor 3/App.config b/EUD Editor 3/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <runtime>
     <gcAllowVeryLargeObjects enabled="true"/>

diff --git a/EUD Editor 3/Class/TriggerEditor/ClassicEditor/ArgValue.vb b/EUD Editor 3/Class/TriggerEditor/ClassicEditor/ArgValue.vb
@@ -68,7 +68,7 @@ Public Class ArgValue
                     v = "UnitProperty(" & v & ")"
                 End If
 
-                If ValueType = "TrgString" Or ValueType = "FormatString" Then
+                If ValueType = "TrgString" Or ValueType = "FormatString" Or ValueType = "WAVName" Then
                     v = """" & v & """"
                 ElseIf isLuaCover Then
                     Dim tlist() As String = {"TrgAllyStatus", "TrgComparison", "TrgModifier", "TrgOrder",

diff --git a/EUD Editor 3/Data/Lua/TriggerEditor/BtnRefresh.lua b/EUD Editor 3/Data/Lua/TriggerEditor/BtnRefresh.lua
@@ -8,9 +8,9 @@
 
 @Language.en-US
 @Summary
-버튼을 다시그립니다.
+Refresh the button.
 @Group
-일반
+Basic
 ]================================]
 function BtnRefresh()
 	echo([[const btntemp1 = wread_epd(EPD(0x6615AA), 2);

diff --git a/EUD Editor 3/EUD Editor 3.vbproj b/EUD Editor 3/EUD Editor 3.vbproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>EUD_Editor_3</RootNamespace>
     <AssemblyName>EUD Editor 3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>

diff --git a/EUD Editor 3/Language/en-US.xaml b/EUD Editor 3/Language/en-US.xaml
@@ -898,6 +898,7 @@
     <sys:String x:Key="Invalide2s">Invalid e2s file!</sys:String>
      <sys:String x:Key="LodingError">An error occurred while loading $S0$.</sys:String>
 
+    <sys:String x:Key="Comment">Comment</sys:String>
     <sys:String x:Key="Control">Ctrl</sys:String>
     <sys:String x:Key="plibFunc">Plib</sys:String>
     <sys:String x:Key="Func">Func</sys:String>
@@ -1143,6 +1144,8 @@
     <sys:String x:Key="CT_OnlyCode">OnlyCode</sys:String>
     <sys:String x:Key="CT_CodeText">Trigger Code</sys:String>
 
+    <sys:String x:Key="CT_ActionNotExist">No action.</sys:String>
+    <sys:String x:Key="CT_ConditionNotExist">No condition.</sys:String>
 
     <sys:String x:Key="DirectDonate">DirectDonate</sys:String>
     <sys:String x:Key="ViewDonateWindow">Do not show again</sys:String>

diff --git a/EUD Editor 3/Language/ko-KR.xaml b/EUD Editor 3/Language/ko-KR.xaml
@@ -896,6 +896,7 @@
     <sys:String x:Key="Invalide2s">올바른 e2s파일이 아닙니다!</sys:String>
     <sys:String x:Key="LodingError">$S0$를 불러오는 과정에서 오류가 발생했습니다.</sys:String>
 
+    <sys:String x:Key="Comment">주석</sys:String>
     <sys:String x:Key="Control">제어</sys:String>
     <sys:String x:Key="plibFunc">플립</sys:String>
     <sys:String x:Key="Func">함수</sys:String>
@@ -1146,9 +1147,10 @@
 
     <sys:String x:Key="CT_OnlyCode">코드만 출력</sys:String>
     <sys:String x:Key="CT_CodeText">트리거 코드</sys:String>
-
-
-
+
+    <sys:String x:Key="CT_ActionNotExist">액션이 없습니다.</sys:String>
+    <sys:String x:Key="CT_ConditionNotExist">조건이 없습니다.</sys:String>
+
     <sys:String x:Key="DirectDonate">직접후원</sys:String>
     <sys:String x:Key="ViewDonateWindow">다시 보지 않기</sys:String>
 

diff --git a/EUD Editor 3/My Project/AssemblyInfo.vb b/EUD Editor 3/My Project/AssemblyInfo.vb
@@ -55,5 +55,5 @@ Imports System.Windows
 ' 지정되도록 할 수 있습니다.
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("0.12.4.0")>
-<Assembly: AssemblyFileVersion("0.12.4.0")>
+<Assembly: AssemblyVersion("0.12.5.0")>
+<Assembly: AssemblyFileVersion("0.12.5.0")>
diff --git a/EUD Editor 3/My Project/Settings.Designer.vb b/EUD Editor 3/My Project/Settings.Designer.vb
diff --git a/EUD Editor 3/UserContorl/CodeEditor/CodeEditor.xaml.vb b/EUD Editor 3/UserContorl/CodeEditor/CodeEditor.xaml.vb
@@ -34,8 +34,6 @@ Public Class CodeEditor
 
 
 
-
-
         Dim sStart As Integer
         Dim sEnd As Integer
         Dim sLen As Integer

diff --git a/EUD Editor 3/UserContorl/TriggerEditor/ClassicTrigger/TriggerBlock.xaml b/EUD Editor 3/UserContorl/TriggerEditor/ClassicTrigger/TriggerBlock.xaml
@@ -15,17 +15,17 @@
         </StackPanel>
         <DockPanel DockPanel.Dock="Top">
             <ToggleButton x:Name="TriggerEnabledCB" HorizontalAlignment="Center" VerticalAlignment="Center" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked" Style="{StaticResource MaterialDesignSwitchToggleButton}" Margin="4,0,0,0"/>
-            <CheckBox x:Name="TriggerPreservedCB" HorizontalAlignment="Center" Content="무한 반복 트리거" VerticalAlignment="Center" Checked="PreservedCheckBox_Checked" Unchecked="PreservedCheckBox_Unchecked" Margin="4,0"/>
-            <TextBlock x:Name="CommentTB" Text="주석" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,2,0,0" Style="{StaticResource MaterialDesignHeadline6TextBlock}" Height="30"/>
+            <CheckBox x:Name="TriggerPreservedCB" HorizontalAlignment="Center" Content="{StaticResource CT_Preserved}" VerticalAlignment="Center" Checked="PreservedCheckBox_Checked" Unchecked="PreservedCheckBox_Unchecked" Margin="4,0"/>
+            <TextBlock x:Name="CommentTB" Text="{StaticResource Comment}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,2,0,0" Style="{StaticResource MaterialDesignHeadline6TextBlock}" Height="30"/>
         </DockPanel>
 
 
         <StackPanel x:Name="ContentPanel">
-            <TextBlock Text="조건" Style="{StaticResource MaterialDesignHeadline6TextBlock}"/>
+            <TextBlock Text="{StaticResource Condition}" Style="{StaticResource MaterialDesignHeadline6TextBlock}"/>
             <StackPanel x:Name="ConditionPanel" Margin="20,0,0,0">
 
             </StackPanel>
-            <TextBlock Text="액션" Style="{StaticResource MaterialDesignHeadline6TextBlock}"/>
+            <TextBlock Text="{StaticResource Action}" Style="{StaticResource MaterialDesignHeadline6TextBlock}"/>
             <StackPanel x:Name="ActionPanel" Margin="20,0,0,0">
 
             </StackPanel>

diff --git a/EUD Editor 3/UserContorl/TriggerEditor/ClassicTrigger/TriggerBlock.xaml.vb b/EUD Editor 3/UserContorl/TriggerEditor/ClassicTrigger/TriggerBlock.xaml.vb
@@ -35,7 +35,7 @@ Public Class TriggerBlock
             Next
             If trg.Condition.Count = 0 Then
                 Dim tlabel As New Label
-                tlabel.Content = "조건이 없습니다."
+                tlabel.Content = Tool.GetLanText("CT_ConditionNotExist")
 
                 ConditionPanel.Children.Add(tlabel)
             End If
@@ -49,7 +49,7 @@ Public Class TriggerBlock
             Next
             If trg.Actions.Count = 0 Then
                 Dim tlabel As New Label
-                tlabel.Content = "액션이 없습니다."
+                tlabel.Content = Tool.GetLanText("CT_ActionNotExist")
 
                 ActionPanel.Children.Add(tlabel)
             End If