观战视角麻将结束展示手牌，同步外部包关于占线问题

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -111,6 +111,8 @@ function M:connect(host, groupId, callback)
     _mgr_client:connect()
     _mgr_client.onconnect:Add(function(code)
         self.code = code
+        printlog("lingmeng _mgr_client.onconnect", code)
+        DataManager._flag_zangxian = false
         if (code == SocketCode.Connect) then
             print("GroupMgrController已连接", code)
             local _data = {}
@@ -183,7 +185,29 @@ function M:connect(host, groupId, callback)
             self:disconnect()
             _mgr_client:destroy()
             if callback then
-                callback({ ReturnCode = 101 })
+                if code == SocketCode.DisconnectByServer then
+                    if DataManager._flag_logout then
+                        local _curren_msg =
+                            MsgWindow.new(
+                                nil,
+                                '您的账号在另一个地点登录， 请确定您的账号是否泄密',
+                                MsgWindow.MsgMode.OnlyOk
+                            )
+                        _curren_msg.onOk:Add(
+                            function()
+                                PlayerPrefs.DeleteKey('session_id')
+                                PlayerPrefs.Save()
+                                RestartGame()
+                            end
+                        )
+                        _curren_msg:Show()
+                        return
+                    end
+                    DataManager._flag_zangxian = true
+                    callback({ ReturnCode = 1001 })
+                else
+                    callback({ ReturnCode = 1001 })
+                end
             end
         end
     end)

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -56,6 +56,7 @@ local function __Login(cmd, _data, callBack)
             user.address    = account.address
             user.games      = FilterGame(data.games)
             user.havaPsw    = data.havaPassword
+            user.currenIp   = data.ip
             if Application.platform == RuntimePlatform.WindowsPlayer or Application.platform == RuntimePlatform.WindowsEditor then
                 --GameApplication.Instance.printLog = true
             else
@@ -67,6 +68,38 @@ local function __Login(cmd, _data, callBack)
             pt(data)
             ControllerManager.GroupClient = NetClient.new(data.groupWeb, "web_group", ConnectionProtocol.Web)
             ControllerManager.GroupClient:setSession((data["session_id"] .. "," .. data["token"]))
+            ControllerManager.GroupClient.holdCallback = function(response)
+                print("lingmeng log roupClient.holdCallback", response.ReturnCode,
+                    response.ReturnCode == Table_Error_code.ERR_LOGOUT)
+                if response.ReturnCode == Table_Error_code.ERR_LOGOUT then
+                    if not DataManager._flag_logout then
+                        -- local tip = "您的登录凭证已过期，请重新登录"
+                        -- if DataManager._flag_zangxian then
+                        -- tip = "您的账号在另一个地点登录， 请确定您的账号是否泄密"
+                        -- end
+                        ViewUtil.CloseModalWait2()
+                        local _curren_msg =
+                            MsgWindow.new(
+                                nil,
+                                "您的账号在另一个地点登录， 请确定您的账号是否泄密",
+                                MsgWindow.MsgMode.OnlyOk
+                            )
+                        _curren_msg.onOk:Add(
+                            function()
+                                PlayerPrefs.DeleteKey('session_id')
+                                PlayerPrefs.Save()
+                                RestartGame()
+                            end
+                        )
+                        _curren_msg:Show()
+                    end
+                    DataManager._flag_logout = true
+                else
+                    DataManager._flag_logout = false
+                end
+                print("lingmeng log roupClient.holdCallback2", DataManager._flag_logout or false)
+                return DataManager._flag_logout or false
+            end
         end
 
         if (callBack ~= nil) then

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -26,7 +26,11 @@ local function __ConntectGameServer(cmd, room, host, _data, callback)
 				print("lingmeng clent code2", cmd, response.ReturnCode)
 				if (response.ReturnCode == 0) then
 					_game_client.onconnect:Clear()
-					_game_client.onconnect:Add(ControllerManager.OnConnect)
+					if cmd == Protocol.GAME_WITNESS_ROOM then
+						_game_client.onconnect:Add(ControllerManager.OnConnectWitness)
+					else
+						_game_client.onconnect:Add(ControllerManager.OnConnect)
+					end
 					callback(response)
 					return
 				end
@@ -340,8 +344,20 @@ function M:JoinRoom(room_id, callback)
 	self:PublicJoinRoom(Protocol.WEB_JOIN_ROOM, room_id, false, callback, group_id, group_layer)
 end
 
