同步

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

@@ -384,13 +384,20 @@ function M:_evtOnFamilyMemberOut(...)
     local reflashType = arg.reflashType
 
     local group = DataManager.groups:get(groupId)
-    local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
-    tips = string.format(tips, DataManager.SelfUser.nick_name, DataManager.SelfUser.account_id, group.name, groupId)
 
     local view = ViewManager.GetCurrenView()
     if view.class ~= "FamilyMainView" or not group then
         return
     end
+    local tips = ""
+
+    if name == group.name then
+        tips = "【%s(%s)】亲友圈已解散"
+        tips = string.format(tips, group.name, groupId)
+    else
+        tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
+        tips = string.format(tips, DataManager.SelfUser.nick_name, DataManager.SelfUser.account_id, group.name, groupId)
+    end
     if uid == DataManager.SelfUser.account_id then
         DataManager.groups:del(groupId)
         if #DataManager.groups.groupList == 0 then

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

@@ -38,10 +38,16 @@ function M:Init()
 end
 
 function M:msgRenderer(index, obj)
-    local data = self.msgData
+    local data = self.msgData[index + 1]
-    obj:GetChild('tex_time').text = os.date("%Y-%m-%d  %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
+    local type = data.diamo_type
-    obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
+    obj:GetChild('tex_time').text = os.date("%Y-%m-%d  %H:%M:%S", math.floor(data.m_time / 1000))
-        data[index + 1].diamo_num, data[index + 1].diamo_cur)
+    if type == 2 and data.user_nick and #data.user_nick > 0 then
+        obj:GetChild('tex_msg').text = string.format("【%s(%s)】用户为亲友圈充值%d房卡，剩余%d房卡", data.user_nick, data.uid,
+            data.diamo_num, data.diamo_cur)
+    else
+        obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data.diamo_type + 1],
+            data.diamo_num, data.diamo_cur)
+    end
 end
 
 function M:Show(groupId)

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

@@ -42,6 +42,7 @@ end
 local function QuitFamily(self)
     local uid = DataManager.SelfUser.account_id
     local group = DataManager.groups:get(self.groupId)
+    local groupName = group.name
     local player = group.memberMap[uid]
 
     local tips = "确定退出该亲友圈?"
@@ -74,6 +75,12 @@ local function QuitFamily(self)
             --     end
             --     ViewManager.ChangeView(ViewManager.View_Lobby)
             -- else
+            if group.lev == 1 then
+                local win = MsgWindow.new(self._view,
+                    string.format("群主【%s】解散了【%s】亲友圈", DataManager.SelfUser.nick_name, groupName),
+                    MsgWindow.MsgMode.OnlyOk)
+                win:Show()
+            end
             Broadcast.Send(BroadcastEvent.OnOutFamily2)
             -- end
             self:Close()

lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua

@@ -40,10 +40,21 @@ function M:Init()
 end
 
 function M:msgRenderer(index, obj)
-    local data = self.msgData
+    local data = self.msgData[index + 1]
-    obj:GetChild('tex_time').text = os.date("%Y-%m-%d  %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
+    local type = data.diamo_type
-    obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
+    obj:GetChild('tex_time').text = os.date("%Y-%m-%d  %H:%M:%S", math.floor(data.m_time / 1000))
-        data[index + 1].diamo_num, data[index + 1].diamo_cur)
+    if type == 2 and data.user_nick and #data.user_nick > 0 then
+        obj:GetChild('tex_msg').text = string.format("【%s(%s)】用户为%s亲友圈充值%d房卡，剩余%d房卡", data.user_nick, data.uid,
+            (data.group_name and #data.group_name > 0) and string.format("【%s(%s)】", data.group_name, data.group_id) or
+            "",
+            data.diamo_num, data.diamo_cur)
+    elseif type == 1 and data.group_name and #data.group_name > 0 then
+        obj:GetChild('tex_msg').text = string.format("您解散了【%s(%s)】亲友圈,返还您%d房卡，剩余%d房卡", data.group_name, data.group_id,
+            data.diamo_num, data.diamo_cur)
+    else
+        obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data.diamo_type + 1],
+            data.diamo_num, data.diamo_cur)
+    end
 end
 
 function M:Show(groupId)

wb_unity_pro/Assets/Plugins/Android/libs/arm64-v8a/libclinkapi-lib.so.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 573af538d71a8364890b8cbaa0a776d8
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings:
-        CPU: ARM64
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,80 +1,80 @@
 [
   {
     "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.29"
+    "version": "1.0.7"
   },
   {
     "ver": "1.0.6",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.22"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.23"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.24"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.23"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.21"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.6",
     "bundle": "base/rank"
   },
   {
     "ver": "1.0.6",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.25",
+    "version": "1.0.6",
     "bundle": "base/main_majiang"
   },
   {
     "ver": "1.0.6",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.23",
+    "version": "1.0.6",
     "bundle": "base/main_poker"
   },
   {
     "ver": "1.0.6",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.6",
     "bundle": "base/main_zipai"
   },
   {
@@ -82,7 +82,7 @@
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
@@ -90,20 +90,20 @@
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.21"
+    "version": "1.0.6"
   },
   {
     "ver": "1.0.6",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.6",
     "bundle": "base/main_pokemajiang"
   },
   {
     "ver": "1.0.6",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.6",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/Pack/asset_config1.0.7.json

@@ -0,0 +1,109 @@
+[
+  {
+    "lua_path": "/tolua_project,/base_project,/main_project",
+    "ver": "1.0.7",
+    "name": "base_script",
+    "check": true,
+    "bundle": "base/base_script",
+    "version": "1.0.7"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "common",
+    "check": true,
+    "bundle": "base/common",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "login",
+    "check": true,
+    "bundle": "base/login",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "lobby",
+    "check": true,
+    "bundle": "base/lobby",
+    "version": "1.0.6"
+  },
+  {
+    "ver": "1.0.6",
+    "name": "Family",
+    "check": true,
+    "bundle": "base/Family",
+    "version": "1.0.6"
+  },
+  {
+    "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.6",
+    "name": "main_majiang",
+    "check": true,
+    "version": "1.0.6",
+    "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"
+  }
+]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ 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}

wb_unity_pro/ProjectSettings/ProjectSettings.asset

@@ -12,8 +12,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: qyhy
+  companyName: quyou
-  productName: "\u68CB\u6E90\u4E92\u5A31"
+  productName: "\u8DA3\u53CB"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}