1112同步

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -55,7 +55,7 @@ local function __Login(cmd, _data, callBack)
             user.phone      = account.phone
             user.address    = account.address
             user.games      = FilterGame(data.games)
-            user.havaPsw    = account.havaPassword
+            user.havaPsw    = data.havaPassword
             if Application.platform == RuntimePlatform.WindowsPlayer or Application.platform == RuntimePlatform.WindowsEditor then
                 --GameApplication.Instance.printLog = true
             else

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

@@ -91,7 +91,9 @@ function M:InitTime()
     return serverDayValues, serverDayItems
 end
 
-function M:ShouRanks()
+function M:ShouRanks(root, groupId)
+    self._father = root
+    self.group_id = groupId
     self._lastTpe = self._father.familyType.selectedIndex
     self._father.familyType.selectedIndex = 0
     self._view.visible = true

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

@@ -88,6 +88,8 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag)
             else
 
             end
+            fgCtr:FG_GroupMembers12(self._group.id, 0, self._group.total_member_num + 1, 2, 2, function(res)
+            end)
             local group = DataManager.groups:get(self._group.id)
             group.joins = group.joins - 1
 
@@ -100,6 +102,7 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag)
             self:Reflash()
 
             Broadcast.Send(BroadcastEvent.OnJoinsChange)
