mirror of
https://github.com/VickScarlet/lifeRestart.git
synced 2026-03-25 08:34:16 +08:00
Squashed commit of the following:
commit89e30db1fbAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Fri Jan 28 13:49:32 2022 +0800 update events commit870d711162Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 27 16:50:19 2022 +0800 update event commitb327eb1765Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 27 16:36:02 2022 +0800 update event commit4e845bc2ebAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 27 16:35:56 2022 +0800 fix ui feel commitbd508913c5Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 27 16:35:22 2022 +0800 update special thanks commitd097b3bc15Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 27 16:04:55 2022 +0800 add unique character commit8d71b73e94Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Jan 25 21:27:29 2022 +0800 fix: bug save load commit286828abe7Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Jan 25 18:15:22 2022 +0800 add game mode commit0e3c885ad3Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Jan 6 20:09:20 2022 +0800 update special thanks commitb421082374Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Fri Dec 31 20:26:20 2021 +0800 update specialthanks commit765a69294bAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Dec 14 19:10:03 2021 +0800 fix ios goto commit8eb8c3ca72Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Dec 14 19:03:37 2021 +0800 add event grade commitab705dd46cAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Dec 14 18:48:42 2021 +0800 build version commita1e4232369Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Dec 14 18:47:05 2021 +0800 change talent replace before property allocate commitf4d7b3ae3cAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Dec 14 18:06:18 2021 +0800 add event grade commit0567e40ddcAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 21:28:10 2021 +0800 add particle commitf17003925eAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 20:14:26 2021 +0800 change ui commitf8beda1d8fAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 19:08:30 2021 +0800 change popup message ui commit915a2aa17dAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 18:34:29 2021 +0800 new build commitb5edabc104Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 18:18:46 2021 +0800 add hint message commita143feadafAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 17:57:31 2021 +0800 fix copy bug commiteab1975791Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 17:56:28 2021 +0800 add save/load commitacf9b92134Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Dec 2 14:35:33 2021 +0800 add theme switch commit488a6054abAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Wed Dec 1 18:30:36 2021 +0800 fix uiManager bug commitf0317eaf14Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Wed Dec 1 16:07:03 2021 +0800 add message popup commiteb02d1ee6fAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 21:22:54 2021 +0800 change relocation commit60503eae47Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 19:27:16 2021 +0800 change ScaleButton -> Laya.runtime.ScaleButton commit52ef5909c1Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 19:26:31 2021 +0800 change ScaleButton -> Laya.runtime.ScaleButton commit0284f6aa71Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 19:05:24 2021 +0800 config webpack commit0e272ffd99Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 13:17:41 2021 +0800 add thanks commite1e2ab4701Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 28 11:40:21 2021 +0800 add light theme commit4f55c00f86Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sat Nov 27 22:27:39 2021 +0800 fix bug commit1d07bdfc46Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sat Nov 27 21:48:47 2021 +0800 daily update commit52d6a0ca8fAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Wed Nov 24 23:10:04 2021 +0800 daily update commitf8dd720d4dAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Wed Nov 24 19:08:13 2021 +0800 daily update commitd088c1a862Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 21 21:41:46 2021 +0800 remove useless commita711fcf3edAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Nov 16 00:53:05 2021 +0800 add achievement popup add page adaptive add talent extends commit05e02de3dbAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Sat Nov 13 01:24:04 2021 +0800 add github and discord commitbff0109cc5Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sat Nov 13 00:30:01 2021 +0800 add trajectory auto mode commit54c04f65c2Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Fri Nov 12 19:54:31 2021 +0800 fix property judge negative number bug commit660739530bAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Fri Nov 12 19:48:58 2021 +0800 update achievement commitc94e9e7433Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Thu Nov 11 21:37:45 2021 +0800 update daily commitc06cd9ea62Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Tue Nov 9 00:08:05 2021 +0800 update daily commit2666983f89Author: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 7 23:00:22 2021 +0800 add uiManager auto scan and load skin resource commit22fa5d755aAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Nov 7 22:17:04 2021 +0800 update framework commitf40698d63eAuthor: Vick Scarlet <scarlet_vick@outlook.com> Date: Sun Oct 31 00:13:22 2021 +0800 add laya
This commit is contained in:
@@ -11371,6 +11371,7 @@
|
|||||||
"id": 20002,
|
"id": 20002,
|
||||||
"event": "你在睡梦中安然离世。",
|
"event": "你在睡梦中安然离世。",
|
||||||
"include": "EVT?[10000]",
|
"include": "EVT?[10000]",
|
||||||
|
"exclude": "TLT?[1048]",
|
||||||
"branch": [
|
"branch": [
|
||||||
"EVT?[10000]:10000"
|
"EVT?[10000]:10000"
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -11371,6 +11371,7 @@
|
|||||||
"id": 20002,
|
"id": 20002,
|
||||||
"event": "你在睡梦中安然离世。",
|
"event": "你在睡梦中安然离世。",
|
||||||
"include": "EVT?[10000]",
|
"include": "EVT?[10000]",
|
||||||
|
"exclude": "TLT?[1048]",
|
||||||
"branch": [
|
"branch": [
|
||||||
"EVT?[10000]:10000"
|
"EVT?[10000]:10000"
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ var View=laya.ui.View;
|
|||||||
var Dialog=laya.ui.Dialog;
|
var Dialog=laya.ui.Dialog;
|
||||||
var CelebrityUI=(function(_super){
|
var CelebrityUI=(function(_super){
|
||||||
function CelebrityUI(){
|
function CelebrityUI(){
|
||||||
|
|
||||||
this.panelCharacter=null;
|
this.panelCharacter=null;
|
||||||
this.vboxCharacter=null;
|
this.vboxCharacter=null;
|
||||||
this.btnRetry=null;
|
this.btnRetry=null;
|
||||||
@@ -28,7 +28,7 @@ var CelebrityUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberAchievementUI=(function(_super){
|
var CyberAchievementUI=(function(_super){
|
||||||
function CyberAchievementUI(){
|
function CyberAchievementUI(){
|
||||||
|
|
||||||
this.btnBack=null;
|
this.btnBack=null;
|
||||||
this.btnRank=null;
|
this.btnRank=null;
|
||||||
this.btnStatistics=null;
|
this.btnStatistics=null;
|
||||||
@@ -66,7 +66,7 @@ var CyberAchievementUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberAchievementPopupUI=(function(_super){
|
var CyberAchievementPopupUI=(function(_super){
|
||||||
function CyberAchievementPopupUI(){
|
function CyberAchievementPopupUI(){
|
||||||
|
|
||||||
this.boxBg=null;
|
this.boxBg=null;
|
||||||
this.labName=null;
|
this.labName=null;
|
||||||
|
|
||||||
@@ -76,7 +76,7 @@ var CyberAchievementPopupUI=(function(_super){
|
|||||||
CLASS$(CyberAchievementPopupUI,'ui.view.CyberTheme.CyberAchievementPopupUI',_super);
|
CLASS$(CyberAchievementPopupUI,'ui.view.CyberTheme.CyberAchievementPopupUI',_super);
|
||||||
var __proto__=CyberAchievementPopupUI.prototype;
|
var __proto__=CyberAchievementPopupUI.prototype;
|
||||||
__proto__.createChildren=function(){
|
__proto__.createChildren=function(){
|
||||||
|
|
||||||
laya.ui.Component.prototype.createChildren.call(this);
|
laya.ui.Component.prototype.createChildren.call(this);
|
||||||
this.createView(CyberAchievementPopupUI.uiView);
|
this.createView(CyberAchievementPopupUI.uiView);
|
||||||
|
|
||||||
@@ -87,7 +87,7 @@ var CyberAchievementPopupUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberMainUI=(function(_super){
|
var CyberMainUI=(function(_super){
|
||||||
function CyberMainUI(){
|
function CyberMainUI(){
|
||||||
|
|
||||||
this.imgBg=null;
|
this.imgBg=null;
|
||||||
this.imgTitle=null;
|
this.imgTitle=null;
|
||||||
this.btnRemake=null;
|
this.btnRemake=null;
|
||||||
@@ -119,7 +119,7 @@ var CyberMainUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberPropertyUI=(function(_super){
|
var CyberPropertyUI=(function(_super){
|
||||||
function CyberPropertyUI(){
|
function CyberPropertyUI(){
|
||||||
|
|
||||||
this.labLeftPropertyPoint=null;
|
this.labLeftPropertyPoint=null;
|
||||||
this.boxCharm=null;
|
this.boxCharm=null;
|
||||||
this.boxCharmAllocate=null;
|
this.boxCharmAllocate=null;
|
||||||
@@ -165,7 +165,7 @@ var CyberPropertyUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberSummaryUI=(function(_super){
|
var CyberSummaryUI=(function(_super){
|
||||||
function CyberSummaryUI(){
|
function CyberSummaryUI(){
|
||||||
|
|
||||||
this.labAge=null;
|
this.labAge=null;
|
||||||
this.labAgeJudge=null;
|
this.labAgeJudge=null;
|
||||||
this.labTotal=null;
|
this.labTotal=null;
|
||||||
@@ -213,7 +213,7 @@ var CyberSummaryUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberTalentUI=(function(_super){
|
var CyberTalentUI=(function(_super){
|
||||||
function CyberTalentUI(){
|
function CyberTalentUI(){
|
||||||
|
|
||||||
this.pageDrawCard=null;
|
this.pageDrawCard=null;
|
||||||
this.btnDrawCard=null;
|
this.btnDrawCard=null;
|
||||||
this.pageResult=null;
|
this.pageResult=null;
|
||||||
@@ -239,7 +239,7 @@ var CyberTalentUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CyberTrajectoryUI=(function(_super){
|
var CyberTrajectoryUI=(function(_super){
|
||||||
function CyberTrajectoryUI(){
|
function CyberTrajectoryUI(){
|
||||||
|
|
||||||
this.labCharm=null;
|
this.labCharm=null;
|
||||||
this.labMoney=null;
|
this.labMoney=null;
|
||||||
this.labIntelligence=null;
|
this.labIntelligence=null;
|
||||||
@@ -276,7 +276,7 @@ var CyberTrajectoryUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var ModeUI=(function(_super){
|
var ModeUI=(function(_super){
|
||||||
function ModeUI(){
|
function ModeUI(){
|
||||||
|
|
||||||
this.btnCustom=null;
|
this.btnCustom=null;
|
||||||
this.btnCelebrity=null;
|
this.btnCelebrity=null;
|
||||||
|
|
||||||
@@ -298,7 +298,7 @@ var ModeUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var AchievementUI=(function(_super){
|
var AchievementUI=(function(_super){
|
||||||
function AchievementUI(){
|
function AchievementUI(){
|
||||||
|
|
||||||
this.btnBack=null;
|
this.btnBack=null;
|
||||||
this.boxRemakeTimes=null;
|
this.boxRemakeTimes=null;
|
||||||
this.labRemakeTimes=null;
|
this.labRemakeTimes=null;
|
||||||
@@ -334,7 +334,7 @@ var AchievementUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var AchievementPopupUI=(function(_super){
|
var AchievementPopupUI=(function(_super){
|
||||||
function AchievementPopupUI(){
|
function AchievementPopupUI(){
|
||||||
|
|
||||||
this.boxBg=null;
|
this.boxBg=null;
|
||||||
this.bg1=null;
|
this.bg1=null;
|
||||||
this.labName=null;
|
this.labName=null;
|
||||||
@@ -357,7 +357,7 @@ var AchievementPopupUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var CelebrityUI=(function(_super){
|
var CelebrityUI=(function(_super){
|
||||||
function CelebrityUI(){
|
function CelebrityUI(){
|
||||||
|
|
||||||
this.panelCharacter=null;
|
this.panelCharacter=null;
|
||||||
this.vboxCharacter=null;
|
this.vboxCharacter=null;
|
||||||
this.btnRetry=null;
|
this.btnRetry=null;
|
||||||
@@ -381,7 +381,7 @@ var CelebrityUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var MainUI=(function(_super){
|
var MainUI=(function(_super){
|
||||||
function MainUI(){
|
function MainUI(){
|
||||||
|
|
||||||
this.labSubTitle=null;
|
this.labSubTitle=null;
|
||||||
this.btnRemake=null;
|
this.btnRemake=null;
|
||||||
this.btnThanks=null;
|
this.btnThanks=null;
|
||||||
@@ -411,7 +411,7 @@ var MainUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var ModeUI=(function(_super){
|
var ModeUI=(function(_super){
|
||||||
function ModeUI(){
|
function ModeUI(){
|
||||||
|
|
||||||
this.btnCustom=null;
|
this.btnCustom=null;
|
||||||
this.btnCelebrity=null;
|
this.btnCelebrity=null;
|
||||||
|
|
||||||
@@ -434,7 +434,7 @@ var ModeUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var PropertyUI=(function(_super){
|
var PropertyUI=(function(_super){
|
||||||
function PropertyUI(){
|
function PropertyUI(){
|
||||||
|
|
||||||
this.title=null;
|
this.title=null;
|
||||||
this.labLeftPropertyPoint=null;
|
this.labLeftPropertyPoint=null;
|
||||||
this.boxCharm=null;
|
this.boxCharm=null;
|
||||||
@@ -482,7 +482,7 @@ var PropertyUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var SummaryUI=(function(_super){
|
var SummaryUI=(function(_super){
|
||||||
function SummaryUI(){
|
function SummaryUI(){
|
||||||
|
|
||||||
this.title=null;
|
this.title=null;
|
||||||
this.listSummary=null;
|
this.listSummary=null;
|
||||||
this.listSelectedTalents=null;
|
this.listSelectedTalents=null;
|
||||||
@@ -508,7 +508,7 @@ var SummaryUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var TalentUI=(function(_super){
|
var TalentUI=(function(_super){
|
||||||
function TalentUI(){
|
function TalentUI(){
|
||||||
|
|
||||||
this.title=null;
|
this.title=null;
|
||||||
this.pageDrawCard=null;
|
this.pageDrawCard=null;
|
||||||
this.btnDrawCard=null;
|
this.btnDrawCard=null;
|
||||||
@@ -536,7 +536,7 @@ var TalentUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var ThanksUI=(function(_super){
|
var ThanksUI=(function(_super){
|
||||||
function ThanksUI(){
|
function ThanksUI(){
|
||||||
|
|
||||||
this.btnBack=null;
|
this.btnBack=null;
|
||||||
this.panelTopSupports=null;
|
this.panelTopSupports=null;
|
||||||
this.vboxTopSupports=null;
|
this.vboxTopSupports=null;
|
||||||
@@ -563,7 +563,7 @@ var ThanksUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var TrajectoryUI=(function(_super){
|
var TrajectoryUI=(function(_super){
|
||||||
function TrajectoryUI(){
|
function TrajectoryUI(){
|
||||||
|
|
||||||
this.labCharm=null;
|
this.labCharm=null;
|
||||||
this.labIntelligence=null;
|
this.labIntelligence=null;
|
||||||
this.labStrength=null;
|
this.labStrength=null;
|
||||||
@@ -599,7 +599,7 @@ var TrajectoryUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var LoadingUI=(function(_super){
|
var LoadingUI=(function(_super){
|
||||||
function LoadingUI(){
|
function LoadingUI(){
|
||||||
|
|
||||||
|
|
||||||
LoadingUI.__super.call(this);
|
LoadingUI.__super.call(this);
|
||||||
}
|
}
|
||||||
@@ -619,7 +619,7 @@ var LoadingUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var MessagePopupUI=(function(_super){
|
var MessagePopupUI=(function(_super){
|
||||||
function MessagePopupUI(){
|
function MessagePopupUI(){
|
||||||
|
|
||||||
this.boxBg=null;
|
this.boxBg=null;
|
||||||
this.message=null;
|
this.message=null;
|
||||||
|
|
||||||
@@ -641,7 +641,7 @@ var MessagePopupUI=(function(_super){
|
|||||||
})(View);
|
})(View);
|
||||||
var SaveLoadUI=(function(_super){
|
var SaveLoadUI=(function(_super){
|
||||||
function SaveLoadUI(){
|
function SaveLoadUI(){
|
||||||
|
|
||||||
this.input=null;
|
this.input=null;
|
||||||
this.btnSave=null;
|
this.btnSave=null;
|
||||||
this.btnLoad=null;
|
this.btnLoad=null;
|
||||||
@@ -668,7 +668,7 @@ var SaveLoadUI=(function(_super){
|
|||||||
})(Dialog);
|
})(Dialog);
|
||||||
var ThemesUI=(function(_super){
|
var ThemesUI=(function(_super){
|
||||||
function ThemesUI(){
|
function ThemesUI(){
|
||||||
|
|
||||||
this.radioTheme=null;
|
this.radioTheme=null;
|
||||||
this.btnOK=null;
|
this.btnOK=null;
|
||||||
this.btnClose=null;
|
this.btnClose=null;
|
||||||
|
|||||||
Reference in New Issue
Block a user