+function M:WitnessRoom(room_id, callback)
+	self:PublicWitnessRoom(Protocol.WEB_FG_Witness_ROOM, room_id, DataManager.CurrenRoom.group_id, callback,
+		DataManager.CurrenRoom.game_id,
+		DataManager.CurrenRoom.play_id)
+end
+
 function M:ResetJionRoom(callback)
 	local _game = ControllerManager.GetController(GameController)
 	local o_room = DataManager.CurrenRoom
 	self:JoinRoom(o_room.room_id, callback)
 end
+
+function M:ResetWitnessRoom(callback)
+	local _game = ControllerManager.GetController(GameController)
+	local o_room = DataManager.CurrenRoom
+	self:WitnessRoom(o_room.room_id, callback)
+end

lua_probject/base_project/Game/ControllerManager.lua

@@ -78,9 +78,6 @@ function ControllerManager.SetGameNetClient(client)
         ControllerManager.GameNetClinet:destroy()
     end
     ControllerManager.GameNetClinet = client
-    -- if (client ) then
-    --     client.onconnect:Add(ControllerManager.OnConnect)
-    -- end
 end
 
 function ControllerManager.OnConnect(code)
@@ -99,6 +96,20 @@ function ControllerManager.OnConnect(code)
     end
 end
 
+function ControllerManager.OnConnectWitness(code)
+    print("lingmeng code OnConnectWitness", code)
+    if (code ~= SocketCode.Connect) then
+        ControllerManager.SetGameNetClient(nil)
+        if code ~= SocketCode.DisconnectByServer then
+            ControllerManager.OnGameWitnessConnect(SocketCode.TimeoutDisconnect)
+        else
+            ControllerManager.OnGameWitnessConnect(SocketCode.DisconnectByServer)
+        end
+    else
+        ControllerManager.OnGameWitnessConnect(SocketCode.Connect)
+    end
+end
+
 function ControllerManager.ResetJionRoom()
     ControllerManager.reset_join_room = ControllerManager.reset_join_room + 1
     if ControllerManager.reset_join_room > 3 then
@@ -118,3 +129,23 @@ function ControllerManager.ResetJionRoom()
         ControllerManager.OnGameConnect(SocketCode.Connect)
     end)
 end
+
+function ControllerManager.ResetWitnessRoom()
+    ControllerManager.reset_witness_room = ControllerManager.reset_witness_room + 1
+    if ControllerManager.reset_witness_room > 999 then
+        ControllerManager.OnGameWitnessConnect(SocketCode.NetworkException)
+        return
+    end
+    ControllerManager.ChangeController(RoomController)
+    local roomCtr = ControllerManager.GetController(RoomController)
+    roomCtr:ResetWitnessRoom(function(res)
+        if res.ReturnCode == 11 or res.ReturnCode == 81 or res.ReturnCode == 1005 then
+            ControllerManager.OnGameWitnessConnect(SocketCode.Disconnect)
+            return
+        elseif res.ReturnCode ~= 0 then
+            ControllerManager.ResetWitnessRoom()
+            return
+        end
+        ControllerManager.OnGameWitnessConnect(SocketCode.Connect)
+    end)
+end

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

@@ -4,6 +4,7 @@ local M = FamilAllRank
 
 function FamilAllRank.New(root, groupId)
     local self = setmetatable({}, { __index = M })
+    self._close_destroy = true
     self._father = root
     self.group_id = groupId
     self:init()
@@ -12,8 +13,8 @@ end
 
 function M:init()
     local root = self._father