+            Broadcast.Send(BroadcastEvent.OnMemberChange)
 
             --[[
             local view = BaseView.FindView("FamilyMainView")

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

@@ -57,7 +57,7 @@ function M:FillData()
 
     self._viewText_groupName.text = Utils.TextOmit(group.name, 6, "...")
     self._viewText_gameName.text = play.game_name
-    self._viewText_inviteName.text = self.nik
+    self._viewText_inviteName.text = ViewUtil.stringEllipsis(self.nik)
     self._viewText_playName.text = Utils.TextOmit(play.name, 6, "...")
 
     local config = ExtendManager.GetExtendConfig(play.gameId)

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

@@ -51,8 +51,9 @@ function FamilyJoinAndCreate:init(root)
                 ViewUtil.CloseModalWait2()
                 if res.ReturnCode == 0 then
                     root.familyType.selectedIndex = 1
-                    -- root:ConnetFamily(1, DataManager.groups.groupList, true)
+                    Utils.SaveLocalFile("Family_lastID" .. DataManager.SelfUser.account_id, res.Data.info.id)
                     root:Reflash()
+                    -- root:ConnetFamily(1, DataManager.groups.groupList, true)
                 else
                     ViewUtil.ErrorTip(res.ReturnCode, '创建大联盟失败!')
                 end

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

@@ -76,7 +76,7 @@ function PlayEditView:Init()
             obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config,
                 playList[index].hpData)
             obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
-            obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6, "...")
+            obj:GetChild('text_playName').text = playList[index].name
             obj:GetController('type').selectedIndex = 1
             obj:GetChild('btn_del').onClick:Set(function()
                 ViewUtil.ShowTwoChooose("是否要删除该玩法", function()

lua_probject/base_project/Game/View/FamilyView.lua

@@ -306,6 +306,7 @@ function M:Reflash()
             end
             local btn = self.list_family:GetChildAt(chooseIndex - 1)
             btn.onClick:Call()
+            self._view:GetController('listFamily').selectedIndex = chooseIndex - 1
         else
             self:JoinFamily(true)
             self.btn_chatRoom.visible = false
@@ -472,7 +473,7 @@ function M:ShowAllRank()
         self._ViewChild_AllRank = FamilAllRank.New(self, self._group.id)
         return
     end
-    self._ViewChild_AllRank:ShouRanks()
+    self._ViewChild_AllRank:ShouRanks(self, self._group.id)
 end
 
 function M:OpenAllNumber(group)
@@ -800,7 +801,7 @@ function M:FillSameRoomInfo(obj, type, playInfo)
     obj:GetChild('Label_gameRule').title = gamePlay
 
     local roomName = playInfo.name
-    roomName = Utils.TextOmit(roomName, 6, "")
+    roomName = roomName
     obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
     obj:GetChild('game_type').text = string.format("   (%s) %s", playInfo.game_name, roomName)
     obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = type

lua_probject/base_project/Game/View/LobbyView.lua

@@ -172,6 +172,7 @@ function M:InitView(url)
 
     local btn_invite = self._view:GetChild("btn_invite")
     btn_invite.onClick:Add(function()
+        GameApplication.Instance:CopyToClipboard(DataManager.DownLink or "暂无链接")
         local _curren_msg = MsgWindow.new(self._root_view, "下载地址已复制，请到浏览器粘贴", MsgWindow.MsgMode.OnlyOk)
         _curren_msg:Show()
     end)

lua_probject/base_project/Game/View/LoginView.lua

@@ -174,8 +174,8 @@ local function __login_response(self, response)
 
             local roomid = user.room_id
             if (string.len(roomid) > 1) then
+                ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...")
                 if user.group_id == 0 then
-                    ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...")
                     __join_room(roomid, response)
                     return
                 else
@@ -199,6 +199,7 @@ local function __login_response(self, response)
                     end
                     self._mesList = mesl
                     DataManager.GameNotice = mesl
+                    DataManager.DownLink = data.share_link
                 end
             end
         end)
@@ -313,8 +314,9 @@ function M:LoginCallBack(result, data)
 end
 
 --在进入前重连房间，如果有
-function M:ReconnectRoom(groupId)
+function M:ReconnectRoom(groupId, times)
     local roomId = DataManager.SelfUser.room_id
+    local times = times or 0
     print("===============================ReconnectRoom", roomId, 1)
     if roomId and #roomId > 0 then
         local roomCtr = ControllerManager.GetController(RoomController)
@@ -324,17 +326,24 @@ function M:ReconnectRoom(groupId)
             false,
             function(response)
                 if (response.ReturnCode == -1) then
+                    ViewUtil.CloseModalWait2()
                     ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
                     RestartGame()
                     return
                 end
 
                 if response.ReturnCode ~= 0 then
-                    ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                    -- if times >= 6 then
-                    FamilyView.lastId = groupId
+                    --     ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
-                    ViewManager.ChangeView(ViewManager.View_Family)
+                    --     FamilyView.lastId = groupId
+                    --     ViewManager.ChangeView(ViewManager.View_Family)
+                    --     return
+                    -- else
+                    self:ReconnectRoom(groupId, times + 1)
                     return
+                    -- end
                 else
+                    ViewUtil.CloseModalWait2()
                     UIPackage.AddPackage("base/lobby/ui/Lobby")
                     FamilyView.lastId = groupId
                     DataManager.SelfUser.room_id = ""

lua_probject/base_project/Game/View/MainView.lua

@@ -6,6 +6,7 @@ local SettingView = import('.SettingView')
 local PlayerDistanceView = import('.PlayerDistanceView')
 local FGAssistView = import('.FGAssistView')
 local MissileSender = import(".MissileSender")
+local SharePicture = import('.SharePicture')
 
 local function GetSeat(self, uId)
     for _, player in pairs(self._room.player_list) do
@@ -584,7 +585,7 @@ function M:InitView(url, isHideIpAdds)
                 _room.group_id ~= 0 and "亲友圈," or "", _room.room_config.config.hpData.maxRound)
             data.description = gamePlay
             data.type = 0
-            ViewUtil.__share(data)
+            self:ShareAndOneChoose(data)
         end)
     end
     ------------------------------------------------------------
@@ -1511,6 +1512,13 @@ function M:GetPlayer(playId)
     end
 end
 
