2.3.5.3

DataEditorX/Core/Mse/MSEConfig.cs

@@ -42,7 +42,7 @@ public class MSEConfig
 		public const string TAG_WIDTH="width";
 		public const string TAG_HEIGHT="height";
 		
-		
+		public const string TAG_REIMAGE="reimage";
 		public const string TAG_PEND_WIDTH="pwidth";
 		public const string TAG_PEND_HEIGHT="pheight";
 
@@ -133,6 +133,8 @@ public void SetConfig(string config, string path)
 				else if (line.StartsWith(TAG_TYPE))
 				{//类型
 					ConfHelper.DicAdd(typeDic, line);
+				}else if(line.StartsWith(TAG_REIMAGE)){
+					reimage = ConfHelper.getBooleanValue(line);
 				}
 			}
 		}
@@ -152,6 +154,10 @@ public void init(string path)
 			SetConfig(tmp, path);
 		}
 		/// <summary>
+		/// 是否调整图片
+		/// </summary>
+		public bool reimage;
+		/// <summary>
 		/// 中间图宽度
 		/// </summary>
 		public int width;

DataEditorX/Core/Mse/MseMaker.cs

@@ -726,12 +726,17 @@ public Card[] ReadCards(string set, bool repalceOld)
 		}
 		#endregion
 		
+		#region images
 		/// <summary>
 		/// 图片缓存
 		/// </summary>
 		/// <param name="img"></param>
 		/// <returns></returns>
 		public string getImageCache(string img,Card card){
+			if(!cfg.reimage){
+				//不需要调整
+				return img;
+			}
 			bool isPendulum =card!=null && card.IsType(CardType.TYPE_PENDULUM);
 			if(isPendulum){
 				if(cfg.pwidth<=0 && cfg.pheight<=0)
@@ -760,6 +765,9 @@ public Card[] ReadCards(string set, bool repalceOld)
 			}
 			return file;
 		}
+		#endregion
+		
+		#region export
 		private static void exportSetThread(object obj){
 			string[] args=(string[])obj;
 			if(args==null||args.Length<3){
@@ -799,5 +807,22 @@ public Card[] ReadCards(string set, bool repalceOld)
 			myThread.IsBackground=true;
 			myThread.Start(new string[]{mse_path,setfile,path});
 		}
+		#endregion
+		
+		#region test
+		public void testPendulum(string desc){
+			if(desc==null||desc.Length==0){
+				MessageBox.Show("desc is null", "info");
+			}else{
+				string ptext=GetDesc(desc, cfg.regx_pendulum);
+				MessageBox.Show(reItalic(ptext), "pendulum");
+				string text = GetDesc(desc, cfg.regx_monster);
+				if (string.IsNullOrEmpty(text))
+					text = desc;
+				MessageBox.Show(reItalic(text), "effect");
+			}
+
+		}
+		#endregion
 	}
 }

DataEditorX/Core/TaskHelper.cs

@@ -100,6 +100,10 @@ public MyTask getLastTask()
         {
             return lastTask;
         }
+        
+        public void testPendulumText(string desc){
+        	mseHelper.testPendulum(desc);
+        }
         #endregion
 
         #region Other

DataEditorX/DataEditForm.Designer.cs

@@ -52,6 +52,8 @@ private void InitializeComponent()
         	this.menuitem_readmse = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_saveasmse_select = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_saveasmse = new System.Windows.Forms.ToolStripMenuItem();
+        	this.menuitem_exportMSEimage = new System.Windows.Forms.ToolStripMenuItem();
+        	this.menuitem_testpendulumtext = new System.Windows.Forms.ToolStripMenuItem();
         	this.tsep7 = new System.Windows.Forms.ToolStripSeparator();
         	this.menuitem_importmseimg = new System.Windows.Forms.ToolStripMenuItem();
         	this.menu_data = new System.Windows.Forms.ToolStripMenuItem();
