diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 0262ac3d..67177b0f 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -471,7 +471,8 @@ end function M:ShowHuCard(card) self.winCard = card - local btn_card = self._view_getCard:GetChildAt(0) + self._view_getCard:RemoveChildrenToPool() + local btn_card = self._view_getCard:AddItemFromPool() btn_card:GetChild("icon").url = 'ui://Main_Majiang/' .. "b202_" .. card end diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index a99dd863..ed282859 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -24,34 +24,34 @@ "bundle": "extend/poker2/suoha" }, { - "ver": "1.0.27", + "ver": "1.0.28", "name": "南城麻将", "check": true, - "version": "1.0.27", + "version": "1.0.28", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.28", + "ver": "1.0.29", "name": "黎川麻将", "check": true, - "version": "1.0.28", + "version": "1.0.29", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.14", + "ver": "1.0.15", "name": "金溪麻将", "check": true, - "version": "1.0.14", + "version": "1.0.15", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.13", + "ver": "1.0.14", "name": "抚州麻将", "check": true, - "version": "1.0.13", + "version": "1.0.14", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 20648be7..af385fff 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.7", + "ver": "1.0.8", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.7" + "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", "check": true, "bundle": "base/Family", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "rank", "check": true, - "version": "1.0.7", + "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.7", + "ver": "1.0.8", "name": "main_poker", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_poker" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_zipai", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_zipai" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.7" + "version": "1.0.8" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_pokemajiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.7", + "ver": "1.0.8", "name": "main_zipaimajiang", "check": true, - "version": "1.0.7", + "version": "1.0.8", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index 4f4dac17..ad8f23e5 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,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} diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index e83e8862..fd2f0474 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -179,7 +179,7 @@ PlayerSettings: iPhone: 1 AndroidBundleVersionCode: 12 AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 28 + AndroidTargetSdkVersion: 26 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0