From 556099f297521332b688831eef59fd333f60530c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Thu, 10 Apr 2025 13:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/majiang/lichuan/CardCheck.lua      | 19 ++++++-------------
 .../extend/majiang/lichuan/EXMainView.lua     |  1 -
 .../main/majiang/MJPlayerCardInfoView.lua     |  4 +++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lua_probject/extend_project/extend/majiang/lichuan/CardCheck.lua b/lua_probject/extend_project/extend/majiang/lichuan/CardCheck.lua
index 0c8ce6b2..9c4131e6 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/CardCheck.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/CardCheck.lua
@@ -203,7 +203,6 @@ function M:tryWin()
 
 	local activeCard = self.cardList[1]
 	if (self:tryPair(activeCard)) then
-		print("tryPair")
 		if (self:tryWin()) then
 			return true
 		end
@@ -212,23 +211,20 @@ function M:tryWin()
 	end
 
 	if (self:tryKezi(activeCard)) then
-		print("tryKezi")
 		if (self:tryWin()) then
 			return true
 		end
 		self:rollBack()
 	end
 
-	-- if (self:tryShunzi(activeCard)) then
-	-- 	print("tryShunzi")
-	-- 	if (self:tryWin()) then
-	-- 		return true
-	-- 	end
-	-- 	self:rollBack()
-	-- end
+	if (self:tryShunzi(activeCard)) then
+		if (self:tryWin()) then
+			return true
+		end
+		self:rollBack()
+	end
 
 	if (self:tryKezi1Zhong(activeCard)) then
-		print("tryKezi1Zhong")
 		if (self:tryWin()) then
 			return true
 		end
@@ -236,7 +232,6 @@ function M:tryWin()
 	end
 
 	if (self:tryKezi2Zhong(activeCard)) then
-		print("tryKezi2Zhong")
 		if (self:tryWin()) then
 			return true
 		end
@@ -244,7 +239,6 @@ function M:tryWin()
 	end
 
 	if (self:tryShunzi1Zhong(activeCard)) then
-		print("tryShunzi1Zhong")
 		if (self:tryWin()) then
 			return true
 		end
@@ -252,7 +246,6 @@ function M:tryWin()
 	end
 
 	if (self:tryPair1Zhong(activeCard)) then
-		print("tryPair1Zhong")
 		if (self:tryWin()) then
 			return true
 		end
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 7806ad4d..f98ea723 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -101,7 +101,6 @@ function M:UpdateRound()
 end
 
 function M:ShowJing()
-    print("==================================self._room.jing", self._room.jing)
     if self._room.jing then
         self.jing.icon = 'ui://Main_Majiang/' ..
             get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. self._room.jing
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index f6b3a925..e8d9f757 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -117,11 +117,13 @@ function M:GetPrefix()
 end
 
 function M:fillCard(obj, pos_str, card, use3d)
+    if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing then
+        obj:GetController('jing').selectedIndex = 1
+    end
     if self._current_card_type == 2 and (use3d == nil or use3d == true) then
         obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card
     else
         obj.icon = 'ui://Main_Majiang/' .. self:GetPrefix() .. pos_str .. card
-        print("====================================obj", obj.icon)
     end
 end