diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index 397fcc44..e22d6862 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -13,8 +13,8 @@ function LoginController.new() end local _LocalConfigAllGame = { - 10, 33, - 90, + -- 10, 33, + -- 90, 66, 86, 87, 88, 89 } diff --git a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua index dd68910e..eb2bb4d2 100644 --- a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua +++ b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua @@ -26,7 +26,9 @@ local CardType = { zha = 6, onlyThree = 7, onlyPlant = 8, - zhaAndThreee = 9 + zhaAndThreee = 9, + lessThree = 11, + lessPlant = 12 } local M = CardCheck @@ -350,7 +352,7 @@ function M:CheckOutCardGetType() if self.lastCardNum > 2 then longLength = self.lastCardNum / 2 end - elseif self.type == CardType.threeAndTwo or self.type == CardType.onlyThree or self.type == CardType.normolPlant or self.type == CardType.onlyPlant then + elseif self.type == CardType.threeAndTwo or self.type == CardType.onlyThree or self.type == CardType.lessThree or self.type == CardType.normolPlant or self.type == CardType.onlyPlant or self.type == CardType.lessPlant then cardType = 3 if self.type == CardType.onlyThree or self.type == CardType.onlyPlant then only = 1 @@ -501,8 +503,8 @@ function M:CheckSanDai() end end - if self.threelack and self.cardNum == 4 and self.cardSize == 2 and M:CheckType(CardType.threeAndTwo) then - return CardType.threeAndTwo + if self.threelack and self.cardNum == 4 and self.cardSize == 2 and M:CheckType(CardType.lessThree) then + return CardType.lessThree end if self.threeNoBelt and self.cardNum == 3 and self.cardSize == 1 and M:CheckType(CardType.onlyThree) then @@ -543,7 +545,7 @@ function M:CheckSanDai() print("liengmengCheckthreelack", self.threelack, self._flag_allCards) - if self.threelack and self._flag_allCards and M:CheckType(CardType.normolPlant) then + if self.threelack and M:CheckType(CardType.lessPlant) then local last_k local num_san = 0 for k, v in pairs(self.cardList) do @@ -564,7 +566,7 @@ function M:CheckSanDai() print("liengmengCheckthreelack4", num_san, self.cardNum - num_san * 3 < num_san * 2) if self.cardNum - num_san * 3 < num_san * 2 then - return CardType.normolPlant + return CardType.lessPlant else return end @@ -614,8 +616,9 @@ end function M:CheckType(type) if type == CardType.duiLong then - print() return self._flag_checkLst or self._flag_fristCard or (type == self.type and self.cardNum == self.lastCardNum) + elseif type == CardType.lessPlant or type == CardType.lessThree then + return self._flag_checkLst or (self._flag_fristCard and self._flag_allCards) or type == self.type else return self._flag_checkLst or self._flag_fristCard or type == self.type end diff --git a/lua_probject/extend_project/extend/poker2/suoha/EXGameInfo_jiangxi.lua b/lua_probject/extend_project/extend/poker2/suoha/EXGameInfo_jiangxi.lua index 50f55460..2ab19e37 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/EXGameInfo_jiangxi.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/EXGameInfo_jiangxi.lua @@ -52,7 +52,7 @@ function M:SelectedConfigData() local _data = {} - _data["opt"] = round + _data["opt"] = round + 1 _data["maxPlayers"] = Mathf.Round(self.peopleSlider.value) + 1 _data["min_score"] = 0 _data["max_score"] = 0 diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png.meta b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png.meta index 0e7e57af..d2d639b8 100644 --- a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png.meta +++ b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker2/suoha/83217804b18da7615a838e8d85db4cdd assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes.meta b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes.meta index a5ad9c7e..bddde538 100644 --- a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes.meta +++ b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes.meta @@ -3,5 +3,5 @@ guid: 9cf040078a8b4b1468dad9cc95784ed8 TextScriptImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: extend/poker2/suoha/83217804b18da7615a838e8d85db4cdd assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Info_Poker_SuoHa_fui.bytes.meta b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Info_Poker_SuoHa_fui.bytes.meta index b90d458f..4a3b161e 100644 --- a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Info_Poker_SuoHa_fui.bytes.meta +++ b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Info_Poker_SuoHa_fui.bytes.meta @@ -3,5 +3,5 @@ guid: 22180c3e6d0d26848a8ca65c0c1ff971 TextScriptImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: extend/poker2/suoha/3eb3a4c93d0439312c71781f18dcdc52 assetBundleVariant: