From ef037496fbc87e7b591a0182dd2430180aba4d6a Mon Sep 17 00:00:00 2001 From: lhy6305 Date: Tue, 22 Apr 2025 11:09:15 +0800 Subject: [PATCH] git auto update --- index.html | 1 - js/2-jsloadentry.js | 9 ++++----- js/libclickfx.js | 14 ++++++++++++++ js/libmain.js | 28 ++++++++++++++++------------ js/libutil.js | 14 ++++++-------- 5 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 js/libclickfx.js diff --git a/index.html b/index.html index a82c025..4ebd787 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,6 @@ - diff --git a/js/2-jsloadentry.js b/js/2-jsloadentry.js index 94d78e5..30b9caf 100644 --- a/js/2-jsloadentry.js +++ b/js/2-jsloadentry.js @@ -14,12 +14,11 @@ scriptManager.loadjs("./js/libutil.js"); scriptManager.loadjs("./js/libcubicbezier.js"); scriptManager.loadjs("./js/libwebglcheck.js"); - if(window.EnableDebugMode) { - scriptManager.loadjs("./js/libpixi_v891gl.dev.min.js"); - } else { - scriptManager.loadjs("./js/libpixi_v891gl.prod.min.js"); - } + scriptManager.loadjs("./js/libpixi_v891gl.dev.min.js"); + //scriptManager.loadjs("./js/libpixi_v891gl.prod.min.js"); await scriptManager.waitAll(); await scriptManager.loadjs("./js/libtransition.js"); await scriptManager.loadjs("./js/libmain.js"); + scriptManager.loadjs("./js/libclickfx.js"); + await scriptManager.waitAll(); })(); \ No newline at end of file diff --git a/js/libclickfx.js b/js/libclickfx.js new file mode 100644 index 0000000..bd1e23b --- /dev/null +++ b/js/libclickfx.js @@ -0,0 +1,14 @@ +(function() { + if(typeof libmain!="object") { + if(typeof loadfail=="function") { + loadfail("libclickfx.js: libmain(type of "+(typeof libmain)+") is not an object"); + } else { + window.alert("libclickfx.js: libmain(type of "+(typeof libmain)+") is not an object"); + } + return; + } + libmain.scenes.click_fx.interactiveChildren=false; + libmain.scenes.click_fx.eventMode="static"; + libmain.scenes.click_fx.on("tap", add_click_fx); + libmain.scenes.click_fx.on("mousedown", add_click_fx); +}); \ No newline at end of file diff --git a/js/libmain.js b/js/libmain.js index a6c6013..324b51d 100644 --- a/js/libmain.js +++ b/js/libmain.js @@ -22,9 +22,9 @@ libmain.settings.render.show_fps=true; libmain.settings.render.use_anti_alias=true; libmain.settings.render.resolution=1; + libmain.settings.render.ui_scale=1; libmain.settings.game= {}; - libmain.settings.game.use_anti_alias=true; /////////////////////////////////////// init canvas and frame @@ -61,6 +61,8 @@ libmain.scenes.root=new PIXI.Container(); libmain.scenes.root.boundsArea=new PIXI.Rectangle(0, 0, 0, 0); libmain.scenes.root.cullArea=libmain.scenes.root.boundsArea; + libmain.scenes.root.cullableChildren=true; + libmain.render_tick=function() { try { libmain.renderer.render(libmain.scenes.root); @@ -79,6 +81,8 @@ /////////////////////////////////////// add layered containers + libmain.scenes.click_fx=new PIXI.Container(); + libmain.scenes.menu= {}; libmain.scenes.menu.root=new PIXI.Container(); libmain.scenes.menu.startpage=new PIXI.Container(); @@ -86,10 +90,10 @@ libmain.scenes.menu.settings=new PIXI.Container(); libmain.scenes.menu.background=new PIXI.Container(); - libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.startpage, 3); - libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.pause, 2); - libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.settings, 1); libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.background, 0); + libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.settings, 1); + libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.pause, 2); + libmain.scenes.menu.root.addChildAt(libmain.scenes.menu.startpage, 3); libmain.scenes.game= {}; libmain.scenes.game.root=new PIXI.Container(); @@ -100,15 +104,16 @@ libmain.scenes.game.notes=new PIXI.Container(); libmain.scenes.game.background=new PIXI.Container(); - libmain.scenes.game.root.addChildAt(libmain.scenes.game.hud, 5); - libmain.scenes.game.root.addChildAt(libmain.scenes.game.screen_fx, 4); - libmain.scenes.game.root.addChildAt(libmain.scenes.game.judgment_fx, 3); - libmain.scenes.game.root.addChildAt(libmain.scenes.game.player, 2); - libmain.scenes.game.root.addChildAt(libmain.scenes.game.notes, 1); libmain.scenes.game.root.addChildAt(libmain.scenes.game.background, 0); + libmain.scenes.game.root.addChildAt(libmain.scenes.game.notes, 1); + libmain.scenes.game.root.addChildAt(libmain.scenes.game.player, 2); + libmain.scenes.game.root.addChildAt(libmain.scenes.game.judgment_fx, 3); + libmain.scenes.game.root.addChildAt(libmain.scenes.game.screen_fx, 4); + libmain.scenes.game.root.addChildAt(libmain.scenes.game.hud, 5); - libmain.scenes.root.addChildAt(libmain.scenes.menu.root, 1); libmain.scenes.root.addChildAt(libmain.scenes.game.root, 0); + libmain.scenes.root.addChildAt(libmain.scenes.menu.root, 1); + libmain.scenes.root.addChildAt(libmain.scenes.click_fx, 2); /////////////////////////////////////// end of setup @@ -126,8 +131,7 @@ libmain.canvas.style.top=res[3]+"px"; libmain.scenes.root.boundsArea.width=res[0]; libmain.scenes.root.boundsArea.height=res[1]; - libmain.renderer.width=res[0]; - libmain.renderer.height=res[1]; + libmain.renderer.resize(res[0], res[1]); }; window.addEventListener("resize", libmain.onresize); diff --git a/js/libutil.js b/js/libutil.js index db51231..d85c17f 100644 --- a/js/libutil.js +++ b/js/libutil.js @@ -7,13 +7,11 @@ }; libutil.clamp=function(val, min, max) { - if(window.EnableDebugMode) { - if(max