diff --git a/bin/pack/etc/ymir work/ui/game/costume_button_01.tga b/bin/pack/etc/ymir work/ui/game/costume_button_01.tga new file mode 100644 index 00000000..7ed6e268 Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/costume_button_01.tga differ diff --git a/bin/pack/etc/ymir work/ui/game/costume_button_02.tga b/bin/pack/etc/ymir work/ui/game/costume_button_02.tga new file mode 100644 index 00000000..c326b92f Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/costume_button_02.tga differ diff --git a/bin/pack/etc/ymir work/ui/game/costume_button_03.tga b/bin/pack/etc/ymir work/ui/game/costume_button_03.tga new file mode 100644 index 00000000..c1bcd1b2 Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/costume_button_03.tga differ diff --git a/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_01.tga b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_01.tga new file mode 100644 index 00000000..4aef5a45 Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_01.tga differ diff --git a/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_02.tga b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_02.tga new file mode 100644 index 00000000..4c1f8273 Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_02.tga differ diff --git a/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_03.tga b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_03.tga new file mode 100644 index 00000000..e858f119 Binary files /dev/null and b/bin/pack/etc/ymir work/ui/game/taskbar/mall_button_03.tga differ diff --git a/bin/pack/root/uiinventory.py b/bin/pack/root/uiinventory.py index 2e47eadf..d25bf7bf 100644 --- a/bin/pack/root/uiinventory.py +++ b/bin/pack/root/uiinventory.py @@ -13,7 +13,7 @@ import uiRefine import uiAttachMetin import uiPickMoney import uiCommon -import uiPrivateShopBuilder # °³ÀλóÁ¡ ¿­µ¿¾È ItemMove ¹æÁö +import uiPrivateShopBuilder # ����� ������ ItemMove ���� import localeInfo import constInfo import ime @@ -156,7 +156,7 @@ class BeltInventoryWindow(ui.ScriptWindow): if localeInfo.IsARABIC() == 0: self.AdjustPositionAndSize() - ## ÇöÀç Àκ¥Å丮 À§Ä¡¸¦ ±âÁØÀ¸·Î BASE À§Ä¡¸¦ °è»ê, ¸®ÅÏ.. ¼ýÀÚ ÇϵåÄÚµùÇϱâ Á¤¸» ½ÈÁö¸¸ ¹æ¹ýÀÌ ¾ø´Ù.. + ## ���� �κ��丮 ��ġ�� �������� BASE ��ġ�� ���, ����.. ���� �ϵ��ڵ��ϱ� ���� ������ ����� ����.. def GetBasePosition(self): x, y = self.wndInventory.GetGlobalPosition() return x - 148, y + 241 @@ -248,16 +248,16 @@ class InventoryWindow(ui.ScriptWindow): wndCostume = None wndBelt = None dlgPickMoney = None - + sellingSlotNumber = -1 isLoaded = 0 - isOpenedCostumeWindowWhenClosingInventory = 0 # Àκ¥Å丮 ´ÝÀ» ¶§ ÄÚ½ºÃõÀÌ ¿­·ÁÀÖ¾ú´ÂÁö ¿©ºÎ-_-; ³×ÀÌ¹Ö ¤¸¤µ - isOpenedBeltWindowWhenClosingInventory = 0 # Àκ¥Å丮 ´ÝÀ» ¶§ º§Æ® Àκ¥Å丮°¡ ¿­·ÁÀÖ¾ú´ÂÁö ¿©ºÎ-_-; ³×ÀÌ¹Ö ¤¸¤µ + isOpenedCostumeWindowWhenClosingInventory = 0 # �κ��丮 ���� �� �ڽ����� �����־����� ����-_-; ���̹� ���� + isOpenedBeltWindowWhenClosingInventory = 0 # �κ��丮 ���� �� ��Ʈ �κ��丮�� �����־����� ����-_-; ���̹� ���� def __init__(self): ui.ScriptWindow.__init__(self) - self.isOpenedBeltWindowWhenClosingInventory = 0 # Àκ¥Å丮 ´ÝÀ» ¶§ º§Æ® Àκ¥Å丮°¡ ¿­·ÁÀÖ¾ú´ÂÁö ¿©ºÎ-_-; ³×ÀÌ¹Ö ¤¸¤µ + self.isOpenedBeltWindowWhenClosingInventory = 0 # �κ��丮 ���� �� ��Ʈ �κ��丮�� �����־����� ����-_-; ���̹� ���� self.__LoadWindow() @@ -269,11 +269,11 @@ class InventoryWindow(ui.ScriptWindow): ui.ScriptWindow.Show(self) - # Àκ¥Å丮¸¦ ´ÝÀ» ¶§ ÄÚ½ºÃõÀÌ ¿­·ÁÀÖ¾ú´Ù¸é Àκ¥Å丮¸¦ ¿­ ¶§ ÄÚ½ºÃõµµ °°ÀÌ ¿­µµ·Ï ÇÔ. + # �κ��丮�� ���� �� �ڽ����� �����־��ٸ� �κ��丮�� �� �� �ڽ����� ���� ������ ��. if self.isOpenedCostumeWindowWhenClosingInventory and self.wndCostume: self.wndCostume.Show() - # Àκ¥Å丮¸¦ ´ÝÀ» ¶§ º§Æ® Àκ¥Å丮°¡ ¿­·ÁÀÖ¾ú´Ù¸é °°ÀÌ ¿­µµ·Ï ÇÔ. + # �κ��丮�� ���� �� ��Ʈ �κ��丮�� �����־��ٸ� ���� ������ ��. if self.wndBelt: self.wndBelt.Show(self.isOpenedBeltWindowWhenClosingInventory) @@ -382,14 +382,14 @@ class InventoryWindow(ui.ScriptWindow): if self.DSSButton: self.DSSButton.SetEvent(ui.__mem_func__(self.ClickDSSButton)) - + # Costume Button if self.costumeButton: self.costumeButton.SetEvent(ui.__mem_func__(self.ClickCostumeButton)) self.wndCostume = None - - ##### + + ##### ## Refresh self.SetInventoryPage(0) @@ -423,7 +423,7 @@ class InventoryWindow(ui.ScriptWindow): if self.wndCostume: self.wndCostume.Destroy() self.wndCostume = 0 - + if self.wndBelt: self.wndBelt.Destroy() self.wndBelt = None @@ -439,14 +439,14 @@ class InventoryWindow(ui.ScriptWindow): self.tooltipItem.HideToolTip() if self.wndCostume: - self.isOpenedCostumeWindowWhenClosingInventory = self.wndCostume.IsShow() # Àκ¥Å丮 âÀÌ ´ÝÈú ¶§ ÄÚ½ºÃõÀÌ ¿­·Á ÀÖ¾ú´Â°¡? + self.isOpenedCostumeWindowWhenClosingInventory = self.wndCostume.IsShow() # �κ��丮 � ���� �� �ڽ����� ���� �־��°�? self.wndCostume.Close() - + if self.wndBelt: - self.isOpenedBeltWindowWhenClosingInventory = self.wndBelt.IsOpeningInventory() # Àκ¥Å丮 âÀÌ ´ÝÈú ¶§ º§Æ® Àκ¥Å丮µµ ¿­·Á ÀÖ¾ú´Â°¡? + self.isOpenedBeltWindowWhenClosingInventory = self.wndBelt.IsOpeningInventory() # �κ��丮 � ���� �� ��Ʈ �κ��丮�� ���� �־��°�? print "Is Opening Belt Inven?? ", self.isOpenedBeltWindowWhenClosingInventory self.wndBelt.Close() - + if self.dlgPickMoney: self.dlgPickMoney.Close() @@ -508,7 +508,7 @@ class InventoryWindow(ui.ScriptWindow): self.dlgPickMoney.SetTitleName(localeInfo.PICK_MONEY_TITLE) self.dlgPickMoney.SetAcceptEvent(ui.__mem_func__(self.OnPickMoney)) self.dlgPickMoney.Open(curMoney) - self.dlgPickMoney.SetMax(7) # Àκ¥Å丮 990000 Á¦ÇÑ ¹ö±× ¼öÁ¤ + self.dlgPickMoney.SetMax(7) # �κ��丮 990000 ���� ���� ���� def OnPickMoney(self, money): mouseModule.mouseController.AttachMoney(self, player.SLOT_TYPE_INVENTORY, money) @@ -533,7 +533,7 @@ class InventoryWindow(ui.ScriptWindow): slotNumber = self.__InventoryLocalSlotPosToGlobalSlotPos(i) itemCount = getItemCount(slotNumber) - # itemCount == 0ÀÌ¸é ¼ÒÄÏÀ» ºñ¿î´Ù. + # itemCount == 0�̸� ������ ����. if 0 == itemCount: self.wndItem.ClearSlot(i) continue @@ -543,9 +543,9 @@ class InventoryWindow(ui.ScriptWindow): itemVnum = getItemVNum(slotNumber) setItemVNum(i, itemVnum, itemCount) - ## ÀÚµ¿¹°¾à (HP: #72723 ~ #72726, SP: #72727 ~ #72730) Ư¼öó¸® - ¾ÆÀÌÅÛÀε¥µµ ½½·Ô¿¡ È°¼ºÈ­/ºñÈ°¼ºÈ­ Ç¥½Ã¸¦ À§ÇÑ ÀÛ¾÷ÀÓ - [hyo] + ## �ڵ����� (HP: #72723 ~ #72726, SP: #72727 ~ #72730) Ư��ó�� - ��������� ���Կ� Ȱ��ȭ/��Ȱ��ȭ ǥ�ø� ���� �۾��� - [hyo] if constInfo.IS_AUTO_POTION(itemVnum): - # metinSocket - [0] : È°¼ºÈ­ ¿©ºÎ, [1] : »ç¿ëÇÑ ¾ç, [2] : ÃÖ´ë ¿ë·® + # metinSocket - [0] : Ȱ��ȭ ����, [1] : ����� ��, [2] : �ִ� �뷮 metinSocket = [player.GetItemMetinSocket(slotNumber, j) for j in xrange(player.METIN_SOCKET_MAX_NUM)] if slotNumber >= player.INVENTORY_PAGE_SIZE: @@ -592,11 +592,9 @@ class InventoryWindow(ui.ScriptWindow): itemCount = 0 setItemVNum(slotNumber, getItemVNum(slotNumber), itemCount) print "ENABLE_NEW_EQUIPMENT_SYSTEM", slotNumber, itemCount, getItemVNum(slotNumber) - - self.wndEquip.RefreshSlot() - + if self.wndCostume: self.wndCostume.RefreshCostumeSlot() @@ -614,7 +612,7 @@ class InventoryWindow(ui.ScriptWindow): def SellItem(self): if self.sellingSlotitemIndex == player.GetItemIndex(self.sellingSlotNumber): if self.sellingSlotitemCount == player.GetItemCount(self.sellingSlotNumber): - ## ¿ëÈ¥¼®µµ Æȸ®°Ô ÇÏ´Â ±â´É Ãß°¡Çϸ鼭 ÀÎÀÚ type Ãß°¡ + ## ��ȥ���� �ȸ��� �ϴ� ��� �߰��ϸ鼭 ���� type �߰� net.SendShopSellPacketNew(self.sellingSlotNumber, self.questionDialog.count, player.INVENTORY) snd.PlaySound("sound/ui/money.wav") self.OnCloseQuestionDialog() @@ -764,10 +762,10 @@ class InventoryWindow(ui.ScriptWindow): else: #snd.PlaySound("sound/ui/drop.wav") - ## À̵¿½ÃŲ °÷ÀÌ ÀåÂø ½½·ÔÀÏ °æ¿ì ¾ÆÀÌÅÛÀ» »ç¿ëÇؼ­ ÀåÂø ½ÃŲ´Ù - [levites] + ## �̵���Ų ���� ���� ������ ��� �������� ����ؼ� ���� ��Ų�� - [levites] if player.IsEquipmentSlot(dstItemSlotPos): - ## µé°í ÀÖ´Â ¾ÆÀÌÅÛÀÌ ÀåºñÀ϶§¸¸ + ## ��� �ִ� �������� ����϶��� if item.IsEquipmentVID(srcItemVID): self.__UseItem(srcItemSlotPos) @@ -786,7 +784,7 @@ class InventoryWindow(ui.ScriptWindow): self.sellingSlotitemCount = itemCount item.SelectItem(itemIndex) - ## ¾ÈƼ Ç÷¹±× °Ë»ç ºüÁ®¼­ Ãß°¡ + ## ��Ƽ �÷��� �˻� ������ �߰� ## 20140220 if item.IsAntiFlag(item.ANTIFLAG_SELL): popup = uiCommon.PopupDialog() @@ -932,7 +930,7 @@ class InventoryWindow(ui.ScriptWindow): def __IsUsableItemToItem(self, srcItemVNum, srcSlotPos): - "´Ù¸¥ ¾ÆÀÌÅÛ¿¡ »ç¿ëÇÒ ¼ö ÀÖ´Â ¾ÆÀÌÅÛÀΰ¡?" + "�ٸ� �����ۿ� ����� �� �ִ� �������ΰ�?" if item.IsRefineScroll(srcItemVNum): return True @@ -951,7 +949,7 @@ class InventoryWindow(ui.ScriptWindow): return False def __CanUseSrcItemToDstItem(self, srcItemVNum, srcSlotPos, dstSlotPos): - "´ë»ó ¾ÆÀÌÅÛ¿¡ »ç¿ëÇÒ ¼ö Àִ°¡?" + "��� �����ۿ� ����� �� �ִ°�?" if srcSlotPos == dstSlotPos: return False @@ -1158,7 +1156,7 @@ class InventoryWindow(ui.ScriptWindow): self.OnCloseQuestionDialog() def __SendUseItemToItemPacket(self, srcSlotPos, dstSlotPos): - # °³ÀλóÁ¡ ¿­°í ÀÖ´Â µ¿¾È ¾ÆÀÌÅÛ »ç¿ë ¹æÁö + # ����� ���� �ִ� ���� ������ ��� ���� if uiPrivateShopBuilder.IsBuildingPrivateShop(): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.USE_ITEM_FAILURE_PRIVATE_SHOP) return @@ -1166,7 +1164,7 @@ class InventoryWindow(ui.ScriptWindow): net.SendItemUseToItemPacket(srcSlotPos, dstSlotPos) def __SendUseItemPacket(self, slotPos): - # °³ÀλóÁ¡ ¿­°í ÀÖ´Â µ¿¾È ¾ÆÀÌÅÛ »ç¿ë ¹æÁö + # ����� ���� �ִ� ���� ������ ��� ���� if uiPrivateShopBuilder.IsBuildingPrivateShop(): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.USE_ITEM_FAILURE_PRIVATE_SHOP) return @@ -1174,7 +1172,7 @@ class InventoryWindow(ui.ScriptWindow): net.SendItemUsePacket(slotPos) def __SendMoveItemPacket(self, srcSlotPos, dstSlotPos, srcItemCount): - # °³ÀλóÁ¡ ¿­°í ÀÖ´Â µ¿¾È ¾ÆÀÌÅÛ »ç¿ë ¹æÁö + # ����� ���� �ִ� ���� ������ ��� ���� if uiPrivateShopBuilder.IsBuildingPrivateShop(): chat.AppendChat(chat.CHAT_TYPE_INFO, localeInfo.MOVE_ITEM_FAILURE_PRIVATE_SHOP) return