diff --git a/Main_RunBeard.fairypackage b/Main_RunBeard.fairypackage new file mode 100644 index 00000000..ad67921c Binary files /dev/null and b/Main_RunBeard.fairypackage differ diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua index 08c4b1cb..2ceb68db 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua @@ -563,6 +563,7 @@ function M:OnEventFzAction(evt_data) -- DispatchEvent(self._dispatcher, FanPaoFa_GameEvent.FangziAction, fz, p, isNeedDelHandCard, flag_pengPao) -- end) -- else + flag_pengPao = false DispatchEvent(self._dispatcher, FanPaoFa_GameEvent.FangziAction, fz, p, isNeedDelHandCard, flag_pengPao) -- end end) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index a49f61cd..a56b9c98 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -407,26 +407,30 @@ function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) if (ispaly and i == size and not flag_pengPao) then local fristCard = self.card_list[1].btn_card print("lingmeng btn_card", self.card_list[1].index_X) - -- self._area_handcard_list:AddChild(fzcards) + self._area_handcard_list:AddChild(fzcards) fzcards:SetPivot(0.5, 0.5) fzcards.rotation = 180 fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - --[[ fzcards:TweenMove( + ---[[ + fzcards:TweenMove( self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - self._area_handcard_list.xy, 0.2) - fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2)]] - fzcards:RemoveFromParent() - fzcards.xy = Vector2.zero - fzcards.rotation = 0 - fzcards:SetScale(1, 1) - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - --[[coroutine.start( + fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) + --]] + + ---[[ + coroutine.start( function() - coroutine.wait(0.2) - + coroutine.wait(0.21) + fzcards:RemoveFromParent() + fzcards.xy = Vector2.zero + fzcards.rotation = 0 + fzcards:SetScale(1, 1) + fzitem:AddChild(fzcards) + self._area_fz_list:AddChildAt(fzitem, 0) end - )]] + ) + --]] else fzitem:AddChild(fzcards) self._area_fz_list:AddChildAt(fzitem, 0) diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png new file mode 100644 index 00000000..743eac91 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png new file mode 100644 index 00000000..c1042649 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png new file mode 100644 index 00000000..96794687 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png new file mode 100644 index 00000000..17776330 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png new file mode 100644 index 00000000..4077b487 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png new file mode 100644 index 00000000..21dde2c5 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png new file mode 100644 index 00000000..8df0760c Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png new file mode 100644 index 00000000..70b3e020 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes new file mode 100644 index 00000000..4e9249b3 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index ab4b6654..78256ea4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 56e7d1a4..ccec90a3 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 53c75632..a60b0811 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -23,12 +23,8 @@ "libview.expandedNodes": [ "parowutd", "/", - "v6yvqp7w", - "/", - "v6yvqp7w", - "/component/", - "v6yvqp7w", - "/component/Main/" + "lkq9ne9s", + "/" ], "snapToGrid": true, "backgroundColor": 6710886, diff --git a/wb_new_ui/assets/Main_RunBeard/Btn_chat.xml b/wb_new_ui/assets/Main_RunBeard/Btn_chat.xml new file mode 100644 index 00000000..292b7167 --- /dev/null +++ b/wb_new_ui/assets/Main_RunBeard/Btn_chat.xml @@ -0,0 +1,11 @@ + + + + + + + + + +