From cd8e7f7c02d8e9778cf70883fea656f53fd7a7f9 Mon Sep 17 00:00:00 2001 From: dmitryvhf Date: Mon, 27 Jan 2020 23:47:47 +0500 Subject: [PATCH] Issue #18 resolved; MultiSellEditor crash problem; update TargetFramework to .Net 4.8 --- L2ScriptMaker/L2ScriptMaker.vbproj | 10 +++++--- L2ScriptMaker/L2ScriptMakerLibraries.vb | 9 +++++++- .../My Project/Application.Designer.vb | 2 +- L2ScriptMaker/My Project/AssemblyInfo.vb | 6 ++--- .../My Project/Resources.Designer.vb | 22 ++++++++++++++++-- L2ScriptMaker/My Project/Settings.Designer.vb | 6 ++--- L2ScriptMaker/app.config | 23 +++++++++++++++++++ 7 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 L2ScriptMaker/app.config diff --git a/L2ScriptMaker/L2ScriptMaker.vbproj b/L2ScriptMaker/L2ScriptMaker.vbproj index cea8680..a9393d7 100644 --- a/L2ScriptMaker/L2ScriptMaker.vbproj +++ b/L2ScriptMaker/L2ScriptMaker.vbproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -23,7 +23,7 @@ 3.5 My Project\app.manifest On - v3.5 + v4.8 false @@ -44,6 +44,7 @@ 1.0.0.%2a false true + true @@ -60,6 +61,7 @@ false 1 AllRules.ruleset + false None @@ -73,6 +75,7 @@ false 1 AllRules.ruleset + false @@ -946,6 +949,7 @@ + MyApplicationCodeGenerator Application.Designer.vb @@ -999,7 +1003,7 @@ - + \ No newline at end of file diff --git a/L2ScriptMaker/L2ScriptMakerLibraries.vb b/L2ScriptMaker/L2ScriptMakerLibraries.vb index e024aa6..ebb6997 100644 --- a/L2ScriptMaker/L2ScriptMakerLibraries.vb +++ b/L2ScriptMaker/L2ScriptMakerLibraries.vb @@ -9,7 +9,7 @@ Public Class Libraries End Function - Shared Function GetCommentaryFromStr(ByVal SourceStr As String) As String + Private Shared Function GetCommentaryFromStr(ByVal SourceStr As String) As String GetCommentaryFromStr = Nothing Dim sTempCommentary As String = "" @@ -21,6 +21,7 @@ Public Class Libraries Return GetCommentaryFromStr End Function + Shared Function SetNeedParamToStr(ByVal SourceStr As String, ByVal Param As String, ByVal Value As String) As String Dim sTemp As String @@ -73,6 +74,12 @@ Public Class Libraries FirstPos = InStr(1, SourceStr, " " & MaskStr & "=") ' + 1 If FirstPos = Nothing Then 'Or FirstPos = 0 + + If SourceStr.StartsWith(MaskStr) Then + GetNeedParamFromStr = SourceStr.Remove(0, MaskStr.Length + 1).Trim() + Exit Function + End If + GetNeedParamFromStr = "" Exit Function End If diff --git a/L2ScriptMaker/My Project/Application.Designer.vb b/L2ScriptMaker/My Project/Application.Designer.vb index 0bec653..c83d01a 100644 --- a/L2ScriptMaker/My Project/Application.Designer.vb +++ b/L2ScriptMaker/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30128.1 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/L2ScriptMaker/My Project/AssemblyInfo.vb b/L2ScriptMaker/My Project/AssemblyInfo.vb index a37950a..0b353e2 100644 --- a/L2ScriptMaker/My Project/AssemblyInfo.vb +++ b/L2ScriptMaker/My Project/AssemblyInfo.vb @@ -8,8 +8,8 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - - + + @@ -34,4 +34,4 @@ Imports System.Runtime.InteropServices ' - + diff --git a/L2ScriptMaker/My Project/Resources.Designer.vb b/L2ScriptMaker/My Project/Resources.Designer.vb index 6af5e45..38a306b 100644 --- a/L2ScriptMaker/My Project/Resources.Designer.vb +++ b/L2ScriptMaker/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30128.1 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ @@ -60,6 +60,9 @@ Namespace My.Resources End Set End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property avatar14_22() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("avatar14_22", resourceCulture) @@ -67,6 +70,9 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property Dragon() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Dragon", resourceCulture) @@ -74,6 +80,9 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property hell_logo() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("hell_logo", resourceCulture) @@ -81,6 +90,9 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property Picture4L2RangeMaker() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Picture4L2RangeMaker", resourceCulture) @@ -88,6 +100,9 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property RussianPartizanen2() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("RussianPartizanen2", resourceCulture) @@ -95,6 +110,9 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' Friend ReadOnly Property RussianPartizanen2_ne() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("RussianPartizanen2_ne", resourceCulture) diff --git a/L2ScriptMaker/My Project/Settings.Designer.vb b/L2ScriptMaker/My Project/Settings.Designer.vb index 81a7640..f332ce9 100644 --- a/L2ScriptMaker/My Project/Settings.Designer.vb +++ b/L2ScriptMaker/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30128.1 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -14,7 +14,7 @@ Option Explicit On _ Partial Friend NotInheritable Class Settings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -28,7 +28,7 @@ Partial Friend NotInheritable Class Settings Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/L2ScriptMaker/app.config b/L2ScriptMaker/app.config new file mode 100644 index 0000000..b5cb6d5 --- /dev/null +++ b/L2ScriptMaker/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + +