From c2e4720adb244ed7f19f1d6be7cab56e2cff4812 Mon Sep 17 00:00:00 2001 From: rtw1x1 Date: Sun, 8 Feb 2026 07:39:34 +0000 Subject: [PATCH] Sequence cleanup --- assets/root/constinfo.py | 1 - assets/root/intrologin.py | 3 --- assets/root/networkmodule.py | 1 - assets/root/uigameoption.py | 15 +++------------ assets/root/uimessenger.py | 12 ------------ assets/root/uioption.py | 12 ------------ assets/uiscript/uiscript/messengerwindow.py | 3 +-- 7 files changed, 4 insertions(+), 43 deletions(-) diff --git a/assets/root/constinfo.py b/assets/root/constinfo.py index 34769b59..02882d91 100644 --- a/assets/root/constinfo.py +++ b/assets/root/constinfo.py @@ -43,7 +43,6 @@ TWO_HANDED_WEAPON_ATT_SPEED_DECREASE_VALUE = 0 HAIR_COLOR_ENABLE = 1 ARMOR_SPECULAR_ENABLE = 1 WEAPON_SPECULAR_ENABLE = 1 -SEQUENCE_PACKET_ENABLE = 1 KEEP_ACCOUNT_CONNETION_ENABLE = 1 MINIMAP_POSITIONINFO_ENABLE = 0 CONVERT_EMPIRE_LANGUAGE_ENABLE = 0 diff --git a/assets/root/intrologin.py b/assets/root/intrologin.py index 87c8aa0d..6fb2867f 100644 --- a/assets/root/intrologin.py +++ b/assets/root/intrologin.py @@ -565,9 +565,6 @@ class LoginWindow(ui.ScriptWindow): def Connect(self, id, pwd): - if constInfo.SEQUENCE_PACKET_ENABLE: - net.SetPacketSequenceMode() - if IsLoginDelay(): loginDelay = GetLoginDelay() self.connectingDialog = ConnectingDialog() diff --git a/assets/root/networkmodule.py b/assets/root/networkmodule.py index b23710bc..1747f9e9 100644 --- a/assets/root/networkmodule.py +++ b/assets/root/networkmodule.py @@ -85,7 +85,6 @@ class MainStream(object): net.SetHandler(self) net.SetTCPRecvBufferSize(128*1024) net.SetTCPSendBufferSize(4096) - net.SetUDPRecvBufferSize(4096) self.id="" self.pwd="" diff --git a/assets/root/uigameoption.py b/assets/root/uigameoption.py index 38957013..20f701d1 100644 --- a/assets/root/uigameoption.py +++ b/assets/root/uigameoption.py @@ -8,8 +8,8 @@ import localeInfo import constInfo import chrmgr import player -import uiPrivateShopBuilder # ±èÁØÈ£ -import interfaceModule # ±èÁØÈ£ +import uiPrivateShopBuilder # ����ȣ +import interfaceModule # ����ȣ blockMode = 0 viewChatMode = 0 @@ -85,6 +85,7 @@ class OptionDialog(ui.ScriptWindow): import exception exception.Abort("OptionDialog.__Load_BindObject") + def __Load(self): self.__Load_LoadScript("uiscript/gameoptiondialog.py") self.__Load_BindObject() @@ -312,16 +313,6 @@ class OptionDialog(ui.ScriptWindow): def OnChangePKMode(self): self.__RefreshPVPButtonList() - def OnCloseInputDialog(self): - self.inputDialog.Close() - self.inputDialog = None - return True - - def OnCloseQuestionDialog(self): - self.questionDialog.Close() - self.questionDialog = None - return True - def OnPressEscapeKey(self): self.Close() return True diff --git a/assets/root/uimessenger.py b/assets/root/uimessenger.py index 80806659..954ee23c 100644 --- a/assets/root/uimessenger.py +++ b/assets/root/uimessenger.py @@ -7,8 +7,6 @@ import messenger import localeInfo import constInfo import uiToolTip -import uiGameOption - import uiCommon from _weakref import proxy @@ -381,11 +379,6 @@ class MessengerWindow(ui.ScriptWindow): self.addFriendButton.SetEvent(ui.__mem_func__(self.OnPressAddFriendButton)) self.guildButton.SetEvent(ui.__mem_func__(self.OnPressGuildButton)) - self.addFriendButton.SetPosition(-60, 30) - self.whisperButton.SetPosition(-20, 30) - self.removeButton.SetPosition(20, 30) - self.guildButton.SetPosition(60, 30) - self.whisperButton.Disable() self.removeButton.Disable() @@ -506,11 +499,6 @@ class MessengerWindow(ui.ScriptWindow): def SetGuildButtonEvent(self, event): self.guildButtonEvent=event - def OnCloseInputDialog(self): - self.inputDialog.Close() - self.inputDialog = None - return True - def OnPressGuildButton(self): self.guildButtonEvent() diff --git a/assets/root/uioption.py b/assets/root/uioption.py index 6b11bb0d..1453481e 100644 --- a/assets/root/uioption.py +++ b/assets/root/uioption.py @@ -43,7 +43,6 @@ class OptionDialog(ui.ScriptWindow): try: pyScriptLoader = ui.PythonScriptLoader() pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py") - except: import exception exception.Abort("OptionDialog.__LoadDialog.LoadObject") @@ -71,7 +70,6 @@ class OptionDialog(ui.ScriptWindow): self.blockButtonList.append(GetObject("block_guild_button")) self.blockButtonList.append(GetObject("block_whisper_button")) self.blockButtonList.append(GetObject("block_friend_button")) - except: import exception exception.Abort("OptionDialog.__LoadDialog.BindObject") @@ -275,16 +273,6 @@ class OptionDialog(ui.ScriptWindow): snd.SetSoundVolume(pos) systemSetting.SetSoundVolume(pos) - def OnCloseInputDialog(self): - self.inputDialog.Close() - self.inputDialog = None - return True - - def OnCloseQuestionDialog(self): - self.questionDialog.Close() - self.questionDialog = None - return True - def OnPressEscapeKey(self): self.Close() return True diff --git a/assets/uiscript/uiscript/messengerwindow.py b/assets/uiscript/uiscript/messengerwindow.py index 49eeb2ba..31834bf8 100644 --- a/assets/uiscript/uiscript/messengerwindow.py +++ b/assets/uiscript/uiscript/messengerwindow.py @@ -1,7 +1,7 @@ import uiScriptLocale BUTTON_START_X_POS = -60 -BUTTON_X_STEP = 30 +BUTTON_X_STEP = 40 window = { "name" : "MessengerWindow", @@ -74,7 +74,6 @@ window = { "down_image" : "d:/ymir work/ui/game/windows/messenger_whisper_03.sub", "disable_image" : "d:/ymir work/ui/game/windows/messenger_whisper_04.sub", }, - { "name" : "RemoveButton", "type" : "button",