diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index 6ed54b14..f81d4cd8 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -839,18 +839,18 @@ function M:EventInit() -- local card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2") local card_code_obj = nil if DataManager.CurrenRoom.pai == 0 then - if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. - "_1") + "_1") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n) end else - if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. - "_2") + "_2") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2") end @@ -1219,7 +1219,7 @@ function M:ReconnectForClearing() else card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2") end - if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n .. "_1") end 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 69d731fe..41ee3448 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -65,19 +65,19 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim) -- else -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") -- end - -- if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + -- if code==310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- -- body -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFast/"..code.."_1") -- end if DataManager.CurrenRoom.pai == 0 then - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end else - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else @@ -110,14 +110,14 @@ function M:SetOutCardInfo(cardlist, isPass, isAnim) local code = self:ChangeCodeByTo(cardlist[i]) local card_code_obj if DataManager.CurrenRoom.pai == 0 then - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end else - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else @@ -293,14 +293,14 @@ function M:CreatPoker1(poker, scale, bank) local card_code_obj if DataManager.CurrenRoom.pai == 0 then - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end else - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else @@ -322,14 +322,14 @@ function M:CreatPoker(poker, scale, bank) local code = self:ChangeCodeByTo(poker) local card_code_obj if DataManager.CurrenRoom.pai == 0 then - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_1") else card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) end else - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code .. "_2") else 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 730f7b9a..80d2df4e 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -644,19 +644,19 @@ function M:SetOutCardList(cardlist, isAnim) -- else -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. code .. "_2") -- end - -- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + -- if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- -- body -- card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFast/" .. code .. "_1") -- end if DataManager.CurrenRoom.pai == 0 then - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_1') else card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code) end else - if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then + if code == 310 and DataManager.CurrenRoom.room_config.Heart10 == 2 then -- body card_code_obj = UIPackage.CreateObjectFromURL('ui://Extend_Poker_RunFastNew/' .. code .. '_2') else