From 0658833d15d1ca85e31ee4a9a8a489a60bb13049 Mon Sep 17 00:00:00 2001 From: WildEgo Date: Sat, 1 Jun 2024 19:55:23 +0100 Subject: [PATCH] add: Missing icons. --- .../ymir work/ui/game/costume_button_01.tga | Bin 0 -> 4140 bytes .../ymir work/ui/game/costume_button_02.tga | Bin 0 -> 4140 bytes .../ymir work/ui/game/costume_button_03.tga | Bin 0 -> 4140 bytes .../ui/game/taskbar/mall_button_01.tga | Bin 0 -> 3879 bytes .../ui/game/taskbar/mall_button_02.tga | Bin 0 -> 3831 bytes .../ui/game/taskbar/mall_button_03.tga | Bin 0 -> 3715 bytes bin/pack/root/uiinventory.py | 62 +++++++++--------- 7 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 bin/pack/etc/ymir work/ui/game/costume_button_01.tga create mode 100644 bin/pack/etc/ymir work/ui/game/costume_button_02.tga create mode 100644 bin/pack/etc/ymir work/ui/game/costume_button_03.tga create mode 100644 bin/pack/etc/ymir work/ui/game/taskbar/mall_button_01.tga create mode 100644 bin/pack/etc/ymir work/ui/game/taskbar/mall_button_02.tga create mode 100644 bin/pack/etc/ymir work/ui/game/taskbar/mall_button_03.tga 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 0000000000000000000000000000000000000000..7ed6e268d5de0307474cab7efb24549c11d6a210 GIT binary patch literal 4140 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 Z`atZ#{-L(vu7R$;-pFWsS9e=f`5*Kd^)Ubd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4aef5a4586a2e345d879948a68613ee9d0cd4447 GIT binary patch literal 3879 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4c1f8273c54a6446ef52d037c3405af71a3fc5ca GIT binary patch literal 3831 zcmYjUXH=AD7KTCTWtd?YhG`7FiSjW+7a0%`K_D2F#1Ij&#u62KEEtd?8Uc-6i80t> zOo&|*m6d4hExN0TF`IIBbI$JB@?+1Q{qgL*ch;O84hkRd_ul8d_j#UsUpF^jx0jy? zH~R8!;a|0m;u=&=Uxl*z<;bpRKz8LcWL4B-Wc3^r*374$8{nKY54o?*fKoUKX`?4X z$tXc)c|9`ArXZud4(X+}D4x6kX`^0&?Apv*yDQF#ICJY6+Cd-Hzv!Qz{s}z$>%Y;= zPu#md{t`-dIb`*_{ED|yI1xv_xP@>== ze-QV7`Wy0ITMV_oH|!a?$jHirgZ>|$>Ofq4GHlUtuvjBuGF$080w${sR$COJW8#pK zYRAaD(a6m!fZdUau#h0w%V(m0@Cka)UWY>IkZ4UD(wJ6IO-L@_>f>MFoZJX{24iFj zhG&()8t*_@L?Xhi@zClm$S9nEx_N7{Xl)k~9L0!LMq{WZ8Y*8sLXD9y+7c0y>_C>Y z0$KTGFz7>(Hl`jI?tLdQl$>%%R11f;7fry9?N%*C+6bDAhj)5Dg0s2-);AZnpkx21MCSz(+#E9kiD~&TM0 zU=s!8-~GZ8v7!5*&`uR#ko1qAvJfS&&Jds;>PVuY4ME0Xl!+Kb#-(6uZ@+*yMj!)=s33ueq;E&wYg&%+EVZ{FB95E!0} zCF{4s;T$h~P|}=|foV*_DU^Yh-Nb>cQaY^(!Bm2PV7Hev@LL#sFtYmB^KCkyE_=;AtsM%WnGA{b&b1TgQ-1z6pE2zA6h18ZQz9v1`r0<~f}qsnUK1!H{n|0-_4g=@bTZ{$;O zHB<8{h1YyK=>n9oL=qP_NA^MwPhav+tFV9#x{1@{!6v0B8CdiFVOIgT{%!lH0F)Fz ze+_&I0-uAo%%VBWowns}rw%cQG})fHx?Btw@BW*?=A7&#@upmGkisKo**I9&-U;3U>6KgpyeTPfs8CYfLc3 zr^6C!ht?2@m?XOx5OaN1+fH#rPB0f?Vtpf)x4bV!3etv2mNC(U^8b%b7;LxF7H`MX-4|D&Lro3xf}(-t6&hTl*v+cR_AC?2^(gsm3z25d8*j ze=D;Zy90yL=uFURf+?00Ggo)v?dI+5g6;VD(p^khx{3Z^hsxazzJ59c&|>Dm#%&)G zpZ%yD+!akoO&^JctGA$onp0?`U39^t7gQ=f&;qnC~B>d2%!_I zsqX%29hK?_v6-e|oe{pB+YXB1uonDDQ#yi^oI>tLp&M3pqwnHPOkdu~!=IaL7N7Ob z7972J8?%~r$f|(A0H{N42(zXT9WoJ_lmkm#I&8^Vh#(Al!qc!|jS!x@tcnuEjx)D$ zos0)T!8+JtlVGMvIx;E-si~=Gc&CRFeGkleiR!v}ytTFm{Z}7iUh4-E+H9uDF~yGI z_FT!eJ-ZNT*-qGLuyf=%>F3dKWEY^IWE}E~#?i<>2HE+gNXsd}sG>5WcOK%RV`ZY-NFsK@$=vR zgB_n-#t|CV+dnvkwhzvtko9lL~mCvRXQU8c4lAHc?g7qFiXdzj* z_MVaF?;XB?=H30c_59DMU$)V8!*ks?S8hIl^S7Sh?z3NT>CRL9?$P%cc<>xw5x$2n zekGhQaP#R;`0DW=apLk_96om)TMwPX`LCbg{Ou>Wbo(jJ-gu1D*S^8*wcW1!CKr}J YuU1benpir%w6bDYO>t>?QHtAt0lhOj*#H0l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e858f11926d3029baab5427a17b561eaa39db7c2 GIT binary patch literal 3715 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 ZP4XG+A8H?7J+Qj3H$J*@b$5G0`5()D)sz4L literal 0 HcmV?d00001 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