diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index 366b0e54..7c6b962b 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -51,8 +51,18 @@ function M:initBtn() self._btn_numberSearch.onClick:Set(function() local tempNumberList = {} for i = 1, self._group.member_num do - if string.find(self._group.members[i].nick, self._input_numberSearch.text) then + if self._input_numberSearch.text == "" then table.insert(tempNumberList, self._group.members[i]) + else + if string.find(self._group.members[i].nick, self._input_numberSearch.text) then + table.insert(tempNumberList, self._group.members[i]) + end + if string.find(self._group.members[i].tag, self._input_numberSearch.text) then + table.insert(tempNumberList, self._group.members[i]) + end + if string.find(tostring(self._group.members[i].uid), self._input_numberSearch.text) then + table.insert(tempNumberList, self._group.members[i]) + end end end if #tempNumberList == 0 then diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua index 9711eb18..649a55cd 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua @@ -46,8 +46,39 @@ function M:init(url, lev, res) self._view:GetController('isAssistant').selectedIndex = info.lev == 1 and 0 or (lev == 2 and 1 or 2) self._view:GetChild('btn_changeTag').onClick:Set(function() - local guo_msg = MsgWindow.new(self._root_view, "该功能还未开放", MsgWindow.MsgMode.OnlyOk) - guo_msg:Show() + local inputData = {} + inputData.text = remark + inputData.titleText = "设置玩家备注" + inputData.promptText = "请输入备注" + inputData.btnType = 2 + inputData.showText = "" + ViewUtil.ShowOneInput(inputData, function(text) + print("lingmeng请输入备注", text) + -- if text == "" then + -- ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" }) + -- return + -- end + ViewUtil.ShowModalWait2() + local score = text + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_SetMemberTag(self.groupId, info.uid, score, function(res) + ViewUtil.CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "备注失败") + else + self._view:GetChild("tex_remark").text = text + local group = DataManager.groups:get(self.groupId) + local member = group:getMember(info.uid) + if member then + member.tag = text + end + self._callback_refren() + ViewUtil.ErrorTip(-1, "备注成功") + end + end) + end) + -- local guo_msg = MsgWindow.new(self._root_view, "该功能还未开放", MsgWindow.MsgMode.OnlyOk) + -- guo_msg:Show() end) self._view:GetChild('btn_changeMJScore').onClick:Set(function() diff --git a/wb_unity_pro/Assets/Scripts/VerCheck.cs b/wb_unity_pro/Assets/Scripts/VerCheck.cs index dc8e4a46..43f68da5 100644 --- a/wb_unity_pro/Assets/Scripts/VerCheck.cs +++ b/wb_unity_pro/Assets/Scripts/VerCheck.cs @@ -84,7 +84,7 @@ public class VerCheck : MonoBehaviour - isDXYGFF = false; + isDXYGFF = true; isGFF = false; //江西 diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 4fcda27f..873141cd 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.8", + "ver": "1.0.11", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "family", "check": true, "bundle": "base/family", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "rank", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/rank" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "main_majiang", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/main_majiang" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "main_poker", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/main_poker" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "main_zipai", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/main_zipai" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.8" + "version": "1.0.9" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "main_pokemajiang", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "main_zipaimajiang", "check": true, - "version": "1.0.8", + "version": "1.0.9", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.10.bytes b/wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.10.bytes new file mode 100644 index 00000000..47f3c0d1 Binary files /dev/null and b/wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.10.bytes differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.71.bytes b/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.71.bytes deleted file mode 100644 index a86d6102..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.71.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.72.bytes b/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.72.bytes deleted file mode 100644 index 744bd77e..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.72.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.90.bytes b/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.90.bytes deleted file mode 100644 index b236174a..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.90.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.85.bytes b/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.85.bytes deleted file mode 100644 index ec59df15..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.85.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.10.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.10.bytes new file mode 100644 index 00000000..41038a1d Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.10.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.71.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.71.bytes deleted file mode 100644 index 1cc4995e..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.71.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.72.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.72.bytes deleted file mode 100644 index c8a5fa2f..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.72.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.90.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.90.bytes deleted file mode 100644 index 9ebd582a..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.90.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.85.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.85.bytes deleted file mode 100644 index 212579d1..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.85.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/asset_config1.0.10.json b/wb_unity_pro/Pack/asset_config1.0.10.json index 9353b3fb..f1310de8 100644 --- a/wb_unity_pro/Pack/asset_config1.0.10.json +++ b/wb_unity_pro/Pack/asset_config1.0.10.json @@ -36,24 +36,24 @@ "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" }, { @@ -64,46 +64,46 @@ "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" } ] diff --git a/wb_unity_pro/Pack/asset_config1.0.11.json b/wb_unity_pro/Pack/asset_config1.0.11.json deleted file mode 100644 index a085b50a..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.11.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.12.json b/wb_unity_pro/Pack/asset_config1.0.12.json index 9204b87d..873141cd 100644 --- a/wb_unity_pro/Pack/asset_config1.0.12.json +++ b/wb_unity_pro/Pack/asset_config1.0.12.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.12", + "ver": "1.0.11", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.12" + "version": "1.0.11" }, { - "ver": "1.0.7", + "ver": "1.0.9", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.7" + "version": "1.0.9" }, { - "ver": "1.0.7", + "ver": "1.0.9", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.7" + "version": "1.0.9" }, { - "ver": "1.0.7", + "ver": "1.0.9", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.7" + "version": "1.0.9" }, { - "ver": "1.0.7", - "name": "Family", + "ver": "1.0.9", + "name": "family", "check": true, - "bundle": "base/Family", - "version": "1.0.7" + "bundle": "base/family", + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "rank", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/rank" }, { - "ver": "1.0.7", + "ver": "1.0.9", "name": "main_majiang", "check": true, - "version": "1.0.7", + "version": "1.0.9", "bundle": "base/main_majiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_poker", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_poker" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipai", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipai" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_pokemajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipaimajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/asset_config1.0.14.json b/wb_unity_pro/Pack/asset_config1.0.14.json deleted file mode 100644 index 413ef38c..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.14.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.15.json b/wb_unity_pro/Pack/asset_config1.0.15.json deleted file mode 100644 index 9c053b02..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.15.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.16.json b/wb_unity_pro/Pack/asset_config1.0.16.json deleted file mode 100644 index 34da9d35..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.16.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.27.json b/wb_unity_pro/Pack/asset_config1.0.27.json deleted file mode 100644 index 9b7fe28e..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.27.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.28.json b/wb_unity_pro/Pack/asset_config1.0.28.json deleted file mode 100644 index 7d16c884..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.28.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.29.json b/wb_unity_pro/Pack/asset_config1.0.29.json deleted file mode 100644 index dd13510f..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.29.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.30.json b/wb_unity_pro/Pack/asset_config1.0.30.json deleted file mode 100644 index ebf809d5..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.30.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.7.json b/wb_unity_pro/Pack/asset_config1.0.7.json deleted file mode 100644 index a8cb7958..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.7.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.7", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.7" - }, - { - "ver": "1.0.6", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "Family", - "check": true, - "bundle": "base/Family", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "rank", - "check": true, - "version": "1.0.6", - "bundle": "base/rank" - }, - { - "ver": "1.0.6", - "name": "main_majiang", - "check": true, - "version": "1.0.6", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.6", - "name": "main_poker", - "check": true, - "version": "1.0.6", - "bundle": "base/main_poker" - }, - { - "ver": "1.0.6", - "name": "main_zipai", - "check": true, - "version": "1.0.6", - "bundle": "base/main_zipai" - }, - { - "ver": "1.0.6", - "name": "static", - "check": true, - "bundle": "base/static", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.6" - }, - { - "ver": "1.0.6", - "name": "main_pokemajiang", - "check": true, - "version": "1.0.6", - "bundle": "base/main_pokemajiang" - }, - { - "ver": "1.0.6", - "name": "main_zipaimajiang", - "check": true, - "version": "1.0.6", - "bundle": "base/main_zipaimajiang" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.8.json b/wb_unity_pro/Pack/asset_config1.0.8.json deleted file mode 100644 index 4fcda27f..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.8.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.8", - "name": "base_script", - "check": true, - "bundle": "base/base_script", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "common", - "check": true, - "bundle": "base/common", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "login", - "check": true, - "bundle": "base/login", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "lobby", - "check": true, - "bundle": "base/lobby", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "family", - "check": true, - "bundle": "base/family", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "chat", - "check": true, - "bundle": "base/chat", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "newgroup", - "check": true, - "bundle": "base/newgroup", - "version": "1.0.8" - }, - { - "ver": "1.0.8", - "name": "rank", - "check": true, - "version": "1.0.8", - "bundle": "base/rank" - }, - { - "ver": "1.0.8", - "name": "main_majiang", - "check": true, - "version": "1.0.8", - "bundle": "base/main_majiang" - }, - { - "ver": "1.0.8", - "name": "main_poker", - "check": true, - "version": "1.0.8", - "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.8", - "is_res": true, - "name": "embed", - "check": true, - "bundle": "base/embed", - "version": "1.0.8" - }, - { - "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" - } -] diff --git a/wb_unity_pro/Pack/asset_config1.0.9.json b/wb_unity_pro/Pack/asset_config1.0.9.json deleted file mode 100644 index 361e9cc8..00000000 --- a/wb_unity_pro/Pack/asset_config1.0.9.json +++ /dev/null @@ -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" - } -] diff --git a/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.11.bytes b/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.11.bytes new file mode 100644 index 00000000..47f3c0d1 Binary files /dev/null and b/wb_unity_pro/Pack/iOS/base/base_script/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/iOS/extend/majiang/fuzhou/asset_pack1.0.71.bytes b/wb_unity_pro/Pack/iOS/extend/majiang/fuzhou/asset_pack1.0.71.bytes deleted file mode 100644 index c32348d3..00000000 Binary files a/wb_unity_pro/Pack/iOS/extend/majiang/fuzhou/asset_pack1.0.71.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/iOS/extend/majiang/jinxi/asset_pack1.0.72.bytes b/wb_unity_pro/Pack/iOS/extend/majiang/jinxi/asset_pack1.0.72.bytes deleted file mode 100644 index 9b26abdd..00000000 Binary files a/wb_unity_pro/Pack/iOS/extend/majiang/jinxi/asset_pack1.0.72.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/iOS/extend/majiang/lichuan/asset_pack1.0.90.bytes b/wb_unity_pro/Pack/iOS/extend/majiang/lichuan/asset_pack1.0.90.bytes deleted file mode 100644 index d619fdc2..00000000 Binary files a/wb_unity_pro/Pack/iOS/extend/majiang/lichuan/asset_pack1.0.90.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/iOS/extend/majiang/nancheng/asset_pack1.0.85.bytes b/wb_unity_pro/Pack/iOS/extend/majiang/nancheng/asset_pack1.0.85.bytes deleted file mode 100644 index 9ac1a99a..00000000 Binary files a/wb_unity_pro/Pack/iOS/extend/majiang/nancheng/asset_pack1.0.85.bytes and /dev/null differ diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index a7bcfc3d..4da061a7 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -39,6 +39,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}