no message

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -302,7 +302,7 @@ function M:FG_OPEN_ISOPEN_CHATROOM(groupId, callback)
     end)
 end
 
---
+-- 设置不允许成员可以查看聊天室
 function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback)
     local _data = {}
     _data.groupId = groupId
@@ -312,6 +312,16 @@ function M:FG_CLOSE_ISOPEN_CHATROOM(groupId, callback)
     end)
 end
 
+-- 拉取聊天室数据
+function M:FG_ENTER_CHATROOM(groupId, callback)
+    local _data = {}
+    _data.groupId = groupId
+    _data.uid = DataManager.SelfUser.account_id
+    self._mgr_client:send(Protocol.FGMGR_EVT_ENTER_CHATROOM, _data, function(res)
+        callback(res)
+    end)
+end
+
 -- 邀请在线玩家
 function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback)
     local _data = {}
@@ -395,7 +405,7 @@ function M:OnExit()
 end
 
 function M:__OnNetEvent(msg)
-    print("消息ID===>>"..msg.Command)
+    print("消息ID===>>" .. msg.Command)
     local func = self._eventmap[msg.Command]
     if (func ~= nil) then func(self, msg.Data) end
 end

lua_probject/base_project/Game/Protocol.lua

@@ -385,9 +385,10 @@ Protocol = {
     FGMGR_EVT_OPEN_ISOPEN_CHATROOM  = "13001",
     -- 设置不允许成员查看聊天室
     FGMGR_EVT_CLOSE_ISOPEN_CHATROOM = "13002",
-
     -- 监听聊天室是否开启
     FGMGR_EVT_ISOPEN_CHATROOM       = "12011",
+    -- 进入聊天室
+    FGMGR_EVT_ENTER_CHATROOM        = "13004",
     -- 设置是否允许观战
     WEB_FG_SET_CANWATCH             = "set_group_guest",
 

lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua

@@ -14,6 +14,9 @@ function FamilyJoinAndCreate:init(root)
     self.input_name = self._view:GetChild('input_name')
     self.input_wxId = self._view:GetChild('input_wxId')
 
+    self.input_name.emojies = EmojiDitc.EmojiesDitc
+    self.input_wxId.emojies = EmojiDitc.EmojiesDitc
+
     self._view:GetChild('btn_create').onClick:Add(function()
 
         if self.style.selectedIndex ~= 1 then 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -281,21 +281,10 @@ function M:BanFamily()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败")
             else
-                self._group.ban = not self._group.ban
                 self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
                 self:RefalshMoreBtn()
             end
         end)
-    --[[
-    fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt,
-        self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0,
-        function(res)
-            if res.ReturnCode ~= 0 then
-                ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败")
-            else
-                self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
-            end
-        end)]]
 end
 
 function M:BanDeskmate()
@@ -333,6 +322,13 @@ function M:ConnetFamilyRoom(fgCtr, id)
         else
             self:UpdateFamilyRoom(fgCtr, id)
             self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
+
+            local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+            mgr_ctr:FG_ENTER_CHATROOM(self._group.id, function(res)
+                print("拉取到聊天室数据")
+                pt(res)
+            end)
+
             return 1
         end
     end)

wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_p8hp7cyv.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta

@@ -27,5 +27,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/108c414d6db00284737c5a213639e94b
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta

@@ -28,5 +28,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/42868b9537c20e8e91defc08808329a2
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta

@@ -19,5 +19,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/55df2a9ecf16068215e56b7ae363f6c0
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta

@@ -20,5 +20,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/9fe13c3573d8955a481c677c2c3f49de
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta

@@ -21,5 +21,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/642ccc84db09eac2c5fa32b1354612ac
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta

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

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta

@@ -25,5 +25,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/8f609b04db628f0adab4063f607dac24
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta

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

wb_unity_pro/Assets/Modules/ToLua/Editor/ToLuaExport.cs

@@ -166,7 +166,11 @@ public static class ToLuaExport
         "KeyValuePair.Deconstruct",
         "ParticleSystem.SetJob",
         "ParticleSystem.subEmitters", /*2019.09 ios编译出错，也可能是unity版本问题*/
-        "Type.IsSZArray"
+        "Type.IsSZArray",
+        //Editor
+        "MeshRenderer.scaleInLightmap",
+        "MeshRenderer.stitchLightmapSeams",
+        "MeshRenderer.receiveGI",
     };
 
     class _MethodBase

wb_unity_pro/Assets/Scripts/Editor/EmojiTool.cs

@@ -3,6 +3,7 @@ using System.IO;
 using UnityEditor;
 using FairyGUI;
 using System.Collections;
+using UnityEngine;
 
 public static class EmojiTool
 {
@@ -45,7 +46,9 @@ public static class EmojiTool
         }
         catch 
         {
-        
+            //GameObject go;
+            //MeshRenderer m;
+            //var l = m.scaleInLightmap;
         }
     }
 }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

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