+function M:ShareAndOneChoose(data)
+    local sharePicture = SharePicture.new(function()
+        ViewUtil.__share(data)
+    end)
+    sharePicture:Show()
+end
+
 -- 托管时关闭一些提示窗口，如起手胡、吃碰提示、海底,由扩展实现
 function M:closeTipOnTuoguan()
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -4,6 +4,38 @@ local GroupRoomColorView = import(".GroupRoomColorView")
 local GameListView = require "Game/View/Lobby/GameListView"
 local GroupGameSettingView = {}
 
+-- UTF-8 正则匹配每一个字符（包括 emoji）
+local function utf8_chars(str)
+    local chars = {}
+    for uchar in str:gmatch("[%z\1-\127\194-\244][\128-\191]*") do
+        table.insert(chars, uchar)
+    end
+    return chars
+end
+
+-- 截取前 n 个字符（安全处理 Emoji）
+local function sub(str, start_char, end_char)
+    local chars = utf8_chars(str)
+    local sub = {}
+    for i = start_char or 1, end_char or #chars do
+        if chars[i] then
+            table.insert(sub, chars[i])
+        else
+            break
+        end
+    end
+    return table.concat(sub)
+end
+
+-- 获取 UTF-8 字符个数
+local function len(str)
+    local count = 0
+    for _ in str:gmatch("[%z\1-\127\194-\244][\128-\191]*") do
+        count = count + 1
+    end
+    return count
+end
+
 local M = GroupGameSettingView
 
 function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
@@ -49,6 +81,9 @@ function M:init(url)
     self.btn_closeTimesPage = self._view:GetChild("btn_closeTimesPage")
 
     self._view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc
+    self._view:GetChild("tex_name").onFocusOut:Set(function()
+        self._view:GetChild("tex_name").text = sub(self._view:GetChild("tex_name").text, 1, 7)
+    end)
 
     self.cTimesPage = self._view:GetController("cTimesPage")
 

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -410,7 +410,7 @@ function ViewUtil.ShowOneInput(data, callback)
 end
 
 function ViewUtil.__share(data)
-    local url = "https://ttfenfa.com/index.php/login"
+    local url = DataManager.DownLink or "https://ttfenfa.com/index.php/login"
     local json_data = {}
     json_data['title'] = data.title
     local mediaObject = {}

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

@@ -245,6 +245,7 @@ function M:EventInit()
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
             card_info:UpdateHandCard()
+            card_info._view_handCardList.touchable = true
             if _room.curren_round == 1 then
                 self._touxiangMove:Play()
             end

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

@@ -243,6 +243,7 @@ function M:EventInit()
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
             card_info:UpdateHandCard()
+            card_info._view_handCardList.touchable = true
             if _room.curren_round == 1 then
                 self._touxiangMove:Play()
             end

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

@@ -243,6 +243,7 @@ function M:EventInit()
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
             card_info:UpdateHandCard()
+            card_info._view_handCardList.touchable = true
             if _room.curren_round == 1 then
                 self._touxiangMove:Play()
             end

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

@@ -241,6 +241,7 @@ function M:EventInit()
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
             card_info:UpdateHandCard()
+            card_info._view_handCardList.touchable = true
             if _room.curren_round == 1 then
                 self._touxiangMove:Play()
             end

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -791,6 +791,7 @@ function M:OnHuCard(...)
 
     self._player_card_info[1]._ctr_tip.selectedIndex = 0
     self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0
+    self._player_card_info[1]._view_handCardList.touchable = false
     self:ShowHand(scoreData)
     info:ShowHuCard(win_card, index == 1)
 

wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml

@@ -23,24 +23,24 @@
     <component id="n111_11mfw" name="n111" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" pkg="2d9xdj6z" xy="1239,10" group="n114_11mfw">
       <Button controller="round" page="1"/>
     </component>
-    <text id="n112_11mfw" name="n112" xy="1329,7" size="355,72" group="n114_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="5局（房卡*2）">
+    <text id="n112_11mfw" name="n112" xy="1329,7" size="386,72" group="n114_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="10局（房卡*2）">
       <gearColor controller="round" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <image id="n113_11mfw" name="n113" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" pkg="2d9xdj6z" xy="195,90" group="n114_11mfw" visible="false"/>