@@ -126,7 +128,6 @@ private void InitializeComponent()
         	this.lv_cardlist = new System.Windows.Forms.DListView();
         	this.ch_cardcode = new System.Windows.Forms.ColumnHeader();
         	this.ch_cardname = new System.Windows.Forms.ColumnHeader();
-        	this.menuitem_exportMSEimage = new System.Windows.Forms.ToolStripMenuItem();
         	this.mainMenu.SuspendLayout();
         	this.SuspendLayout();
         	// 
@@ -221,6 +222,7 @@ private void InitializeComponent()
         	        	        	this.menuitem_saveasmse_select,
         	        	        	this.menuitem_saveasmse,
         	        	        	this.menuitem_exportMSEimage,
+        	        	        	this.menuitem_testpendulumtext,
         	        	        	this.tsep7,
         	        	        	this.menuitem_importmseimg});
         	this.menu_image.Name = "menu_image";
@@ -259,6 +261,20 @@ private void InitializeComponent()
         	this.menuitem_saveasmse.Text = "All Now Save As MSE";
         	this.menuitem_saveasmse.Click += new System.EventHandler(this.Menuitem_saveasmseClick);
         	// 
+        	// menuitem_exportMSEimage
+        	// 
+        	this.menuitem_exportMSEimage.Name = "menuitem_exportMSEimage";
+        	this.menuitem_exportMSEimage.Size = new System.Drawing.Size(230, 22);
+        	this.menuitem_exportMSEimage.Text = "Export MSE-Set to Images";
+        	this.menuitem_exportMSEimage.Click += new System.EventHandler(this.Menuitem_exportMSEimageClick);
+        	// 
+        	// menuitem_testpendulumtext
+        	// 
+        	this.menuitem_testpendulumtext.Name = "menuitem_testpendulumtext";
+        	this.menuitem_testpendulumtext.Size = new System.Drawing.Size(230, 22);
+        	this.menuitem_testpendulumtext.Text = "Test Pendulum Text";
+        	this.menuitem_testpendulumtext.Click += new System.EventHandler(this.Menuitem_testPendulumTextClick);
+        	// 
         	// tsep7
         	// 
         	this.tsep7.Name = "tsep7";
@@ -1030,13 +1046,6 @@ private void InitializeComponent()
         	this.ch_cardname.Text = "Card Name";
         	this.ch_cardname.Width = 140;
         	// 
-        	// menuitem_exportMSEimage
-        	// 
-        	this.menuitem_exportMSEimage.Name = "menuitem_exportMSEimage";
-        	this.menuitem_exportMSEimage.Size = new System.Drawing.Size(230, 22);
-        	this.menuitem_exportMSEimage.Text = "Export MSE-Set to Images";
-        	this.menuitem_exportMSEimage.Click += new System.EventHandler(this.Menuitem_exportMSEimageClick);
-        	// 
         	// DataEditForm
         	// 
         	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1105,6 +1114,7 @@ private void InitializeComponent()
         	this.ResumeLayout(false);
         	this.PerformLayout();
         }
+        private System.Windows.Forms.ToolStripMenuItem menuitem_testpendulumtext;
         private System.Windows.Forms.ToolStripMenuItem menuitem_exportMSEimage;
         private System.Windows.Forms.ToolStripMenuItem menuitem_exportdata;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;

DataEditorX/DataEditForm.cs

@@ -1645,5 +1645,13 @@ void Menuitem_exportMSEimageClick(object sender, EventArgs e)
 				}
 			}
 		}
+		void Menuitem_testPendulumTextClick(object sender, EventArgs e)
+		{
+			Card c = GetCard();
+			if(c != null){
+				tasker.testPendulumText(c.desc);
+			}
+		}
+		
 	}
 }

DataEditorX/changed.txt

 ★更新历史
+2.3.5.3
+MSE存档图片调整，灵摆文本测试
 2.3.5.2
 \r导致换行
 2.3.5.1

