加上其余全求人，修复手牌只剩锁牌，替换部分ui

2026-05-20 20:44:00 +08:00 · 2026-05-20 20:44:00 +08:00 · 8b87ec297e
parent a0aedddda5
commit 8b87ec297e
34 changed files with 568 additions and 38 deletions
--- a/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/CS_Win_Type.lua
@ -24,11 +24,11 @@ local CS_Win_Type = {
 	"七大对",
 	"七大对清一色",
 	"七大对混一色",
-	"双杠花",
-	"双杠上炮",
-	"三杠花",
-	"三杠上炮",
-	"四杠花",
+	"清一色全求人",
+	"混一色全求人",
+	"碰碰胡清一色全求人",
+	"碰碰胡混一色全求人",
+	"碰碰胡全求人",
 	"四杠上炮",
 	"塘子七星",
 	"塘子一般高",
--- a/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/CardCheck.lua
@ -435,7 +435,7 @@ function M:isQdPari(cardList)
 	return false
 end

-local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
+local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi,isDeadLockResolved)
 	self.stack = {}
 	self.pair_count = 0
 	self.cardList = membe_clone(cardInhand)
@ -452,12 +452,15 @@ local function init(self,cardInhand,addCard,isZhong,qidui,eightLaizi)
 	table.sort(self.cardList)
 	--printlog("添加排序====>>>")
 	--pt(self.cardList)
+	if isDeadLockResolved then
+		return false
+	end
 	return self:checkLanPai() or self:checkQidui() or self:tryWin()

 end

 local specialCardList={401,402,403,404,502,503,501}
-function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+function M.tingPai(cardInhand,isZhong,qidui,eightLaizi,isDeadLockResolved)
 	local self = setmetatable({}, {__index = M})
 	local tingList = {}
 	if not cardInhand or #cardInhand == 0 then
@ -466,7 +469,7 @@ function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
 	for k=100,300,100 do
 		for i=1,9 do
 			local tem = k + i
-			local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi)
+			local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi,isDeadLockResolved)
 			--printlog("返回结果为===>>>",result)
 			if(result) then
 				tingList[#tingList + 1] =  tem
@ -477,7 +480,7 @@ function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
 	
 	for j=1,#specialCardList do
 		local tem = specialCardList[j]
-		local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi)
+		local result = init(self,cardInhand,tem,isZhong,qidui,eightLaizi,isDeadLockResolved)
 		if(result) then
 			tingList[#tingList + 1] =  tem
 		end
@ -486,14 +489,14 @@ function M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
 	return tingList
 end

-function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi)
+function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi, wuyonCanShu, isDeadLockResolved)
 	if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo>0 then
 		zhongid=DataManager.CurrenRoom.laiziInfo[1]
 		local tempTingList2={}
-		local tempTingList1=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+		local tempTingList1=M.tingPai(cardInhand,isZhong,qidui,eightLaizi,isDeadLockResolved)
 		if DataManager.CurrenRoom.laiziInfo[2] then
 			zhongid=DataManager.CurrenRoom.laiziInfo[2]
-			tempTingList2=M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+			tempTingList2=M.tingPai(cardInhand,isZhong,qidui,eightLaizi,isDeadLockResolved)
 			zhongid=DataManager.CurrenRoom.laiziInfo[1]
 		end
 		local currentTingList={}
@ -509,7 +512,7 @@ function M.MuiltiplteCaculateTingPai(cardInhand,isZhong,qidui,eightLaizi)
 	
 	else
 		zhongid=501
-		return M.tingPai(cardInhand,isZhong,qidui,eightLaizi)
+		return M.tingPai(cardInhand,isZhong,qidui,eightLaizi,isDeadLockResolved)
 	end
 	
 end
--- a/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/EXGameInfo.lua
@ -116,7 +116,7 @@ function M:SelectedConfigData()
 	end


-	local fengdingTable = { 0, 40, 80, 160 }
+	local fengdingTable = { [0] = 0, [1] =100,[2] =200}

 	------
 	local _data = {}
@ -146,13 +146,13 @@ function M:SelectedConfigData()
 end

 function M:LoadConfigData(data)
-	printlog("加载房间配置=========>>>")
-	pt(data)
+	-- printlog("加载房间配置=========>>>")
+	-- pt(data)
 	local _config = self._config
 	_config:GetController("round").selectedIndex = data.opt - 1
 	_config:GetController("play_list").selectedIndex = data.maxPlayers - 2

-	local fengdingTable = { 0, 40, 80, 160 }
+	local fengdingTable =  { [0] = 0, [1] =100,[2] =200}

 	for i, v in ipairs(fengdingTable) do
 		if v == data.fengding then
--- a/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua
@ -16,6 +16,8 @@ function M.new()
    self.asset_group = "HeChi_MJ"
     -- 初始化锁定吃牌具体变量
     self._lockedCardForChi = nil 
+    -- 初始化是否进入死锁解除状态标记
+    self.isDeadLockResolved = false  


    self:init()
