diff --git a/CSharp Code/JudgeGrade.cs b/CSharp Code/JudgeGrade.cs index a8aa40b..1fea71c 100644 --- a/CSharp Code/JudgeGrade.cs +++ b/CSharp Code/JudgeGrade.cs @@ -5,6 +5,7 @@ namespace BMSLib // Token: 0x0200001F RID: 31 public class JudgeGrade { + public static ConsoleInput ci = new ConsoleInput(); public static void Reset() { //JudgeGrade.baseAccuracy = 0f; @@ -35,16 +36,15 @@ public static void Reset() public static int GetJudgeGrade(long knockDistance) { - //int result = -1; - //bool flag = knockDistance < 0L; if (knockDistance >= -1500000L) { JudgeGrade.ci.kD = (float)knockDistance / 10000f; JudgeGrade.ci.OnEnter(); } - // knockDistance = Math.Abs(knockDistance); - // if (knockDistance < 450000L){} + //int result = -1; + //bool flag = knockDistance < 0L; + //knockDistance = Math.Abs(knockDistance); + //if (knockDistance < 450000L){} } - public static ConsoleInput ci = new ConsoleInput(); } } diff --git a/File2Base64.py b/File2Base64.py index 6a53612..1bf7a52 100644 --- a/File2Base64.py +++ b/File2Base64.py @@ -9,8 +9,8 @@ FillSize:int = 512; FixDLL:str = "F39E7D866C2EF4F6A40E573EF5B0D2A8"; # Source Assembly-CSharp.dll -SourceDLL:str = '043799056B15948930F9BFCDDC6E5FEE'; -SongNameVersion:int = 20250201; +SourceDLL:str = '6968CEE6E5F671B9DDB3F6AB0769396E'; +SongNameVersion:int = 20250303; def GetHash(filePath:str=None)->str: if (filePath is None): return ""; diff --git a/Launcher.py b/Launcher.py index 69050cb..8e31f3c 100644 --- a/Launcher.py +++ b/Launcher.py @@ -2,7 +2,7 @@ import ctypes import logging import os -from tkinter import Tk,font +from tkinter import Tk, font from Resources import Logger from Version import * logger:logging.Logger = Logger.GetLogger(name="Launcher"); diff --git a/README.md b/README.md index 8897e0d..5053d07 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 1. xxx --> ### Version 2.0.0 -#### PreRelease +#### Release 2 1. 更新 1. #### ***更新2025年01月27日喵赛克新增曲目 (新春联动大更新)*** - Glazed Color (EZ HD) @@ -137,11 +137,19 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 2. #### ***更新2025年02月28日喵赛克新增曲目*** - Awaken In Ruins (EZ HD) - Xenolith (EZ HD IN) + 3. ***修补2025年03月03日 游戏资源热更新*** 2. 修复 1. 修复存档解析方案,使用C#实现存档的解析 + 2. 修复日志压缩时,压缩文件命名错误 3. 优化 1. 重构程序 2. 优化CI配置文件 + 3. 优化C#修补代码 + +## 旧版本更新日志 (1.0.0 - 1.2.8rc5) +
+ 旧版本更新日志 + ### Version 1.2.8 #### Release 5 1. 修复 @@ -257,11 +265,6 @@ HitDelay模块用法:启用DLL注入后,在本次游戏进行首次谱面游玩 1. 优化C#代码中的判断流程 2. 优化`songname.json`的格式 (20231229 -> 20240118) 3. 优化ci执行流程 - -## 旧版本更新日志 (1.0.0 - 1.2.5rc6) -
- 旧版本更新日志 - ### Version 1.2.5 #### Release 6 1. 更新 diff --git a/Resources.py b/Resources.py index 0abad77..9aaa013 100644 --- a/Resources.py +++ b/Resources.py @@ -12,15 +12,15 @@ class Config(object): "从bootcfg.json读取配置信息,单例"; def CompressLogFile()->None: logsDir:str = ".\\logs\\"; - logsName:str = "log.gz"; + # 获取已有的压缩文件数量 + nextIndex:int = len([f for f in os.listdir(logsDir)]); + logsName:str = f"log.{nextIndex}.gz"; logName:str = "log.txt"; # 移动压缩文件到 logs 目录 shutil.move(f".\\{logName}", logsDir+logName); - # 获取已有的压缩文件数量 - nextIndex:int = len([f for f in os.listdir(logsDir)]); # 压缩 log.txt 文件 with open(logsDir+logName, 'rb') as f_in: - with gzip.open(f"{logsDir}{logsName}.{nextIndex}", 'wb') as f_out: + with gzip.open(f"{logsDir}{logsName}", 'wb') as f_out: shutil.copyfileobj(f_in, f_out); # 清理 log.txt 文件 os.remove(logsDir+logName); diff --git a/Version.py b/Version.py index 890649a..8917361 100644 --- a/Version.py +++ b/Version.py @@ -1,4 +1,4 @@ -version = '2.0.0rc1' +version = '2.0.0rc2' isPreRelease = True -preVersion = "2.0.0pre9" +preVersion = "2.0.0pre10" isPreRelease = False \ No newline at end of file diff --git a/changelog.md b/changelog.md index c9e5c3c..c731555 100644 --- a/changelog.md +++ b/changelog.md @@ -10,7 +10,7 @@ 5. 2.0.0 重构程序 ### Version 2.0.0 -#### PreRelease +#### Release 2 1. 更新 1. #### ***更新2025年01月27日喵赛克新增曲目 (新春联动大更新)*** - Glazed Color (EZ HD) @@ -22,8 +22,11 @@ 2. #### ***更新2025年02月28日喵赛克新增曲目*** - Awaken In Ruins (EZ HD) - Xenolith (EZ HD IN) + 3. ***修补2025年03月03日 游戏资源热更新*** 2. 修复 1. 修复存档解析方案,使用C#实现存档的解析 + 2. 修复日志压缩时,压缩文件命名错误 3. 优化 1. 重构程序 - 2. 优化CI配置文件 \ No newline at end of file + 2. 优化CI配置文件 + 3. 优化C#修补代码 \ No newline at end of file diff --git a/musync_data/Resources.bin b/musync_data/Resources.bin index 922f35b..d4205d9 100644 Binary files a/musync_data/Resources.bin and b/musync_data/Resources.bin differ diff --git a/musync_data/bootcfg.json b/musync_data/bootcfg.json index 7ed30dc..722ff98 100644 --- a/musync_data/bootcfg.json +++ b/musync_data/bootcfg.json @@ -1,5 +1,5 @@ { - "Version": "2.0.0.1", + "Version": "2.0.0.2", "LoggerFilter": "DEBUG", "Acc_Sync": true, "CheckUpdate": false, diff --git a/musync_data/songname.json b/musync_data/songname.json index 1db2e77..55c1973 100644 --- a/musync_data/songname.json +++ b/musync_data/songname.json @@ -1596,81 +1596,29 @@ "141313": [ "Xenolith", 6, 1, 14 ], "NoMap": [ "", "" ], "BuiltinSong": [ - "8bit Adventurer", - "8th Planet", - "Africa", - "ANGER FORCE - STAGE 4 -", - "Annihilator", - "Bass Telekinesis", - "Beyond The Horizon", - "BiBiC Heart", - "Brain Crash", - "Bright red hertz", - "Burn", - "Butterfly Dance", - "八秒之语", - "Call me baby", - "Canon in D", - "Confession", - "東風稲荷", - "独角", - "εν άστει Διονύσια", - "Flammable", - "Four leaf clover", - "GAMEBOY", - "Gothique Resonance", - "高考恋爱100天[未来的志愿书]", - "HATEN CODE 583", - "海棠仙", - "化尘旅行", - "欢迎光临", - "黄老饼梦游惊奇", - "ICEY", - "JOURNEY", - "节奏快打", - "LALALA Refrain", - "Lost Memories[WILL:美好世界]", - "Luxinauz", - "蜡烛人[摇曳]", - "鲤[一河上下两世界]", - "落尘寰", - "Maholova", - "moon light", - "MUSE DASH[Pancake Is Love]", - "末日Disco", - "Nick of Time", - "那片小小的星空", - "逆浪千秋", - "你真的好弔", - "OPUS地球计划[Hope]", - "Platina", - "Provison", - "蹒行手记", - "骑上我心爱的小摩托", - "Saintelmo", - "Silver Town", - "Sky Fragment", - "Solar Wind", - "三人合奏歌", - "神州电音[惊涛落日]", - "圣女战旗[La Bannière]", - "松鼠魔法祭", - "苏三起解", - "The Day We Become Family", - "The Mountain Eater", - "tracing shadow", - "兔子罗比", - "兔子先生", - "When You're Away", - "万神纪", - "我要挂科了", - "无限剧场", - "小红帽的一天", - "眼泪", - "遠い日々", - "一天一炮的愉悦 RPG小剧场", - "月圆之夜[月下狂想曲]", - "中国式家长[高考前夕]", - "做个好梦" + "8bit Adventurer", "8th Planet", + "Africa", "ANGER FORCE - STAGE 4 -", "Annihilator", + "Bass Telekinesis", "Beyond The Horizon", "BiBiC Heart", "Brain Crash", "Bright red hertz", "Burn", "Butterfly Dance", "八秒之语", + "Call me baby", "Canon in D", "Confession", + "東風稲荷", "独角", + "ENDRUiD", "εν άστει Διονύσια", + "Flammable", "Four leaf clover", + "GAMEBOY", "Glazed Color", "Gothique Resonance", "高考恋爱100天[未来的志愿书]", + "HATEN CODE 583", "海棠仙", "化尘旅行", "欢迎光临", "黄老饼梦游惊奇", + "ICEY", + "JOURNEY", "节奏快打", + "Kirakira Noel Story!!", + "LALALA Refrain", "Lost Memories[WILL:美好世界]", "Luxinauz", "蜡烛人[摇曳]", "鲤[一河上下两世界]", "落尘寰", + "Maholova", "moon light", "MUSE DASH[Pancake Is Love]", "末日Disco", + "Nick of Time", "那片小小的星空", "逆浪千秋", "你真的好弔", + "OPUS地球计划[Hope]", + "Platina", "Provison", "蹒行手记", + "骑上我心爱的小摩托", + "Saintelmo", "Silver Town", "Sky Fragment", "Solar Wind", "Super Nova Project", "三人合奏歌", "神州电音[惊涛落日]", "圣女战旗[La Bannière]", "松鼠魔法祭", "苏三起解", + "The Day We Become Family", "The Mountain Eater", "tracing shadow", "兔子罗比", "兔子先生", + "When You're Away", "万神纪", "我要挂科了", "无限剧场", + "小红帽的一天", + "眼泪", "遠い日々", "一天一炮的愉悦 RPG小剧场", "月圆之夜[月下狂想曲]", + "中国式家长[高考前夕]", "做个好梦" ] } \ No newline at end of file diff --git a/musync_data/songname.update b/musync_data/songname.update index 910d23c..fde0fac 100644 --- a/musync_data/songname.update +++ b/musync_data/songname.update @@ -1 +1 @@ -20250128 \ No newline at end of file +20250303 \ No newline at end of file