getData改int

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -371,7 +371,10 @@ function M:FG_ENTER_CHATROOM(groupId, getData, callback)
     local _data = {}
     _data.groupId = groupId
     _data.uid = DataManager.SelfUser.account_id
-    _data.getData = getData
+    _data.getData = 0
+    if getData == true then
+        _data.getData = 1
+    end
     self._mgr_client:send(Protocol.FGMGR_EVT_ENTER_CHATROOM, _data, function(res)
         --[[
         if _data.getData then

lua_probject/base_project/Game/View/FamilyView.lua

@@ -74,7 +74,7 @@ local function SortMembers(Members)
 end
 
 function FamilyView.new()
-    --print("刘海屏Rect x:%s, y:%s, height:%s, width:%s", Screen.safeArea.x, Screen.safeArea.y, Screen.safeArea.height,Screen.safeArea.width)
+    --print("刘海屏Rect position:%s, height:%s, width:%s", Screen.safeArea.position, Screen.safeArea.height,Screen.safeArea.width)
 
     UIPackage.AddPackage("base/Family/ui/Family")
 
@@ -94,6 +94,11 @@ function M:init(url)
     local view = self._view
     self.lastTime = os.time()
 
+
+    --self.n393 = self._view:GetChild("n393")
+    --self.n393.text = "无信息"
+    --self.n393.text = string.format("刘海屏Rect position:%s, height:%s, width:%s", Screen.safeArea.position, Screen.safeArea.height, Screen.safeArea.width)
+
     --self._child_familyAuditNumber = FamilyAuditNumber.new(self)
     self.com_FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
 

wb_new_ui/assets/Family/Main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="6"/>
+  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
   <controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
   <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>

wb_unity_pro/Assets/ART/base/static/fonts/兰亭黑简.TTF.meta

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

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -24,34 +24,34 @@
     "bundle": "extend/poker2/suoha"
   },
   {
-    "ver": "1.0.22",
+    "ver": "1.0.23",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.22",
+    "version": "1.0.23",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.23",
+    "ver": "1.0.24",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.23",
+    "version": "1.0.24",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.18",
+    "ver": "1.0.19",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.18",
+    "version": "1.0.19",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.17",
+    "ver": "1.0.18",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.17",
+    "version": "1.0.18",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.9"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.9",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.9",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]

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}