-    self._lastTpe = root.familyType.selectedIndex
+    -- self._lastTpe = root.familyType.selectedIndex
-    root.familyType.selectedIndex = 0
+    -- root.familyType.selectedIndex = 0
     local comp_rank = UIPackage.CreateObjectFromURL("ui://Family/Comp_Rank")
     root._view:AddChild(comp_rank)
     --[[
@@ -26,8 +27,8 @@ function M:init()
     comp_rank:SetScale(scaleX, scaleY)
     self._view = comp_rank
 
-    local viewBox_leftTime = comp_rank:GetChild('left_time')
+    self._viewBox_leftTime = comp_rank:GetChild('left_time')
-    local viewBox_rightTime = comp_rank:GetChild('right_time')
+    self._viewBox_rightTime = comp_rank:GetChild('right_time')
     local viewBtn_search = comp_rank:GetChild('btn_search')
     local viewBtn_close = comp_rank:GetChild('btn_close')
 
@@ -42,18 +43,18 @@ function M:init()
     end)
 
     local serverDayValues, serverDayItems = self:InitTime()
-    viewBox_leftTime.items = serverDayItems
+    self._viewBox_leftTime.items = serverDayItems
-    viewBox_leftTime.values = serverDayValues
+    self._viewBox_leftTime.values = serverDayValues
-    viewBox_rightTime.items = serverDayItems
+    self._viewBox_rightTime.items = serverDayItems
-    viewBox_rightTime.values = serverDayValues
+    self._viewBox_rightTime.values = serverDayValues
     self.leftTimes = tonumber(serverDayValues[1])
     self.rightTimes = tonumber(serverDayValues[1])
 
-    viewBox_leftTime.onChanged:Set(function()
+    self._viewBox_leftTime.onChanged:Set(function()
-        self.leftTimes = tonumber(viewBox_leftTime.value)
+        self.leftTimes = tonumber(self._viewBox_leftTime.value)
     end)
-    viewBox_rightTime.onChanged:Set(function()
+    self._viewBox_rightTime.onChanged:Set(function()
-        self.rightTimes = tonumber(viewBox_rightTime.value)
+        self.rightTimes = tonumber(self._viewBox_rightTime.value)
     end)
 
     self._viewList_round:SetVirtual()
@@ -94,16 +95,15 @@ end
 function M:ShouRanks(root, groupId)
     self._father = root
     self.group_id = groupId
-    self._lastTpe = self._father.familyType.selectedIndex
+    self._lastTpe = 1
     self._father.familyType.selectedIndex = 0
     self._view.visible = true
-    self:SearchRank()
 end
 
 function M:RoundListRenderer(index, obj)
     local rankTable = self.roundRanks
     obj:GetChild('text_rank').text = index + 1
-    obj:GetChild('text_id').text = rankTable[index + 1].rankTable
+    obj:GetChild('text_id').text = rankTable[index + 1].uid
     obj:GetChild('text_name').text = rankTable[index + 1].nick
     obj:GetChild('text_other').text = rankTable[index + 1].round
     ImageLoad.Load(rankTable[index + 1].portrait, obj:GetChild('btn_head')._iconObject)
@@ -112,7 +112,7 @@ end
 function M:WinListRenderer(index, obj)
     local rankTable = self.winRanks
     obj:GetChild('text_rank').text = index + 1
-    obj:GetChild('text_id').text = rankTable[index + 1].rankTable
+    obj:GetChild('text_id').text = rankTable[index + 1].uid
     obj:GetChild('text_name').text = rankTable[index + 1].nick
     obj:GetChild('text_other').text = rankTable[index + 1].win
     ImageLoad.Load(rankTable[index + 1].portrait, obj:GetChild('btn_head')._iconObject)

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

@@ -69,31 +69,38 @@ function M:initBtn()
 end
 
 function M:FillList(numbers)
+    local copy_numbers = {}
+    for k, v in pairs(numbers) do
+        copy_numbers[k] = v
+    end
+    table.sort(copy_numbers, function(a, b)
+        return a.lev < b.lev
+    end)
     pt("lingmeng", numbers)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     self._viewList_allNumbers:SetVirtual()
     self._viewList_allNumbers.itemRenderer = function(index, obj)
         local i = index + 1
-        obj:GetController('lev').selectedIndex = numbers[i].lev - 1
+        obj:GetController('lev').selectedIndex = copy_numbers[i].lev - 1
-        obj:GetController('ban').selectedIndex = numbers[i].ban
+        obj:GetController('ban').selectedIndex = copy_numbers[i].ban
         obj:GetChild('name').emojies = EmojiDitc.EmojiesDitc
-        obj:GetChild('name').text = numbers[i].nick
+        obj:GetChild('name').text = copy_numbers[i].nick
-        obj:GetChild('id').text = string.format("ID:%s", numbers[i].uid)
+        obj:GetChild('id').text = string.format("ID:%s", copy_numbers[i].uid)
 
         obj:GetChild("remark").emojies = EmojiDitc.EmojiesDitc
-        if numbers[i].tag == "" then
+        if copy_numbers[i].tag == "" then
             obj:GetChild("remark").text = "备注：无"
         else
-            obj:GetChild("remark").text = "备注：" .. numbers[i].tag
+            obj:GetChild("remark").text = "备注：" .. copy_numbers[i].tag
         end
 
-        ImageLoad.Load(numbers[i].portrait, obj:GetChild('btn_head')._iconObject)
+        ImageLoad.Load(copy_numbers[i].portrait, obj:GetChild('btn_head')._iconObject)
 
         obj.onClick:Set(function()
             print("lingmengtextBtn_detail")
             ViewUtil.ShowModalWait2()
-            fgCtr:FG_FindMember(self._group.id, numbers[i].uid, function(res)
+            fgCtr:FG_FindMember(self._group.id, copy_numbers[i].uid, function(res)
                 ViewUtil.CloseModalWait2()
                 local familyNumberDetail = FamilyNumberDetail.new(self._group.id, self._group.lev, res)
                 familyNumberDetail:SetTickCallback(handler(self, self.TickNumberCallback))
@@ -103,10 +110,10 @@ function M:FillList(numbers)
         end)
     end
 
-    if self._viewList_allNumbers.numItems == #numbers then
+    if self._viewList_allNumbers.numItems == #copy_numbers then
         self._viewList_allNumbers:RefreshVirtualList()
     else
-        self._viewList_allNumbers.numItems = #numbers
+        self._viewList_allNumbers.numItems = #copy_numbers
     end
 end
 

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

@@ -168,7 +168,7 @@ function FamilyMyFamily:Refalsh()
     self.tex_fNumber.text = self.family.member_num
     self.tex_cradNum.text = self.family.diamo
     self.tex_nocice.text = self.family.notice
-    self.tex_wxId.text = Utils.TextOmit(self.family.wechatId, 6, "...")
+    self.tex_wxId.text = self.family.wechatId
     ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
     self.cStyle.selectedIndex = self.family.lev - 1

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

@@ -1,4 +1,6 @@
 local FamilyMyFamily = import(".FamilyMyFamily")
+local FamilAllRank = import(".FamilAllRank")
+
 
 --#region LOCAL
 
@@ -132,7 +134,9 @@ function FamilyMyfamilyList:Init()
         end)
 
         btn_rank.onClick:Set(function()
-
+            self:Close()
+            self._ViewChild_AllRank = FamilAllRank.New(self.FamilyView, group.id)
+            self._ViewChild_AllRank:ShouRanks(self.FamilyView, group.id)
         end)
     end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -469,10 +469,10 @@ function M:ShowShop()
 end
 
 function M:ShowAllRank()
-    if not self._ViewChild_AllRank or not self._ViewChild_AllRank.ShouRanks then
+    -- if not self._ViewChild_AllRank or not self._ViewChild_AllRank.ShouRanks then
-        self._ViewChild_AllRank = FamilAllRank.New(self, self._group.id)
+    self._ViewChild_AllRank = FamilAllRank.New(self, self._group.id)
-        return
+    --     return
-    end
+    -- end
     self._ViewChild_AllRank:ShouRanks(self, self._group.id)
 end
 
@@ -579,23 +579,29 @@ function M:EnterGroup(fgCtr, id)
     fgCtr:FG_EnterGroup(id, function(res)
         ViewUtil:CloseModalWait2()
         if res.ReturnCode ~= 0 then
-            if res.ReturnCode == 101 then
+            if res.ReturnCode == 101 or res.ReturnCode == 1001 then
-                -- ViewUtil:ShowModalWait2(0.01)
+                --     -- self._coroutine_zangxian = coroutine.start(function()
-                -- self:EnterGroup(fgCtr, id)
+                --     --     coroutine.wait(0.2)
-                local _curren_msg =
+                --     local _curren_msg =
-                    MsgWindow.new(
+                --         MsgWindow.new(
-                        self._root_view,
+                --             self._root_view,
-                        '您的账号在另一个地点登录， 请确定您的账号是否泄密',
+                --             '您的账号在另一个地点登录， 请确定您的账号是否泄密',
-                        MsgWindow.MsgMode.OnlyOk
+                --             MsgWindow.MsgMode.OnlyOk
-                    )
+                --         )
-                PlayerPrefs.DeleteKey('session_id')
+                --     PlayerPrefs.DeleteKey('session_id')
-                PlayerPrefs.Save()
+                --     PlayerPrefs.Save()
-                _curren_msg.onOk:Add(
+                --     _curren_msg.onOk:Add(
-                    function()
+                --         function()
-                        RestartGame()
+                --             RestartGame()
-                    end
+                --         end
-                )
+                --     )
-                _curren_msg:Show()
+                --     _curren_msg:Show()
+                --     -- end)
+                --     return
+                -- elseif res.ReturnCode == 1001 then
+                -- coroutine.stop(self._coroutine_zangxian)
+                ViewUtil:ShowModalWait2(0.01)
+                self:EnterGroup(fgCtr, id)
                 return
             end
             ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败")

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

@@ -2,7 +2,7 @@ local DiamondRecord = {}
 
 local M = DiamondRecord
 
---类型字段，1为进入游戏预扣，2为结束游戏返还
+--类型字段，1为进入游戏预扣，2为结束游戏返还,3为
 local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您", "您为亲友圈充值" }
 
 function M.New(data, callback)
@@ -51,8 +51,14 @@ function M:msgRenderer(index, obj)
     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)
+    elseif type == 3 then
+        obj:GetChild('tex_msg').text = string.format("助理为【%s(%s)】用户充值%d房卡，剩余%d房卡", data.user_nick, data.uid,
+            data.diamo_num, data.diamo_cur)
+    elseif type == 4 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],
+        obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data.diamo_type + 1] or "你获得",
             data.diamo_num, data.diamo_cur)
     end
 end

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

@@ -20,6 +20,7 @@ end
 function M:init(url)
     BaseWindow.init(self, url)
 
+    ViewUtil.ShowModalWait2()
     local view = self._view
 
     local input_name = view:GetChild('input_name');
@@ -48,11 +49,21 @@ function M:init(url)
 
     local btn_send = view:GetChild('btn_send')
     btn_send.onClick:Set(function()
+        local name = input_name.text
+        local id = input_idInfo.text
+        if string.utf8len(name) < 2 or string.utf8len(name) > 6 then
+            ViewUtil.ErrorTip(-1, "您输入的名字过长或过短")
+            return
+        end
+        if #name < 17 or #name > 18 then
+            ViewUtil.ErrorTip(-1, "您输入的身份证不合法")
+            return
+        end
         local _data = {}
         _data.type = 1
         _data.real_info = {}
-        _data.real_info.name = input_name.text
+        _data.real_info.name = name
-        _data.real_info.ID = input_idInfo.text
+        _data.real_info.ID = id
         local loddyctr = ControllerManager.GetController(LoddyController)
         loddyctr:UpdateUserInfo(_data, function(res)
             if res.ReturnCode ~= 0 then
@@ -63,6 +74,21 @@ function M:init(url)
             end
         end)
     end)
+
+    local loddyCtr1 = ControllerManager.GetController(LoddyController)
+    loddyCtr1:GetUserInfo(function(res)
+        ViewUtil.CloseModalWait2()
+        if res.ReturnCode == 0 then
+            if res.Data.real_info and res.Data.real_info then
+                input_name.text = res.Data.real_info.name or ""
+                input_idInfo.text = res.Data.real_info.ID or ""
+                btn_send.visible = false
+            end
+            self:Show()
+        else
+            ViewUtil.ErrorTip(res.ReturnCode, "获取认证信息失败")
+        end
+    end)
 end
 
 return M

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

@@ -30,17 +30,17 @@ function M:init(url)
     view:GetChild('diamo').text = user.diamo
     view:GetChild('sex').text = user.sex == 1 and "男" or "女"
     view:GetController('ctr_sex').selectedIndex = user.sex - 1
-    view:GetChild('ip').text = DataManager.SelfUser.currenIp
+    view:GetChild('ip').text = DataManager.SelfUser.currenIp or "正在获取IP中..."
     ImageLoad.Load(DataManager.SelfUser.head_url, view:GetChild("btn_PlayerHead")._iconObject)
-    if DataManager.SelfUser.currenIp then
+    -- if DataManager.SelfUser.currenIp then
-        self._loadAll = self._loadAll + 1
+    --     self._loadAll = self._loadAll + 1
-    else
+    -- else
-        GameApplication.Instance:GetPublicIP(function(ip)
+    -- GameApplication.Instance:GetPublicIP(function(ip)
-            DataManager.SelfUser.currenIp = ip
+    --     DataManager.SelfUser.currenIp = ip
-            view:GetChild('ip').text = DataManager.SelfUser.currenIp
+    --     view:GetChild('ip').text = DataManager.SelfUser.currenIp or "正在获取IP中..."
-            self:CheckAllload()
+    --     self:CheckAllload()
-        end)
+    -- end)
-    end
+    -- end
 
     --change
     view:GetChild('choose_id').text = user.account_id
@@ -134,7 +134,7 @@ end
 
 function M:CheckAllload()
     self._loadAll = self._loadAll + 1
-    if self._loadAll >= 2 then
+    if self._loadAll >= 1 then
         self:Show()
     end
 end

lua_probject/base_project/Game/View/LobbyView.lua

@@ -69,7 +69,6 @@ function M:InitView(url)
     local btn_authenticate = self._view:GetChild("btn_authenticate")
     btn_authenticate.onClick:Add(handler(self, function()
         local authenticateView = LobbyAuthenticateView.new()
-        authenticateView:Show()
         -- ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
     end))
 
@@ -182,9 +181,9 @@ function M:InitView(url)
         printlog("load Callback")
         self._flag_loadImageSucces = true
     end)
