real merge

This commit is contained in:
2022-07-23 13:13:52 -04:00
parent 7a3bbc10c8
commit 2af94f26ca
13 changed files with 240 additions and 345 deletions

View File

@@ -291,6 +291,7 @@ GameUI.StringCode = StringCode;
GameUI.Cheated = false;
// 创建网页
function script() {
var fn = arguments[0];
@@ -331,7 +332,7 @@ var moviePage = script(function(){/*
</root>
*/});
// 刀塔2021.09.18更新后官方移除BLoadLayoutFromString改造后需要配合xml
// 刀塔2021.09.18更新后官方移除BLoadLayoutFromString改造后需要配合调用方xml
GameUI.PlayMovie = function (panel, movie, duration, isShowClose) {
if (!panel) return;
if (!movie) return;