-    <group id="n114_11mfw" name="roundNum" xy="195,0" size="1515,93" advanced="true"/>
+    <group id="n114_11mfw" name="roundNum" xy="195,0" size="1520,93" advanced="true"/>
     <text id="n115_11mfw" name="n115" xy="354,93" size="0,0" group="n121_11mfw" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" text="">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n116_11mfw" name="n116" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" pkg="2d9xdj6z" xy="384,103" group="n121_11mfw">
       <Button controller="round" page="2"/>
     </component>
-    <text id="n117_11mfw" name="n117" xy="474,100" size="355,72" group="n121_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="8局（房卡*3）">
+    <text id="n117_11mfw" name="n117" xy="474,100" size="386,72" group="n121_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="15局（房卡*3）">
       <gearColor controller="round" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n118_11mfw" name="n118" src="86ct7cwx" fileName="component/CreatePlay/Component/Single_choose.xml" pkg="2d9xdj6z" xy="1238,103" group="n121_11mfw">
       <Button controller="round" page="3"/>
     </component>
-    <text id="n119_11mfw" name="n119" xy="1328,100" size="386,72" group="n121_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="16局（房卡*6）">
+    <text id="n119_11mfw" name="n119" xy="1328,100" size="386,72" group="n121_11mfw" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="20局（房卡*6）">
       <gearColor controller="round" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <image id="n120_11mfw" name="n120" src="pzuc7cx6" fileName="component/CreatePlay/Image/Line 2.png" pkg="2d9xdj6z" xy="195,183" group="n121_11mfw"/>

wb_new_ui/assets/Lobby/component/service/Component/listChild_one.xml

@@ -4,7 +4,7 @@
   <displayList>
     <component id="n3_if10" name="btn_copy" src="nauple" fileName="component/service/btn_copywx.xml" xy="1352,23" pivot="0.5,0.5" size="206,74" scale="1.2,1.2"/>
     <text id="n4_if10" name="text_title" xy="115,20" size="261,79" font="Arial" fontSize="60" text="游戏代理:"/>
-    <text id="n6_if10" name="title" xy="376,20" size="949,79" font="Arial" fontSize="60" color="#006600" autoSize="shrink" text="微信号:">
+    <text id="n6_if10" name="title" xy="376,20" size="949,79" font="Arial" fontSize="60" color="#9e3635" autoSize="shrink" text="微信号:">
       <relation target="n4_if10" sidePair="leftext-right"/>
     </text>
     <image id="n7_if10" name="n7" src="nld2cjr" fileName="component/user_info/wx/update_wechat_icon.png" xy="6,9"/>

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,41 +1,41 @@
 [
   {
-    "ver": "1.0.55",
+    "ver": "1.0.57",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.55",
+    "version": "1.0.57",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.78",
+    "ver": "1.0.79",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.78",
+    "version": "1.0.79",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.83",
+    "ver": "1.0.84",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.83",
+    "version": "1.0.84",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.65",
+    "ver": "1.0.66",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.65",
+    "version": "1.0.66",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.64",
+    "ver": "1.0.65",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.64",
+    "version": "1.0.65",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,11 +1,11 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.8",
+    "ver": "1.0.14",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.14"
   },
   {
     "ver": "1.0.7",

wb_unity_pro/Pack/asset_config1.0.10.json

@@ -0,0 +1,109 @@
+[
+  {
+    "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

@@ -0,0 +1,109 @@
+[
+  {
+    "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

@@ -0,0 +1,109 @@
+[
+  {
+    "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.13 - 副本.json

@@ -0,0 +1,109 @@
+[
+  {
+    "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.14.json

@@ -0,0 +1,109 @@
+[
+  {
+    "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.9.json

@@ -0,0 +1,109 @@
+[
+  {
+    "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"
+  }
+]