DataEditorX/data/language_chinese.txt

@@ -57,6 +57,7 @@ DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
 DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
+DataEditForm.mainMenu.menuitem_testpendulumtext	测试灵摆效果文本
 DataEditForm.mainMenu.menuitem_help	帮助(&H)
 DataEditForm.mainMenu.menuitem_about	关于
 DataEditForm.mainMenu.menuitem_language	语言

DataEditorX/data/language_english.txt

@@ -48,6 +48,7 @@ DataEditForm.mainMenu.menuitem_readimages	Read From Images Path(&I)
 DataEditForm.mainMenu.menuitem_compdb	Compress DataBase
 DataEditForm.mainMenu.menuitem_exportdata	Export Data As zip
 DataEditForm.mainMenu.menuitem_mseconfig	Set MSE Config
+DataEditForm.mainMenu.menuitem_testpendulumtext	test pendulum texts
 DataEditForm.mainMenu.menuitem_readmse	Read MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse_select	Save Selected As MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse	Save All As MSE-set

DataEditorX/data/mse_Chinese-Simplified.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### 中间图
+reimage = false
 width = 319
 height = 317
 pwidth = 363

DataEditorX/data/mse_Chinese-Traditional.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### 中间图
+reimage = false
 width = 319
 height = 317
 pwidth = 363

DataEditorX/data/mse_English.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 200
 imagepath = ./Images
 ########################### Artwork
+reimage = false
 width = 319
 height = 317
 pwidth = 363

DataEditorX/data/mse_Japanese.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### Artwork
+reimage = false
 width = 319
 height = 317
 pwidth = 363

DataEditorX/readme.txt

-[DataEditorX]2.3.5.2[DataEditorX]
+[DataEditorX]2.3.5.3[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)

win32/changed.txt

 ★更新历史
+2.3.5.3
+MSE存档图片调整，灵摆文本测试
 2.3.5.2
 \r导致换行
 2.3.5.1

win32/data/language_chinese.txt

@@ -57,6 +57,7 @@ DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
 DataEditForm.mainMenu.menuitem_exportMSEimage	从MSE存档导出图片
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
+DataEditForm.mainMenu.menuitem_testpendulumtext	测试灵摆效果文本
 DataEditForm.mainMenu.menuitem_help	帮助(&H)
 DataEditForm.mainMenu.menuitem_about	关于
 DataEditForm.mainMenu.menuitem_language	语言

win32/data/language_english.txt

@@ -48,6 +48,7 @@ DataEditForm.mainMenu.menuitem_readimages	Read From Images Path(&I)
 DataEditForm.mainMenu.menuitem_compdb	Compress DataBase
 DataEditForm.mainMenu.menuitem_exportdata	Export Data As zip
 DataEditForm.mainMenu.menuitem_mseconfig	Set MSE Config
+DataEditForm.mainMenu.menuitem_testpendulumtext	test pendulum texts
 DataEditForm.mainMenu.menuitem_readmse	Read MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse_select	Save Selected As MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse	Save All As MSE-set

win32/data/mse_Chinese-Simplified.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### 中间图
+reimage = false
 width = 319
 height = 317
 pwidth = 363

win32/data/mse_Chinese-Traditional.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### 中间图
+reimage = false
 width = 319
 height = 317
 pwidth = 363

win32/data/mse_English.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 200
 imagepath = ./Images
 ########################### Artwork
+reimage = false
 width = 319
 height = 317
 pwidth = 363

win32/data/mse_Japanese.txt

@@ -8,6 +8,7 @@ cn2tw = false
 maxcount = 0
 imagepath = ./Images
 ########################### Artwork
+reimage = false
 width = 319
 height = 317
 pwidth = 363

win32/readme.txt

-[DataEditorX]2.3.5.2[DataEditorX]
+[DataEditorX]2.3.5.3[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)