-    GameApplication.Instance:GetPublicIP(function(ip)
+    -- GameApplication.Instance:GetPublicIP(function(ip)
-        DataManager.SelfUser.currenIp = ip
+    --     DataManager.SelfUser.currenIp = ip
-    end)
+    -- end)
     btn_head.onClick:Set(function()
         -- local headView = HeadView.new(DataManager.SelfUser, nil, function()
         --     view:GetChild("tex_name").text = DataManager.SelfUser.nick_name

lua_probject/base_project/Game/View/LoginView.lua

@@ -266,7 +266,19 @@ function M:QuickLogin()
             ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
             local loginCtr = ControllerManager.GetController(LoginController)
             loginCtr:QuickLogin(session_id, function(response)
-                __login_response(self, response)
+                if (response.ReturnCode == Table_Error_code.ERR_SERVER or response.ReturnCode == Table_Error_code.ERR_LOGOUT) then
+                    local _curren_msg =
+                        MsgWindow.new(
+                            self._root_view,
+                            '您的账号在另一个地点登录， 请确定您的账号是否泄密',
+                            MsgWindow.MsgMode.OnlyOk
+                        )
+                    PlayerPrefs.DeleteKey('session_id')
+                    PlayerPrefs.Save()
+                    _curren_msg:Show()
+                else
+                    __login_response(self, response)
+                end
             end)
         end
     end

lua_probject/base_project/Game/View/WitnessView.lua

@@ -373,7 +373,7 @@ function M:OnUpdate()
             else
                 print("witness error")
                 print(result)
-                error(result)
+                -- error(result)
             end
         end
     end
@@ -436,6 +436,12 @@ function M:OnUpdate()
     end
 end
 
+function M:OnApplicationActive()
+    ViewUtil.ShowModalWait2()
+    ControllerManager.reset_witness_room = 0
+    ControllerManager.ResetWitnessRoom()
+end
+
 function M:onLeftTimeOver()
 
 end

lua_probject/base_project/Game/ViewManager.lua

@@ -94,17 +94,59 @@ local function __OnGameConnectAction(state)
   ViewUtil.CloseModalWait2()
 end
 
+local function __OnGameWitnessConnectAction(state)
+  --print("state:"..state)
+  NetResetConnectWindow.CloseNetReset()
+  if state == SocketCode.Connect then
+    ViewManager.ChangeView(ViewManager.View_Witness, DataManager.CurrenRoom.game_id)
+    return
+    -- elseif state == SocketCode.DisconnectByServer then
+    --   NetResetConnectWindow.ShowNetReset()
+    --   ControllerManager.reset_witness_room = 0
+    --   ControllerManager.ResetWitnessRoom()
+    -- elseif state == SocketCode.ExceptionOnConnect or state == SocketCode.NetworkException then
+    --   -- __NetTip("请检查您的网络环境！")
+    --   NetResetConnectWindow.ShowNetReset()
+    --   ControllerManager.reset_witness_room = 0
+    --   ControllerManager.ResetWitnessRoom()
+  elseif state == SocketCode.Disconnect then
+    ControllerManager.ChangeController(LoddyController)
+    ViewManager.ChangeView(ViewManager.View_Lobby)
+  else
+    -- ViewUtil.ShowModalWait2()
+    -- ControllerManager.reset_witness_room = 0
+    -- ControllerManager.ResetWitnessRoom()
+    -- NetResetConnectWindow.ShowNetReset()
+  end
+  ViewUtil.CloseModalWait2()
+end
+
 function ViewManager.Init()
   _viewClassMap[ViewManager.View_Login] = LoginView
   _viewClassMap[ViewManager.View_Lobby] = LobbyView
   _viewClassMap[ViewManager.View_Family] = FamilyView
 
   ControllerManager.OnGameConnect = __OnGameConnectAction
+  ControllerManager.OnGameWitnessConnect = __OnGameWitnessConnectAction
 
   ControllerManager.WebClient.holdCallback = function(response)
     if response.ReturnCode == Table_Error_code.ERR_LOGOUT then
-      PlayerPrefs.DeleteKey("session_id")
+      ViewUtil.CloseModalWait2()
-      PlayerPrefs.Save()
+      local _curren_msg =
+          MsgWindow.new(
+            nil,
+            "您的登录凭证已过期，请重新登录",
+            MsgWindow.MsgMode.OnlyOk
+          )
+      _curren_msg.onOk:Add(
+        function()
+          PlayerPrefs.DeleteKey('session_id')
+          PlayerPrefs.Save()
+          RestartGame()
+        end
+      )
+      _curren_msg:Show()
+      return true
     end
     if response.ReturnCode == -1 or response.ReturnCode == Table_Error_code.ERR_LOGOUT then
       ViewUtil.CloseModalWait2()

lua_probject/base_project/Main.lua

@@ -42,17 +42,17 @@ oldGameVersion = 2 --1 原始  2 老游戏新加功能
 function Main()
     -- EmmyluaDebug
 
-    if true then
+    -- if true then
-        local suc = pcall(function()
+    --     local suc = pcall(function()
-            local path = Application.streamingAssetsPath .. "/../../.."
+    --         local path = Application.streamingAssetsPath .. "/../../.."
-            package.cpath = package.cpath .. ";" .. path .. "/?.dll"
+    --         package.cpath = package.cpath .. ";" .. path .. "/?.dll"
-            local dbg = require("emmy_core")
+    --         local dbg = require("emmy_core")
-            dbg.tcpConnect('localhost', 9966)
+    --         dbg.tcpConnect('localhost', 9966)
-        end)
+    --     end)
-        if suc then
+    --     if suc then
-            print("=============================调试连接成功！===========================")
+    --         print("=============================调试连接成功！===========================")
-        end
+    --     end
-    end
+    -- end
 
     pcall(function()
         EmojiLuaHelper.Init()

lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua

@@ -200,6 +200,7 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         local player = self._room:GetPlayerBySeat(win_seat)
+        MJMainView.ShowHand(self, scoreData)
         info:ShowHuCard(win_card, index == 1)
 
         -- self.cHuCardEffect.selectedIndex = 1

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -200,6 +200,7 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         local player = self._room:GetPlayerBySeat(win_seat)
+        MJMainView.ShowHand(self, scoreData)
         info:ShowHuCard(win_card, index == 1)
 
         -- self.cHuCardEffect.selectedIndex = 1

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -201,6 +201,7 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         local player = self._room:GetPlayerBySeat(win_seat)
+        MJMainView.ShowHand(self, scoreData)
         info:ShowHuCard(win_card, index == 1)
 
 
@@ -302,11 +303,11 @@ function M:EventInit()
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
-        MJMainView.ShowHand(self, arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
         local niao = result.niao
+        -- MJMainView.ShowHand(self, data)
         -- if liuju then
         --     local le = UIPackage.CreateObjectFromURL("ui://Main_Majiang/LiuJu")
         --     self._view:AddChild(le)

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -200,6 +200,7 @@ function M:EventInit()
         local index = self:GetPos(win_seat)
         local info = self._player_card_info[index]
         local player = self._room:GetPlayerBySeat(win_seat)
+        MJMainView.ShowHand(self, scoreData)
         info:ShowHuCard(win_card, index == 1)
 
         -- self.cHuCardEffect.selectedIndex = 1

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -240,7 +240,7 @@ function M:UpdateHandCardWitness(getcard, isSelf)
 end
 
 function M:FillWitnessCard(btn_card)
-    btn_card:GetChild("icon").url = 'ui://Main_Majiang/b201_0'
+    btn_card:GetChild("icon").url = 'ui://Main_Majiang/back_201'
 end
 
 -- 获取麻将图片资源位置，可以在扩展中复写

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes.meta

@@ -3,5 +3,5 @@ guid: c1652156a48ed314e92cb8121851e5aa
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: base/family/5c934681ea6462867ebfd8485f3e87d6
   assetBundleVariant: 

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

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: c3d67d081c641ed4d910e4dc3b7438d0
+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/Scripts/VerCheck.cs

@@ -84,12 +84,13 @@ public class VerCheck : MonoBehaviour
 
 
 
-        isDXYGFF= true;
+        isDXYGFF= false;
         isGFF = false;
 
         //江西
-        string init_url = "http://127.0.0.1:9898/NewFK/config/init2_1.json";
+        //string init_url = "http://127.0.0.1:9898/NewFK/config/init2_1.json";
-        
+        string init_url = "http://8.138.255.70:9898/NewFK/config/init2_1.json";
+
 
         if (isGFF==false&&isDXYGFF==false)
         {
@@ -158,7 +159,7 @@ public class VerCheck : MonoBehaviour
             
 
 
-            init_url = "http://" + conn.ip + ":" + conn.port + "/NewFK/config/init2_1.json";
+            init_url = "http://" + conn.ip + ":" + conn.port + "/NewFK/config/init2_2.json";
             Debug.LogError("init_url : " + init_url);
         }
         // Debug.LogError("开始下载资源===>>>");

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,41 +1,41 @@
 [
   {
-    "ver": "1.0.58",
+    "ver": "1.0.62",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.58",
+    "version": "1.0.62",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.80",
+    "ver": "1.0.85",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.80",
+    "version": "1.0.85",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.85",
+    "ver": "1.0.90",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.85",
+    "version": "1.0.90",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.67",
+    "ver": "1.0.72",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.67",
+    "version": "1.0.72",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.66",
+    "ver": "1.0.71",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.66",
+    "version": "1.0.71",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,25 +1,25 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.16",
+    "ver": "1.0.8",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.16"
+    "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.8",
@@ -29,31 +29,31 @@
     "version": "1.0.8"
   },
   {
-    "ver": "1.0.7",
+    "ver": "1.0.8",
-    "name": "Family",
+    "name": "family",
     "check": true,
-    "bundle": "base/Family",
+    "bundle": "base/family",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/rank"
   },
   {
@@ -64,46 +64,46 @@
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/Pack/asset_config1.0.10.json

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

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

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

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

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

@@ -1,109 +0,0 @@
-[
-  {
-    "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.16",
-    "name": "base_script",
-    "check": true,
-    "bundle": "base/base_script",
-    "version": "1.0.16"
-  },
-  {
-    "ver": "1.0.7",
-    "name": "common",
-    "check": true,
-    "bundle": "base/common",
-    "version": "1.0.7"
-  },
-  {
-    "ver": "1.0.7",
-    "name": "login",
-    "check": true,
-    "bundle": "base/login",
-    "version": "1.0.7"
-  },
-  {
-    "ver": "1.0.8",
-    "name": "lobby",
-    "check": true,
-    "bundle": "base/lobby",
-    "version": "1.0.8"
-  },
-  {
-    "ver": "1.0.7",
-    "name": "Family",
-    "check": true,
-    "bundle": "base/Family",
-    "version": "1.0.7"
-  },
-  {
-    "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.8",
-    "name": "main_majiang",
-    "check": true,
-    "version": "1.0.8",
-    "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/Pack/asset_config1.0.27.json

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

wb_unity_pro/Pack/asset_config1.0.28.json

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

wb_unity_pro/Pack/asset_config1.0.29.json

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

wb_unity_pro/Pack/asset_config1.0.30.json

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

wb_unity_pro/Pack/asset_config1.0.7.json

@@ -8,102 +8,102 @@
     "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/Pack/asset_config1.0.8.json

@@ -8,102 +8,102 @@
     "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",
+    "name": "family",
     "check": true,
-    "bundle": "base/Family",
+    "bundle": "base/family",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "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.6",
+    "ver": "1.0.8",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.8"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.8",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.8",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/Pack/asset_config1.0.9.json

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

@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
-  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashScreen: 1
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 0
   m_SplashScreenAnimation: 2
@@ -251,7 +251,7 @@ PlayerSettings:
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 3
   AndroidSplashScreenScale: 2
   androidSplashScreen: {fileID: 2800000, guid: a1be71f9a25621242879a60a153f0196, type: 3}
   AndroidKeystoreName: '{inproject}: queyou.keystore'