diff --git a/lua_probject/base_project/Game/ExtendHotupdate.lua b/lua_probject/base_project/Game/ExtendHotupdate.lua index d7525087..391effe2 100644 --- a/lua_probject/base_project/Game/ExtendHotupdate.lua +++ b/lua_probject/base_project/Game/ExtendHotupdate.lua @@ -70,7 +70,7 @@ local function __update_check(data, onback, _version_view) end coroutine.step() end - download_size = download_size + game_data["size"] + download_size = download_size + (game_data["size"] or 0) ResourcesManager.ReadAssetConfig(asset_path) end onback(1, true) diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 244d27dd..95def78b 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -64,7 +64,7 @@ function Main() if Application.platform == RuntimePlatform.WindowsEditor then debug_print = true end - -- debug_print = true + debug_print = true local NetManager = taurus.client.NetManager NetManager.debug_print = debug_print -- 网络延时8秒 diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua index 0751d178..bf71eac9 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -528,9 +528,9 @@ end function M:ChangeCodeByTo(card) local flower = card % 10 local number = math.floor(card / 10) - if number == 15 then - number = 2 - end + -- if number == 15 then + -- number = 2 + -- end return flower * 100 + number end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 13510c69..4f773e94 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -219,12 +219,18 @@ function M:InitPoker(pokerList, isPlayAni, open) self._view_handCard:RemoveChildren(0, -1, true) self._view_handCard.selectedIndex = -1 local cs = 0.97 + local card_width = 300 + self._view_handCard.columnGap = -150 + if DataManager.CurrenRoom.pai == 0 then + self._view_handCard.columnGap = -185 + card_width = (GRoot.inst.width*0.92 - self._view_handCard.columnGap * 14) / 15 + end if DataManager.CurrenRoom.cardsize == 0 then cs = 0.97 elseif DataManager.CurrenRoom.cardsize == 1 then cs = 0.95 end - local card_width = 275 * cs + card_width = card_width * cs if isPlayAni == true then self.cor_init_poker = @@ -236,7 +242,7 @@ function M:InitPoker(pokerList, isPlayAni, open) end self._view_handCard.align = FairyGUI.AlignType.Left self._view_handCard.width = card_width * 15 + self._view_handCard.columnGap * 14 - self._view_handCard:Center() + -- self._view_handCard:Center() for i = #pokerList, 1, -1 do if pokerList[i] == 403 then self._flag_ruleCard = true @@ -258,10 +264,10 @@ function M:InitPoker(pokerList, isPlayAni, open) coroutine.wait(0.01) end table.sort(self.card_list, tableSortNumber) - self._view_handCard.x = 0 + -- self._view_handCard.x = 0 self._view_handCard.width = GRoot.inst.width self._view_handCard.align = FairyGUI.AlignType.Center - self._view_handCard:Center() + -- self._view_handCard:Center() self:AddTouchMoveEvent(self._view_handCard) for i = 1, #self.card_list do local card = self.card_list[i] diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 95967219..03c9f3c8 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,30 +3,85 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://8wph7p8nyffnmy", + "ui://8wph7p8nyffnnx", + "ui://8wph7p8nyffn8o", "ui://8wph7p8nyffn8s", + "ui://8wph7p8nro85cr3", + "ui://8wph7p8nro85crh", + "ui://8wph7p8nro85csf", + "ui://8wph7p8nro85ct3", + "ui://m7iejg46kwi0hma", + "ui://8wph7p8nro85cuf", + "ui://8wph7p8nro85cqx", "ui://m7iejg46mpllhv2", "ui://m7iejg46kwi0hkl", "ui://m7iejg46mpllhv5", "ui://8wph7p8nyffn2h", - "ui://8wph7p8nhuw1cms", - "ui://8wph7p8nhuw1cmm" + "ui://lx6k641g9f2gk0", + "ui://lx6k641g9f2gke", + "ui://lx6k641g9f2gkc", + "ui://lx6k641g9f2gl0", + "ui://lx6k641g9f2gli", + "ui://lx6k641g9f2gm0", + "ui://lx6k641g9f2gju", + "ui://8wph7p8nyffnk6" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46mpllhv5", + "doc.activeDoc": "ui://m7iejg46kwi0hma", "libview.twoColumn": false, "libview.expandedNodes": [ "8wph7p8n", "/", "8wph7p8n", + "/Main_New/", + "8wph7p8n", "/component/", "8wph7p8n", + "/component/head/", + "8wph7p8n", + "/component/image/", + "8wph7p8n", "/component/newcard/", "8wph7p8n", "/component/newcard/1/", "8wph7p8n", - "/component/newcard/素材/" + "/component/newcard/2/", + "8wph7p8n", + "/component/newcard/3/", + "8wph7p8n", + "/component/newcard/4/", + "8wph7p8n", + "/component/newcard/素材/", + "8wph7p8n", + "/images/", + "lx6k641g", + "/", + "lx6k641g", + "/image/", + "lx6k641g", + "/image/NewPoker/", + "lx6k641g", + "/newcard2/", + "lx6k641g", + "/newcard2/1/", + "lx6k641g", + "/newcard2/2/", + "lx6k641g", + "/newcard2/3/", + "lx6k641g", + "/newcard2/4/", + "lx6k641g", + "/newcard2/new_assert/", + "m7iejg46", + "/", + "m7iejg46", + "/mgr/", + "m7iejg46", + "/mgr/component/", + "m7iejg46", + "/mgr/component/game/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml index 38d20188..0ee4592a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml @@ -1,22 +1,22 @@ - + - + - + - + - - + +