From 8eb0e4484532213113b8dd89e5cfa0d8a3bdf688 Mon Sep 17 00:00:00 2001 From: Vick Scarlet Date: Fri, 28 Jan 2022 14:03:05 +0800 Subject: [PATCH] Squashed commit of the following: commit 89e30db1fb5d5e80c23fa92556a02343f643552e Author: Vick Scarlet Date: Fri Jan 28 13:49:32 2022 +0800 update events commit 870d711162ec9e86c67caba7b380ffe2e1f45970 Author: Vick Scarlet Date: Thu Jan 27 16:50:19 2022 +0800 update event commit b327eb17653772c1c18be346295d55c1975e7bc9 Author: Vick Scarlet Date: Thu Jan 27 16:36:02 2022 +0800 update event commit 4e845bc2eb6f5a50fd0e0bc65839e2f14219d9c3 Author: Vick Scarlet Date: Thu Jan 27 16:35:56 2022 +0800 fix ui feel commit bd508913c5214e4869b75256e4998c0971d06f06 Author: Vick Scarlet Date: Thu Jan 27 16:35:22 2022 +0800 update special thanks commit d097b3bc15b35acbfe8c3756b8c7860351b6c95c Author: Vick Scarlet Date: Thu Jan 27 16:04:55 2022 +0800 add unique character commit 8d71b73e94f10dc64f1661512c4dbfb750521032 Author: Vick Scarlet Date: Tue Jan 25 21:27:29 2022 +0800 fix: bug save load commit 286828abe74307ecd5d4ef730068fb8d7b5a4cdd Author: Vick Scarlet Date: Tue Jan 25 18:15:22 2022 +0800 add game mode commit 0e3c885ad3204c49a119a4e6bd73b4e230e4a8ac Author: Vick Scarlet Date: Thu Jan 6 20:09:20 2022 +0800 update special thanks commit b4210823742660efc45d11b361011c633dee0624 Author: Vick Scarlet Date: Fri Dec 31 20:26:20 2021 +0800 update specialthanks commit 765a69294bcf214b3aed076128c695bbcb1d6c96 Author: Vick Scarlet Date: Tue Dec 14 19:10:03 2021 +0800 fix ios goto commit 8eb8c3ca7287c2b0dfbb62d5534c06af6d69953c Author: Vick Scarlet Date: Tue Dec 14 19:03:37 2021 +0800 add event grade commit ab705dd46c88e28e96535219f5d8fc4e2ec6448f Author: Vick Scarlet Date: Tue Dec 14 18:48:42 2021 +0800 build version commit a1e4232369cc9b3a12c393eb2f97c22d84ce0f57 Author: Vick Scarlet Date: Tue Dec 14 18:47:05 2021 +0800 change talent replace before property allocate commit f4d7b3ae3c98212fb1401e59c7e334e8e3850277 Author: Vick Scarlet Date: Tue Dec 14 18:06:18 2021 +0800 add event grade commit 0567e40ddce36358a315b340931240e8c962b1f0 Author: Vick Scarlet Date: Thu Dec 2 21:28:10 2021 +0800 add particle commit f17003925eb419371ed7320aaf9a5678f3a43cb2 Author: Vick Scarlet Date: Thu Dec 2 20:14:26 2021 +0800 change ui commit f8beda1d8ff0d4b7712d0ba5aff2b59624ded8cf Author: Vick Scarlet Date: Thu Dec 2 19:08:30 2021 +0800 change popup message ui commit 915a2aa17d5bf057282c0289671506f52f789008 Author: Vick Scarlet Date: Thu Dec 2 18:34:29 2021 +0800 new build commit b5edabc10433c1dfe444a2c07ad1eaccc71ef188 Author: Vick Scarlet Date: Thu Dec 2 18:18:46 2021 +0800 add hint message commit a143feadaf05adfef468d9b464252ad69a8ebc62 Author: Vick Scarlet Date: Thu Dec 2 17:57:31 2021 +0800 fix copy bug commit eab1975791b13325dd687969f7a04fade15a3bd1 Author: Vick Scarlet Date: Thu Dec 2 17:56:28 2021 +0800 add save/load commit acf9b9213451f0f3c754ab068a62b367a7103250 Author: Vick Scarlet Date: Thu Dec 2 14:35:33 2021 +0800 add theme switch commit 488a6054abd57eb933564d4db9d057283e3ae513 Author: Vick Scarlet Date: Wed Dec 1 18:30:36 2021 +0800 fix uiManager bug commit f0317eaf14353a1fde8c16237fd5cb1fd1b9e1d0 Author: Vick Scarlet Date: Wed Dec 1 16:07:03 2021 +0800 add message popup commit eb02d1ee6fc89d63b3928650c05fe9576bbbcd7f Author: Vick Scarlet Date: Sun Nov 28 21:22:54 2021 +0800 change relocation commit 60503eae47743d133833cf05d8f7dfd368dffb51 Author: Vick Scarlet Date: Sun Nov 28 19:27:16 2021 +0800 change ScaleButton -> Laya.runtime.ScaleButton commit 52ef5909c1fcd33044db192860978ffee5b3cb1a Author: Vick Scarlet Date: Sun Nov 28 19:26:31 2021 +0800 change ScaleButton -> Laya.runtime.ScaleButton commit 0284f6aa718fda9927207e60f60ac0ccdf720b5e Author: Vick Scarlet Date: Sun Nov 28 19:05:24 2021 +0800 config webpack commit 0e272ffd993b7a6cfbcc47b8ae325d2bfbc1b848 Author: Vick Scarlet Date: Sun Nov 28 13:17:41 2021 +0800 add thanks commit e1e2ab47014148d5939b23c8b943c1702014eeef Author: Vick Scarlet Date: Sun Nov 28 11:40:21 2021 +0800 add light theme commit 4f55c00f8674d0a07dd8ed2585415228c253c2ed Author: Vick Scarlet Date: Sat Nov 27 22:27:39 2021 +0800 fix bug commit 1d07bdfc46993b708e28da39c34fd71fcf211190 Author: Vick Scarlet Date: Sat Nov 27 21:48:47 2021 +0800 daily update commit 52d6a0ca8f686191e0954f559922d80701bfe175 Author: Vick Scarlet Date: Wed Nov 24 23:10:04 2021 +0800 daily update commit f8dd720d4dd7de572827c6dc745b9732ff1077a1 Author: Vick Scarlet Date: Wed Nov 24 19:08:13 2021 +0800 daily update commit d088c1a86231ef0ab646c62f70d8aaa237c16944 Author: Vick Scarlet Date: Sun Nov 21 21:41:46 2021 +0800 remove useless commit a711fcf3ede1dee380afc6ea30541109322f9244 Author: Vick Scarlet Date: Tue Nov 16 00:53:05 2021 +0800 add achievement popup add page adaptive add talent extends commit 05e02de3db28878e5e7a31b574dbe459f9858542 Author: Vick Scarlet Date: Sat Nov 13 01:24:04 2021 +0800 add github and discord commit bff0109cc53fd9cacfd7f392b172a5faefaad92c Author: Vick Scarlet Date: Sat Nov 13 00:30:01 2021 +0800 add trajectory auto mode commit 54c04f65c2fd4beb07fe09bc918cd9edb2f1296f Author: Vick Scarlet Date: Fri Nov 12 19:54:31 2021 +0800 fix property judge negative number bug commit 660739530bd8479d8c5de566d4425025a37e7f57 Author: Vick Scarlet Date: Fri Nov 12 19:48:58 2021 +0800 update achievement commit c94e9e7433da6eb0e581d3cf49022b74aea4d29f Author: Vick Scarlet Date: Thu Nov 11 21:37:45 2021 +0800 update daily commit c06cd9ea62ef582532b342b7381d7204be40522c Author: Vick Scarlet Date: Tue Nov 9 00:08:05 2021 +0800 update daily commit 2666983f8916f8ce88df2e02730880985f0a9eef Author: Vick Scarlet Date: Sun Nov 7 23:00:22 2021 +0800 add uiManager auto scan and load skin resource commit 22fa5d755aad053f18d8a5db3be399fc09a1065d Author: Vick Scarlet Date: Sun Nov 7 22:17:04 2021 +0800 update framework commit f40698d63ede4d59708070312a763cc9c61e44ab Author: Vick Scarlet Date: Sun Oct 31 00:13:22 2021 +0800 add laya --- public/data/en-us/events.json | 1 + public/data/zh-cn/events.json | 1 + src/ui/layaUI.max.all.js | 48 +++++++++++++++++------------------ 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/public/data/en-us/events.json b/public/data/en-us/events.json index 03d67ac..74072c7 100644 --- a/public/data/en-us/events.json +++ b/public/data/en-us/events.json @@ -11371,6 +11371,7 @@ "id": 20002, "event": "你在睡梦中安然离世。", "include": "EVT?[10000]", + "exclude": "TLT?[1048]", "branch": [ "EVT?[10000]:10000" ] diff --git a/public/data/zh-cn/events.json b/public/data/zh-cn/events.json index 03d67ac..74072c7 100644 --- a/public/data/zh-cn/events.json +++ b/public/data/zh-cn/events.json @@ -11371,6 +11371,7 @@ "id": 20002, "event": "你在睡梦中安然离世。", "include": "EVT?[10000]", + "exclude": "TLT?[1048]", "branch": [ "EVT?[10000]:10000" ] diff --git a/src/ui/layaUI.max.all.js b/src/ui/layaUI.max.all.js index 42aec7b..91a2c13 100644 --- a/src/ui/layaUI.max.all.js +++ b/src/ui/layaUI.max.all.js @@ -4,7 +4,7 @@ var View=laya.ui.View; var Dialog=laya.ui.Dialog; var CelebrityUI=(function(_super){ function CelebrityUI(){ - + this.panelCharacter=null; this.vboxCharacter=null; this.btnRetry=null; @@ -28,7 +28,7 @@ var CelebrityUI=(function(_super){ })(View); var CyberAchievementUI=(function(_super){ function CyberAchievementUI(){ - + this.btnBack=null; this.btnRank=null; this.btnStatistics=null; @@ -66,7 +66,7 @@ var CyberAchievementUI=(function(_super){ })(View); var CyberAchievementPopupUI=(function(_super){ function CyberAchievementPopupUI(){ - + this.boxBg=null; this.labName=null; @@ -76,7 +76,7 @@ var CyberAchievementPopupUI=(function(_super){ CLASS$(CyberAchievementPopupUI,'ui.view.CyberTheme.CyberAchievementPopupUI',_super); var __proto__=CyberAchievementPopupUI.prototype; __proto__.createChildren=function(){ - + laya.ui.Component.prototype.createChildren.call(this); this.createView(CyberAchievementPopupUI.uiView); @@ -87,7 +87,7 @@ var CyberAchievementPopupUI=(function(_super){ })(View); var CyberMainUI=(function(_super){ function CyberMainUI(){ - + this.imgBg=null; this.imgTitle=null; this.btnRemake=null; @@ -119,7 +119,7 @@ var CyberMainUI=(function(_super){ })(View); var CyberPropertyUI=(function(_super){ function CyberPropertyUI(){ - + this.labLeftPropertyPoint=null; this.boxCharm=null; this.boxCharmAllocate=null; @@ -165,7 +165,7 @@ var CyberPropertyUI=(function(_super){ })(View); var CyberSummaryUI=(function(_super){ function CyberSummaryUI(){ - + this.labAge=null; this.labAgeJudge=null; this.labTotal=null; @@ -213,7 +213,7 @@ var CyberSummaryUI=(function(_super){ })(View); var CyberTalentUI=(function(_super){ function CyberTalentUI(){ - + this.pageDrawCard=null; this.btnDrawCard=null; this.pageResult=null; @@ -239,7 +239,7 @@ var CyberTalentUI=(function(_super){ })(View); var CyberTrajectoryUI=(function(_super){ function CyberTrajectoryUI(){ - + this.labCharm=null; this.labMoney=null; this.labIntelligence=null; @@ -276,7 +276,7 @@ var CyberTrajectoryUI=(function(_super){ })(View); var ModeUI=(function(_super){ function ModeUI(){ - + this.btnCustom=null; this.btnCelebrity=null; @@ -298,7 +298,7 @@ var ModeUI=(function(_super){ })(View); var AchievementUI=(function(_super){ function AchievementUI(){ - + this.btnBack=null; this.boxRemakeTimes=null; this.labRemakeTimes=null; @@ -334,7 +334,7 @@ var AchievementUI=(function(_super){ })(View); var AchievementPopupUI=(function(_super){ function AchievementPopupUI(){ - + this.boxBg=null; this.bg1=null; this.labName=null; @@ -357,7 +357,7 @@ var AchievementPopupUI=(function(_super){ })(View); var CelebrityUI=(function(_super){ function CelebrityUI(){ - + this.panelCharacter=null; this.vboxCharacter=null; this.btnRetry=null; @@ -381,7 +381,7 @@ var CelebrityUI=(function(_super){ })(View); var MainUI=(function(_super){ function MainUI(){ - + this.labSubTitle=null; this.btnRemake=null; this.btnThanks=null; @@ -411,7 +411,7 @@ var MainUI=(function(_super){ })(View); var ModeUI=(function(_super){ function ModeUI(){ - + this.btnCustom=null; this.btnCelebrity=null; @@ -434,7 +434,7 @@ var ModeUI=(function(_super){ })(View); var PropertyUI=(function(_super){ function PropertyUI(){ - + this.title=null; this.labLeftPropertyPoint=null; this.boxCharm=null; @@ -482,7 +482,7 @@ var PropertyUI=(function(_super){ })(View); var SummaryUI=(function(_super){ function SummaryUI(){ - + this.title=null; this.listSummary=null; this.listSelectedTalents=null; @@ -508,7 +508,7 @@ var SummaryUI=(function(_super){ })(View); var TalentUI=(function(_super){ function TalentUI(){ - + this.title=null; this.pageDrawCard=null; this.btnDrawCard=null; @@ -536,7 +536,7 @@ var TalentUI=(function(_super){ })(View); var ThanksUI=(function(_super){ function ThanksUI(){ - + this.btnBack=null; this.panelTopSupports=null; this.vboxTopSupports=null; @@ -563,7 +563,7 @@ var ThanksUI=(function(_super){ })(View); var TrajectoryUI=(function(_super){ function TrajectoryUI(){ - + this.labCharm=null; this.labIntelligence=null; this.labStrength=null; @@ -599,7 +599,7 @@ var TrajectoryUI=(function(_super){ })(View); var LoadingUI=(function(_super){ function LoadingUI(){ - + LoadingUI.__super.call(this); } @@ -619,7 +619,7 @@ var LoadingUI=(function(_super){ })(View); var MessagePopupUI=(function(_super){ function MessagePopupUI(){ - + this.boxBg=null; this.message=null; @@ -641,7 +641,7 @@ var MessagePopupUI=(function(_super){ })(View); var SaveLoadUI=(function(_super){ function SaveLoadUI(){ - + this.input=null; this.btnSave=null; this.btnLoad=null; @@ -668,7 +668,7 @@ var SaveLoadUI=(function(_super){ })(Dialog); var ThemesUI=(function(_super){ function ThemesUI(){ - + this.radioTheme=null; this.btnOK=null; this.btnClose=null;