diff --git a/lua_probject/base_project/Game/ExtendHotupdate.lua b/lua_probject/base_project/Game/ExtendHotupdate.lua index 7f8b7834..d7ea7bec 100644 --- a/lua_probject/base_project/Game/ExtendHotupdate.lua +++ b/lua_probject/base_project/Game/ExtendHotupdate.lua @@ -46,9 +46,9 @@ ExtendHotupdate = { -- 正常 VERSION_NORMAL = 0, -- 下载 - VERSION_DOWN = 1, + VERSION_DOWN = 0, -- 更新 - VERSION_UPDATE = 2, + VERSION_UPDATE = 0, } function ExtendHotupdate.UpdateGameList(list, callback) diff --git a/lua_probject/base_project/Game/View/PlayerInfoView.lua b/lua_probject/base_project/Game/View/PlayerInfoView.lua index 29c89a96..04e933ea 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView.lua @@ -199,7 +199,7 @@ function M:FillData(player) end end -function M:UpdateScore(score) +function M:UpdateScore(score, doAnimation) if not score then score = self._player.total_score local room = DataManager.CurrenRoom @@ -215,9 +215,12 @@ function M:UpdateScore(score) end end - local curScore = tonumber(self._tex_score.text) - curScore = curScore or 0 - self:ScoreAnimation(score - curScore) + if doAnimation then + local curScore = tonumber(self._tex_score.text) + curScore = curScore or 0 + self:ScoreAnimation(score - curScore) + end + self._tex_score.text = tostring(score) end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index f92f9e05..55a772a5 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -680,7 +680,7 @@ function M:OnResult1(...) if _room:checkHpNonnegative() then p.cur_hp = data[i].total_score end - -- info:UpdateScore() + info:UpdateScore() info._view:GetChild("zhanji").visible = true local num = data[i].total_score if num >= 0 then diff --git a/wb_unity_pro/Assets/Scripts/HotUpdate.cs b/wb_unity_pro/Assets/Scripts/HotUpdate.cs index 63ffe1a9..bb2bea59 100644 --- a/wb_unity_pro/Assets/Scripts/HotUpdate.cs +++ b/wb_unity_pro/Assets/Scripts/HotUpdate.cs @@ -198,6 +198,9 @@ public class Hotupdate { public void LoadAsset() { + Done = true; + Progress = 1; + return; GameApplication.Instance.StartCoroutine(__LoadAsset()); }