diff --git a/lua_probject/base_project/Game/Data/GroupData.lua b/lua_probject/base_project/Game/Data/GroupData.lua index 2846d2bc..99f118eb 100644 --- a/lua_probject/base_project/Game/Data/GroupData.lua +++ b/lua_probject/base_project/Game/Data/GroupData.lua @@ -58,6 +58,7 @@ function M:addMember(member) self.memberMap[member.uid] = member self.members[#self.members + 1] = member self.member_num = #self.members + self.total_member_num = self.total_member_num + 1 end end @@ -70,6 +71,7 @@ function M:delMember(id) local member = self.members[i] if member.uid == id then table.remove(self.members, i) + self.total_member_num = self.total_member_num - 1 break end end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 60115822..8cedc495 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -246,6 +246,7 @@ function M:EventInit() card_info:Clear() card_info:UpdateHandCard() card_info._view_handCardList.touchable = true + card_info._view_getCard.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 1066fbbd..d87bbf9f 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -244,6 +244,7 @@ function M:EventInit() card_info:Clear() card_info:UpdateHandCard() card_info._view_handCardList.touchable = true + card_info._view_getCard.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 6472b7fd..5c0066be 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -244,6 +244,7 @@ function M:EventInit() card_info:Clear() card_info:UpdateHandCard() card_info._view_handCardList.touchable = true + card_info._view_getCard.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index c2a154f8..46cf9bee 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -242,6 +242,7 @@ function M:EventInit() card_info:Clear() card_info:UpdateHandCard() card_info._view_handCardList.touchable = true + card_info._view_getCard.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 6508cc00..449c074c 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -792,6 +792,7 @@ function M:OnHuCard(...) self._player_card_info[1]._ctr_tip.selectedIndex = 0 self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0 self._player_card_info[1]._view_handCardList.touchable = false + self._player_card_info[1]._view_getCard.touchable = false self:ShowHand(scoreData) info:ShowHuCard(win_card, index == 1) diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml index d9fcb4ff..d8e9a765 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml @@ -4,7 +4,7 @@ - + @@ -28,8 +28,9 @@ - - + + + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml index ada34632..01fc7175 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml @@ -4,7 +4,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes index b641e49d..95504a45 100644 Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index 5563c588..54449bd6 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -1,41 +1,41 @@ [ { - "ver": "1.0.57", + "ver": "1.0.58", "name": "跑得快", "check": true, - "version": "1.0.57", + "version": "1.0.58", "game_id": "66", "bundle": "extend/poker/runfast" }, { - "ver": "1.0.79", + "ver": "1.0.80", "name": "南城麻将", "check": true, - "version": "1.0.79", + "version": "1.0.80", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.84", + "ver": "1.0.85", "name": "黎川麻将", "check": true, - "version": "1.0.84", + "version": "1.0.85", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.66", + "ver": "1.0.67", "name": "金溪麻将", "check": true, - "version": "1.0.66", + "version": "1.0.67", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.65", + "ver": "1.0.66", "name": "抚州麻将", "check": true, - "version": "1.0.65", + "version": "1.0.66", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 413ef38c..34da9d35 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,11 +1,11 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.14", + "ver": "1.0.16", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.14" + "version": "1.0.16" }, { "ver": "1.0.7", @@ -22,11 +22,11 @@ "version": "1.0.7" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.7" + "version": "1.0.8" }, { "ver": "1.0.7", @@ -57,10 +57,10 @@ "bundle": "base/rank" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_majiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_majiang" }, { diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.14.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes similarity index 99% rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.14.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes index 4120adf2..71c5c6b5 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.14.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes new file mode 100644 index 00000000..9ab52b55 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes new file mode 100644 index 00000000..c1211260 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes new file mode 100644 index 00000000..b296e7f8 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes new file mode 100644 index 00000000..c305797c Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes new file mode 100644 index 00000000..1ec3f81e Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes new file mode 100644 index 00000000..7ea27645 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes differ diff --git a/wb_unity_pro/Pack/asset_config1.0.13 - 副本.json b/wb_unity_pro/Pack/asset_config1.0.15.json similarity index 100% rename from wb_unity_pro/Pack/asset_config1.0.13 - 副本.json rename to wb_unity_pro/Pack/asset_config1.0.15.json diff --git a/wb_unity_pro/Pack/asset_config1.0.16.json b/wb_unity_pro/Pack/asset_config1.0.16.json new file mode 100644 index 00000000..34da9d35 --- /dev/null +++ b/wb_unity_pro/Pack/asset_config1.0.16.json @@ -0,0 +1,109 @@ +[ + { + "lua_path": "/tolua_project,/base_project,/main_project", + "ver": "1.0.16", + "name": "base_script", + "check": true, + "bundle": "base/base_script", + "version": "1.0.16" + }, + { + "ver": "1.0.7", + "name": "common", + "check": true, + "bundle": "base/common", + "version": "1.0.7" + }, + { + "ver": "1.0.7", + "name": "login", + "check": true, + "bundle": "base/login", + "version": "1.0.7" + }, + { + "ver": "1.0.8", + "name": "lobby", + "check": true, + "bundle": "base/lobby", + "version": "1.0.8" + }, + { + "ver": "1.0.7", + "name": "Family", + "check": true, + "bundle": "base/Family", + "version": "1.0.7" + }, + { + "ver": "1.0.6", + "name": "chat", + "check": true, + "bundle": "base/chat", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "newgroup", + "check": true, + "bundle": "base/newgroup", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "rank", + "check": true, + "version": "1.0.6", + "bundle": "base/rank" + }, + { + "ver": "1.0.8", + "name": "main_majiang", + "check": true, + "version": "1.0.8", + "bundle": "base/main_majiang" + }, + { + "ver": "1.0.6", + "name": "main_poker", + "check": true, + "version": "1.0.6", + "bundle": "base/main_poker" + }, + { + "ver": "1.0.6", + "name": "main_zipai", + "check": true, + "version": "1.0.6", + "bundle": "base/main_zipai" + }, + { + "ver": "1.0.6", + "name": "static", + "check": true, + "bundle": "base/static", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "is_res": true, + "name": "embed", + "check": true, + "bundle": "base/embed", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "main_pokemajiang", + "check": true, + "version": "1.0.6", + "bundle": "base/main_pokemajiang" + }, + { + "ver": "1.0.6", + "name": "main_zipaimajiang", + "check": true, + "version": "1.0.6", + "bundle": "base/main_zipaimajiang" + } +]