diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 95def78b..244d27dd 100644 --- a/lua_probject/base_project/Main.lua +++ b/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秒 diff --git a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua index 70580080..4b85de8a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua +++ b/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 diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 03c9f3c8..b9117092 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/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", diff --git a/wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml b/wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml index e08853d8..7d1fbca5 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/option/Pop_tip_choice.xml @@ -1,23 +1,24 @@ - + - + - + + + + - - - + diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes index 2787b159..5c5cb359 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF.meta b/wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF.meta index 0df80c5a..fac21209 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/ALIBABAPUHUITI-3-55-REGULAR.TTF.meta +++ b/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: diff --git a/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/wb_unity_pro/Assets/StreamingAssets/Pack.byte index bd0ade52..76de2769 100644 Binary files a/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index d8dddf75..74e87dd1 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/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" }, diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.1.bytes index 2f7412e8..face8c78 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.1.bytes index 41a0cc67..11a561a0 100644 Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.1.bytes index 9588890f..9504620f 100644 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.1.bytes index 55aa3740..2452442a 100644 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.1.bytes index 1c6e2af4..7df5c9a5 100644 Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.1.bytes index 96d88e23..19da5a19 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.1.bytes index f7a959a4..6aa847ac 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.1.bytes index 1854ed91..7f3f932d 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.1.bytes index eaf003db..d435f900 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.1.bytes index 2448d04e..aec3a6a4 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.1.bytes index 82fa8663..518c8777 100644 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.1.bytes index a7c6467f..a0e4e15d 100644 Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.1.bytes index e1e58f18..3ac704d0 100644 Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.1.bytes index 01b7b7eb..bed308b8 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.1.bytes index 0f7a0742..688496cc 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.1.bytes index 6b990181..fa9d3f60 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.1.bytes index f29a201e..d8deef4c 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.1.bytes b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.1.bytes index 51f33cd3..8d95e7d1 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.1.bytes and b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.1.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.2.bytes b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.2.bytes new file mode 100644 index 00000000..8d95e7d1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/zipai/fanpaofa/asset_pack1.0.2.bytes differ diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index ad8f23e5..4f4dac17 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/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}