同步，游戏内用户头像调整。

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -117,8 +117,10 @@ function M:CreateRoom(game_id, _data, callback)
 end
 
 local join_room_frame = 0
+
 function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 	printlog("公共进入房间接口=============PublicJoinRoom")
+	print("test,亲友圈ID是：",group_id)
 	-- 同一帧不重复调用
 	local last_frame = join_room_frame
 	join_room_frame = Time.frameCount
@@ -127,6 +129,7 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 	end
 	-- 防止游戏没有离开控制器
 	ControllerManager.ChangeController(LoddyController)
+	
 	local _data = {}
 	if cmd == Protocol.WEB_FG_MATCH_ROOM then
 		_data["is_null"] = tem

lua_probject/base_project/Game/View/Common/BaseWindow.lua

@@ -65,10 +65,10 @@ function M:init(url)
     else
         ctr_hide_bg.selectedIndex = 0
     end
-    printlog(url)
+    --printlog(url)
     self._view = UIPackage.CreateObjectFromURL(url)
-    printlog(self._view)
-    -- self._view.fairyBatching = true
+    --printlog(self._view)
+     --self._view.fairyBatching = true
     local btn_close = self._view:GetChild("btn_close")
     if (btn_close) then
         btn_close.onClick:Set(function()

lua_probject/base_project/Game/View/FamilyView.lua

@@ -1132,7 +1132,7 @@ function M:Show()
     Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self)
     Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self)
 
-    self.Reflash()
+    --self.Reflash()
     BaseView.Show(self)
 
     self:Reflash()

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -2,7 +2,7 @@
 <component size="132,132" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
-  <controller name="read" pages="0,,1," selected="0"/>
+  <controller name="read" pages="0,,1," selected="1"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
@@ -30,9 +30,9 @@
     <group id="n33_e7qn" name="n33" xy="0,0" size="138,139" advanced="true">
       <relation target="" sidePair="width-width,height-height"/>
     </group>
-    <image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,152" size="55,65">
+    <image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="35,171" size="55,65" scale="1.2,1.2">
       <gearDisplay controller="read" pages="1"/>
-      <relation target="" sidePair="top-bottom"/>
+      <relation target="" sidePair="center-center,top-bottom"/>
     </image>
     <text id="n48_pkx5" name="name" xy="-47,-46" size="226,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="萌萌砂带">
       <gearXY controller="site" pages="2,0,1" values="-47,-46|-37,-57|150,0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -125,23 +125,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
-      <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,909|100,796|1183,909" default="1183,909"/>
+      <gearSize controller="state" pages="0,1" values="153,132,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="56,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,223|1834,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -243,7 +243,7 @@
     </component>
     <component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123">
       <relation target="" sidePair="right-right"/>

wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml

@@ -38,5 +38,6 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <component id="n33_xo4i" name="n33" src="xo4i1br" fileName="Main_new/Main/Component/btn_vipCancel.xml" xy="1037,715"/>
+    <component id="n34_ta4f" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1312,19" visible="false" touchable="false"/>
   </displayList>
 </component>

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f5dfe2527407f0847b118e5033b6d3ca
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta

@@ -11,7 +11,15 @@ TrueTypeFontImporter:
   fontName: Alibaba PuHuiTi 3.0
   fontNames:
   - Alibaba PuHuiTi 3.0
-  fallbackFontReferences: []
+  fallbackFontReferences:
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
+  - {instanceID: 0}
   customCharacters: 
   fontRenderingMode: 0
   ascentCalculationMode: 1

wb_unity_pro/Assets/ART/base/static/fonts/FZCuYuan-M03.TTF.meta

@@ -11,7 +11,8 @@ TrueTypeFontImporter:
   fontName: FZCuYuan-M03
   fontNames:
   - FZCuYuan-M03
-  fallbackFontReferences: []
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: 545e9f78c59b7c94ca8552daa0397675, type: 3}
   customCharacters: 
   fontRenderingMode: 0
   ascentCalculationMode: 1

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.9",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.9",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.9",
     "bundle": "base/main_zipaimajiang"
   }
 ]