合并

lua_probject/base_project/Game/Protocol.lua

@@ -349,6 +349,8 @@ Protocol = {
     WEB_FG_Witness_ROOM             = "group/room/join_spectator",
     -- 圈子退出观战房间
     WEB_FG_Exit_Witness_ROOM        = "group/room/out_spectator",
+    -- 设置是否允许观战
+    WEB_FG_SET_CANWATCH             = "group/set_group_guest",
 
     -------------- group-mgr --------------------
     -- 进入圈子
@@ -389,8 +391,6 @@ Protocol = {
     FGMGR_EVT_ISOPEN_CHATROOM       = "12011",
     -- 进入聊天室
     FGMGR_EVT_ENTER_CHATROOM        = "13004",
-    -- 设置是否允许观战
-    WEB_FG_SET_CANWATCH             = "set_group_guest",
 
     --end::::::::::::::牌友圈协议::::::::::::::::::::
 

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

@@ -223,6 +223,7 @@ function FamilyMyFamily:Init()
         local curView = ViewManager.GetCurrenView()
         if curView.class == "FamilyMainView" then
             curView:OpenAllNumber(self.family)
+            BaseWindow.DestroyAll()
         else
             local view = ViewManager.ChangeView(ViewManager.View_Family, function()
                 view:OpenAllNumber(self.family)

lua_probject/base_project/Main.lua

@@ -52,7 +52,9 @@ function Main()
         end
     end
 
+    pcall(function()
         EmojiLuaHelper.Init()
+    end)
 
     --PlayerPrefs.DeleteKey('session_id')
     Application.targetFrameRate = 60

wb_new_ui/assets/Family/Main.xml

@@ -6,7 +6,7 @@
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
   <controller name="numberRecord" pages="0,,1,,3," selected="0"/>
   <controller name="showChooseTime" pages="0,,1," selected="0"/>
-  <controller name="lev" pages="0,1,1,2,2,3" selected="1"/>
+  <controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
   <controller name="moreBtn" pages="0,,1," selected="0"/>
   <controller name="familyBan" pages="0,,1," selected="0"/>
   <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
@@ -120,7 +120,7 @@
       <gearDisplay controller="cIsChatRoom" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <group id="n34_86ct" name="main" xy="0,0" size="2532,1170" advanced="true">
+    <group id="n34_86ct" name="main" xy="1,0" size="2532,1170" advanced="true">
       <gearDisplay controller="familyType" pages="0"/>
     </group>
     <image id="n392_f1fu" name="n392" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n395_f1fu">
@@ -195,6 +195,6 @@
     <group id="n386_yk1o" name="n386" xy="0,0" size="2532,1170" advanced="true">
       <gearDisplay controller="cMyfamilyList" pages="1"/>
     </group>
-    <text id="n396_sntq" name="n396" xy="621,101" size="1347,59" fontSize="30" autoSize="none" text="我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9我是1.0.9"/>
+    <text id="n396_sntq" name="n396" xy="621,101" size="1347,59" fontSize="30" autoSize="none" text="我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8我是1.0.8"/>
   </displayList>
 </component>

wb_new_ui/assets/Family/Main/Component/c_familyMember.xml

@@ -4,14 +4,14 @@
   <displayList>
     <graph id="n16_jrro" name="n16" xy="0,0" size="96,84" type="rect" lineSize="0" fillColor="#ffd9d9d9"/>
     <component id="n14_jrro" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="0,0" size="96,84"/>
-    <richtext id="n17_jrro" name="title" xy="114,-3" size="208,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ad3c3a" align="center" autoSize="shrink" bold="true" text="超长的名字"/>
+    <richtext id="n17_jrro" name="title" xy="111,-3" size="208,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ad3c3a" autoSize="shrink" bold="true" text="超长的名字"/>
     <image id="n18_jrro" name="n18" src="jrro7cyq" fileName="Main/Image/image_inGame.png" xy="114,48">
       <gearDisplay controller="type" pages="3"/>
     </image>
-    <image id="n19_jrro" name="n19" src="jrro7cyr" fileName="Main/Image/image_levef.png" xy="128,48" size="98,33">
+    <image id="n19_jrro" name="n19" src="jrro7cyr" fileName="Main/Image/image_levef.png" xy="114,48" size="122,30">
       <gearDisplay controller="type" pages="0"/>
     </image>
-    <image id="n20_jrro" name="n20" src="jrro7cys" fileName="Main/Image/image_online.png" xy="130,48">
+    <image id="n20_jrro" name="n20" src="jrro7cys" fileName="Main/Image/image_online.png" xy="114,48" size="122,30">
       <gearDisplay controller="type" pages="1"/>
     </image>
   </displayList>

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

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

wb_unity_pro/Assets/Source/Generate/UnityEngine_MeshRendererWrap.cs

@@ -12,9 +12,6 @@ public class UnityEngine_MeshRendererWrap
 		L.RegFunction("__tostring", ToLua.op_ToString);
 		L.RegVar("additionalVertexStreams", get_additionalVertexStreams, set_additionalVertexStreams);
 		L.RegVar("subMeshStartIndex", get_subMeshStartIndex, null);
-		L.RegVar("scaleInLightmap", get_scaleInLightmap, set_scaleInLightmap);
-		L.RegVar("receiveGI", get_receiveGI, set_receiveGI);
-		L.RegVar("stitchLightmapSeams", get_stitchLightmapSeams, set_stitchLightmapSeams);
 		L.EndClass();
 	}
 
@@ -98,63 +95,6 @@ public class UnityEngine_MeshRendererWrap
 		}
 	}
 
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int get_scaleInLightmap(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			float ret = obj.scaleInLightmap;
-			LuaDLL.lua_pushnumber(L, ret);
-			return 1;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index scaleInLightmap on a nil value");
-		}
-	}
-
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int get_receiveGI(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			UnityEngine.ReceiveGI ret = obj.receiveGI;
-			ToLua.Push(L, ret);
-			return 1;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index receiveGI on a nil value");
-		}
-	}
-
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int get_stitchLightmapSeams(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			bool ret = obj.stitchLightmapSeams;
-			LuaDLL.lua_pushboolean(L, ret);
-			return 1;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index stitchLightmapSeams on a nil value");
-		}
-	}
-
 	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
 	static int set_additionalVertexStreams(IntPtr L)
 	{
@@ -173,62 +113,5 @@ public class UnityEngine_MeshRendererWrap
 			return LuaDLL.toluaL_exception(L, e, o, "attempt to index additionalVertexStreams on a nil value");
 		}
 	}
-
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int set_scaleInLightmap(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			float arg0 = (float)LuaDLL.luaL_checknumber(L, 2);
-			obj.scaleInLightmap = arg0;
-			return 0;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index scaleInLightmap on a nil value");
-		}
-	}
-
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int set_receiveGI(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			UnityEngine.ReceiveGI arg0 = (UnityEngine.ReceiveGI)ToLua.CheckObject(L, 2, typeof(UnityEngine.ReceiveGI));
-			obj.receiveGI = arg0;
-			return 0;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index receiveGI on a nil value");
-		}
-	}
-
-	[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-	static int set_stitchLightmapSeams(IntPtr L)
-	{
-		object o = null;
-
-		try
-		{
-			o = ToLua.ToObject(L, 1);
-			UnityEngine.MeshRenderer obj = (UnityEngine.MeshRenderer)o;
-			bool arg0 = LuaDLL.luaL_checkboolean(L, 2);
-			obj.stitchLightmapSeams = arg0;
-			return 0;
-		}
-		catch(Exception e)
-		{
-			return LuaDLL.toluaL_exception(L, e, o, "attempt to index stitchLightmapSeams on a nil value");
-		}
-	}
 }
 

wb_unity_pro/Assets/StreamingAssets/init2_1.json

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