同步前提交0630

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秒

lua_probject/extend_project/extend/poker/runfast/CardCheck.lua

@@ -423,7 +423,7 @@ function M:CheckOutCardGetTouchSet(cardSet, cardMap, cardType, longLength)
     local ZhaCardList = {}
     for i = 1, #cardSet do
         local card = cardSet[i]
-        if cardMap[card].value >= cardType and card > self.lastMinCard and cardMap[card].value ~= 4 then
+        if cardMap[card].value >= cardType and card > self.lastMinCard then
             if tempLong == 0 then
                 tempLong = 1
             else

wb_new_ui/.objs/workspace.json

@@ -11,6 +11,8 @@
     "ui://8wph7p8nro85csf",
     "ui://8wph7p8nro85ct3",
     "ui://m7iejg46kwi0hma",
+    "ui://lkq9ne9speuq9n",
+    "ui://lkq9ne9speuqcu",
     "ui://8wph7p8nro85cuf",
     "ui://8wph7p8nro85cqx",
     "ui://m7iejg46mpllhv2",
@@ -29,7 +31,7 @@
   "test.device": "Huawei Mate20",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46kwi0hma",
+  "doc.activeDoc": "ui://lkq9ne9speuq9n",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "8wph7p8n",

wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,690" designImageLayer="1">
-  <controller name="bipai" pages="0,,1,,2,,3," selected="2"/>
+  <controller name="bipai" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <component id="n62_j5c2" name="dibtn" src="peuq9o" fileName="component/option/dibutton.xml" xy="0,2" size="2538,694"/>
     <image id="n78_h5b1" name="di1" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1877,109" size="415,345" group="n66_j4og" scale="1.15,1.15">
-      <relation target="" sidePair="left-right"/>
+      <relation target="" sidePair="right-right"/>
     </image>
     <graph id="n64_j4og" name="di1__" xy="1853,85" pivot="1,0" size="542,455" group="n66_j4og" alpha="0.8" type="rect" lineColor="#00000000" fillColor="#00000000" corner="20">
       <relation target="n27_m25s" sidePair="width-width,height-height"/>
     </graph>
-    <text id="n65_j4og" name="n65" xy="1894,128" size="54,253" group="n66_j4og" scale="1.15,1.15" font="ALIBABAPUHUITI-3-55-REGULAR" fontSize="50" color="#ffffff" autoSize="none" strokeColor="#000000" text="吃牌"/>
+    <text id="n65_j4og" name="n65" xy="1894,128" size="54,253" group="n66_j4og" scale="1.15,1.15" font="ALIBABAPUHUITI-3-55-REGULAR" fontSize="50" color="#ffffff" autoSize="none" strokeColor="#000000" text="吃牌">
+      <relation target="n27_m25s" sidePair="right-left"/>
+    </text>
     <list id="n27_m25s" name="Lst_choose" xy="1965,131" size="323,234" group="n66_j4og" scale="1.15,1.15" layout="row" lineGap="7" colGap="10" defaultItem="ui://lkq9ne9speuq9g" align="right" vAlign="middle">
+      <relation target="" sidePair="right-right"/>
       <item url="ui://lkq9ne9speuq9g1"/>
       <item url="ui://lkq9ne9speuq9g1"/>
       <item url="ui://lkq9ne9spe1uq9g"/>
     </list>
-    <group id="n66_j4og" name="1223" xy="1853,85" size="542,455" advanced="true">
-      <relation target="" sidePair="right-right"/>
-    </group>
+    <group id="n66_j4og" name="1223" xy="1853,85" size="542,455" advanced="true"/>
     <image id="n79_o0c1" name="di2" src="h5b1rr" fileName="image/main_2/main_2_choice.png" xy="1376,103" pivot="1,0" size="414,345" group="n76_oqog" scale="1.15,1.15">
       <relation target="" sidePair=""/>
       <relation target="n78_h5b1" sidePair="left-left"/>

wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF.meta

@@ -18,5 +18,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/0d56496026ccd793fe20690e6a970028
   assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -24,10 +24,10 @@
     "bundle": "extend/majiang/changsha"
   },
   {
-    "ver": "1.0.1",
+    "ver": "1.0.2",
     "name": "娄底放炮罚",
     "check": true,
-    "version": "1.0.1",
+    "version": "1.0.2",
     "game_id": "17",
     "bundle": "extend/zipai/fanpaofa"
   },

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}