1112下午同步内容

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

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

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

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

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

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)
 

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml

@@ -4,7 +4,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="Oener" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
@@ -28,8 +28,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </component>
     <group id="n49_ckvb" name="head" xy="0,0" size="144,144"/>
-    <text id="n45_kx91" name="text_jifen" xy="-129,76" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
+    <text id="n45_kx91" name="text_jifen" xy="-119,76" size="48,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="3" autoClearText="true" text="01">
-      <relation target="n59_n9qr" sidePair="middle-middle,right-left"/>
+      <relation target="n59_n9qr" sidePair="right-left,top-middle"/>
+      <relation target="" sidePair=""/>
     </text>
     <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="2,89" size="98,53">
       <gearDisplay controller="room_owner" pages="1"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml

@@ -4,7 +4,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="Oener" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
@@ -32,7 +32,7 @@
       <gearDisplay controller="room_owner" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,left-left,bottom-bottom"/>
     </image>
-    <text id="n45_kx91" name="text_jifen" xy="214,76" size="48,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
+    <text id="n45_kx91" name="text_jifen" xy="214,76" size="67,59" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="011">
       <relation target="n59_n9qr" sidePair="middle-middle,left-right"/>
     </text>
     <image id="n42_rnez" name="n42" src="rnezcgx" fileName="component/image/images/庄.png" xy="99,-8" size="73,68">

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"
   }

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"
   },
   {

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"
+  }
+]