@ -192,6 +194,8 @@ function M:EventInit()


    _gamectr:AddEventListener(TX_GameEvent.SendCards,function( ... )
+         -- 每局发牌时，重置死锁标记，确保新一局干净
+         self.isDeadLockResolved = false
        -- self:ShowHuTip()
        self:UpdateRound()
        self:reqResidueCard()
@ -659,7 +663,6 @@ function M:OnFangziAction(...)
    local player = arg[2]
    local index = arg[3]
    printlog("OnFangziAction")
-
    -- 计算锁定状态，保存到 self._lockedCardForChi
    if player.seat == self._room.self_player.seat and fz.type == FZType.Chi then
        self:CalculateChiLockCard(fz)
@ -734,15 +737,42 @@ function M:CalculateChiLockCard(fz)
        targetCard = nil
    end
    
-    -- 验证目标牌是否真的在手牌中 (可选，为了严谨)
+    -- 验证手牌是否只剩下锁定牌，如果是，则解除锁定防止死锁
    if targetCard then
-        local hasCard = false
-        for _, c in ipairs(self._room.self_player.card_list) do
-            if c == targetCard then
-                hasCard = true
-                break
+        local selfPlayer = self._room.self_player
+        if selfPlayer and selfPlayer.card_list then
+            local hasOtherCard = false
+            for _, c in ipairs(selfPlayer.card_list) do
+                if c ~= targetCard then
+                    hasOtherCard = true
+                    break
+                end
+            end
+            
+            -- 如果手牌里没有其他牌了（全是 targetCard），则不锁定
+            if not hasOtherCard then
+                printlog("警告：手牌仅剩被锁定牌，解除锁定以避免死锁")
+                self._lockedCardForChi = nil
+                -- 标记发生了死锁解除
+                self.isDeadLockResolved = true
+                return
            end
        end
+    end
+
+    -- 验证目标牌是否真的在手牌中 (原有逻辑)
+    if targetCard then
+        local hasCard = false
+        local selfPlayer = self._room.self_player
+        if selfPlayer and selfPlayer.card_list then
+            for _, c in ipairs(selfPlayer.card_list) do
+                if c == targetCard then
+                    hasCard = true
+                    break
+                end
+            end
+        end
+        
        if hasCard then
            self._lockedCardForChi = targetCard
        else
@ -815,6 +845,8 @@ function M:__PiaoNiaoTip()
 end

 function M:ReloadRoom(bskip)
+     -- 【新增】每局开始/重加载时，重置死锁标记
+     self.isDeadLockResolved = false
    local room = self._room
    -- if not room.playing then
    --     self._state.selectedIndex = 2
--- a/lua_probject/extend_project/extend/majiang/hechi/MJPlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/MJPlayerSelfCardInfoView.lua
@ -17,7 +17,16 @@ end

 function M:ShowHuTip(card_list)
    printlog("ShowHuTip")
-    local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, true, DataManager.CurrenRoom.room_config.Qidui, DataManager.CurrenRoom.room_config.Laizi)
+     -- 1. 获取死锁状态
+     local isDeadLock = self._mainView.isDeadLockResolved
+     local tingList = CardCheck.MuiltiplteCaculateTingPai(
+        card_list, 
+        true, 
+        true, 
+        DataManager.CurrenRoom.room_config.Qidui, 
+        DataManager.CurrenRoom.room_config.Laizi, 
+        isDeadLock  
+    )
    if #tingList > 0 then
 		if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo>0 then
 			for i=1,#DataManager.CurrenRoom.laiziInfo do
@ -87,6 +96,8 @@ function M:UpdateHandCard(getcard, mp)
        -- 记录需要标记听牌提示的牌
        local lst_mark = {}
        local total_num = 0
+         -- 在这里获取死锁状态，以便在下面循环中使用
+         local isDeadLock = self._mainView.isDeadLockResolved 
        for i = 1, #_carViewList do
            local btn = _carViewList[i].card
            local card = self:GetCard(btn)
@ -100,7 +111,9 @@ function M:UpdateHandCard(getcard, mp)
           end
           
            list_remove(card_list, card)
-            local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, true, DataManager.CurrenRoom.room_config.Qidui, DataManager.CurrenRoom.room_config.Laizi)
+            local tingList = CardCheck.MuiltiplteCaculateTingPai(
+            card_list, true, true, DataManager.CurrenRoom.room_config.Qidui,
+            DataManager.CurrenRoom.room_config.Laizi,isDeadLock)
            if #tingList > 0 then
                local count = 0
                for j = 1, #tingList do
--- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
+++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
@ -1,5 +1,8 @@
 {
  "objectStatus": {
+    "n121_xevg": {
+      "hidden": true
+    },
    "n154_la4e": {
      "collapsed": true
    }
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@ -43,6 +43,20 @@
    "/images/",
    "27vd145b",
    "/images/COMMui/",
+    "hrxsdiix",
+    "/",
+    "hrxsdiix",
+    "/component/",
+    "hrxsdiix",
+    "/component/hu_effect/",
+    "hrxsdiix",
+    "/component/hu_effect/image/",
+    "h30s8vme",
+    "/",
+    "h30s8vme",
+    "/component/",
+    "h30s8vme",
+    "/component/create_room/",
    "v0j9abjy",
    "/",
    "v0j9abjy",
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he26.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he26.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he26_1.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he26_1.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he27.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he27.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he27_1.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he27_1.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he28.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he28.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he28_1.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he28_1.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he29.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he29.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he29_1.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he29_1.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he30.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he30.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he30_1.png
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/component/hu_effect/image/he30_1.png
--- a/wb_new_ui/assets/Extend_MJ_HeChi/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_HeChi/package.xml
@ -208,11 +208,11 @@
    <image id="la4e5o" name="he23_1.png" path="/component/hu_effect/image/"/>
    <image id="la4e5p" name="he24_1.png" path="/component/hu_effect/image/"/>
    <image id="la4e5q" name="he25_1.png" path="/component/hu_effect/image/"/>
-    <image id="la4e5r" name="he26.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e5s" name="he27.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e5t" name="he28.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e5u" name="he29.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="la4e5v" name="he30.png" path="/component/hu_effect/image/" exported="true"/>
+    <image id="la4e5r" name="he26_1.png" path="/component/hu_effect/image/"/>
+    <image id="la4e5s" name="he27_1.png" path="/component/hu_effect/image/"/>
+    <image id="la4e5t" name="he28_1.png" path="/component/hu_effect/image/"/>
+    <image id="la4e5u" name="he29_1.png" path="/component/hu_effect/image/"/>
+    <image id="la4e5v" name="he30_1.png" path="/component/hu_effect/image/"/>
    <image id="la4e5w" name="he31.png" path="/component/hu_effect/image/" exported="true"/>
    <image id="la4e5x" name="he35.png" path="/component/hu_effect/image/" exported="true"/>
    <image id="la4e5y" name="he32.png" path="/component/hu_effect/image/" exported="true"/>
@ -236,6 +236,11 @@
    <image id="heaj6g" name="he23.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
    <image id="heaj6h" name="he25.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
    <image id="heaj6i" name="he24.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
+    <image id="jeon6j" name="he26.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
+    <image id="jeon6k" name="he27.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
+    <image id="jeon6m" name="he29.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
+    <image id="jeon6n" name="he30.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
+    <image id="jeon6o" name="he28.png" path="/component/hu_effect/image/" exported="true" atlas="alone_npot"/>
  </resources>
  <publish name="Extend_MJ_HeChi" path="..\wb_unity_pro\Assets\ART\extend\majiang\hechi\ui" packageCount="2"/>
 </packageDescription>
--- a/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml
@ -53,17 +53,17 @@
    <component id="n117_xevg" name="n117" src="la4e5" fileName="component/create_room/di01.xml" xy="0,321" size="193,57" group="n124_xevg" controller="type,0">
      <Button title="封顶"/>
    </component>
-    <component id="n118_xevg" name="fd1" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="129,328" size="192,57" group="n122_xevg">
+    <component id="n118_xevg" name="fd1" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="129,328" size="135,43" group="n122_xevg">
      <Button checked="true" title="无封顶" controller="fengding" page="0"/>
    </component>
-    <component id="n119_xevg" name="fd2" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="273,328" size="192,57" group="n122_xevg">
-      <Button title="40分封顶" controller="fengding" page="1"/>
+    <component id="n119_xevg" name="fd2" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="291,328" size="174,38" group="n122_xevg">
+      <Button title="100分封顶" controller="fengding" page="1"/>
    </component>
-    <component id="n120_xevg" name="fd3" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="479,328" size="192,57" group="n122_xevg">
-      <Button title="80分封顶" controller="fengding" page="2"/>
+    <component id="n120_xevg" name="fd3" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="505,328" size="166,47" group="n122_xevg">
+      <Button title="200分封顶" controller="fengding" page="2"/>
    </component>
-    <component id="n121_xevg" name="fd4" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="676,328" size="192,57" group="n122_xevg">
-      <Button title="160分封顶" controller="fengding" page="3"/>
+    <component id="n121_xevg" name="fd4" src="la4e7" fileName="component/create_room/Btn_cr_checkbox.xml" xy="676,328" size="192,57" group="n122_xevg" visible="false">
+      <Button title="200分封顶" controller="fengding" page="3"/>
    </component>
    <group id="n122_xevg" name="n122" xy="129,328" size="739,57" group="n123_xevg"/>
    <group id="n123_xevg" name="n123" xy="129,328" size="739,57" group="n124_xevg" advanced="true"/>
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas0_1.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6j.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6j.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6j.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6j.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 6d732f43a7bcf8843b9d8f1b88d1eca7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6k.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6k.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6k.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6k.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 057453beb0f18374cb29af9652405f1a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6m.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6m.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6m.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6m.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ef516bb34cd18b9458b27668d41fdda6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6n.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6n.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6n.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6n.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 25fa7957c93410b41a7099aeb440c3bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6o.png
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6o.png
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6o.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_atlas_jeon6o.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 4a92310e46ac5aa4b8f697098fa02952
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Extend_MJ_HeChi_fui.bytes
--- a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes
+++ b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes