Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 870d711
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 27 16:50:19 2022 +0800

    update event

commit b327eb1
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 27 16:36:02 2022 +0800

    update event

commit 4e845bc
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 27 16:35:56 2022 +0800

    fix ui feel

commit bd50891
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 27 16:35:22 2022 +0800

    update special thanks

commit d097b3b
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 27 16:04:55 2022 +0800

    add unique character

commit 8d71b73
Author: Vick Scarlet <[email protected]>
Date:   Tue Jan 25 21:27:29 2022 +0800

    fix: bug
    save load

commit 286828a
Author: Vick Scarlet <[email protected]>
Date:   Tue Jan 25 18:15:22 2022 +0800

    add game mode

commit 0e3c885
Author: Vick Scarlet <[email protected]>
Date:   Thu Jan 6 20:09:20 2022 +0800

    update special thanks

commit b421082
Author: Vick Scarlet <[email protected]>
Date:   Fri Dec 31 20:26:20 2021 +0800

    update specialthanks

commit 765a692
Author: Vick Scarlet <[email protected]>
Date:   Tue Dec 14 19:10:03 2021 +0800

    fix ios goto

commit 8eb8c3c
Author: Vick Scarlet <[email protected]>
Date:   Tue Dec 14 19:03:37 2021 +0800

    add event grade

commit ab705dd
Author: Vick Scarlet <[email protected]>
Date:   Tue Dec 14 18:48:42 2021 +0800

    build version

commit a1e4232
Author: Vick Scarlet <[email protected]>
Date:   Tue Dec 14 18:47:05 2021 +0800

    change talent replace before property allocate

commit f4d7b3a
Author: Vick Scarlet <[email protected]>
Date:   Tue Dec 14 18:06:18 2021 +0800

    add event grade

commit 0567e40
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 21:28:10 2021 +0800

    add particle

commit f170039
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 20:14:26 2021 +0800

    change ui

commit f8beda1
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 19:08:30 2021 +0800

    change popup message ui

commit 915a2aa
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 18:34:29 2021 +0800

    new build

commit b5edabc
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 18:18:46 2021 +0800

    add hint message

commit a143fea
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 17:57:31 2021 +0800

    fix copy bug

commit eab1975
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 17:56:28 2021 +0800

    add save/load

commit acf9b92
Author: Vick Scarlet <[email protected]>
Date:   Thu Dec 2 14:35:33 2021 +0800

    add theme switch

commit 488a605
Author: Vick Scarlet <[email protected]>
Date:   Wed Dec 1 18:30:36 2021 +0800

    fix uiManager bug

commit f0317ea
Author: Vick Scarlet <[email protected]>
Date:   Wed Dec 1 16:07:03 2021 +0800

    add message popup

commit eb02d1e
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 21:22:54 2021 +0800

    change relocation

commit 60503ea
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 19:27:16 2021 +0800

    change ScaleButton -> Laya.runtime.ScaleButton

commit 52ef590
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 19:26:31 2021 +0800

    change ScaleButton -> Laya.runtime.ScaleButton

commit 0284f6a
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 19:05:24 2021 +0800

    config webpack

commit 0e272ff
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 13:17:41 2021 +0800

    add thanks

commit e1e2ab4
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 28 11:40:21 2021 +0800

    add light theme

commit 4f55c00
Author: Vick Scarlet <[email protected]>
Date:   Sat Nov 27 22:27:39 2021 +0800

    fix bug

commit 1d07bdf
Author: Vick Scarlet <[email protected]>
Date:   Sat Nov 27 21:48:47 2021 +0800

    daily update

commit 52d6a0c
Author: Vick Scarlet <[email protected]>
Date:   Wed Nov 24 23:10:04 2021 +0800

    daily update

commit f8dd720
Author: Vick Scarlet <[email protected]>
Date:   Wed Nov 24 19:08:13 2021 +0800

    daily update

commit d088c1a
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 21 21:41:46 2021 +0800

    remove useless

commit a711fcf
Author: Vick Scarlet <[email protected]>
Date:   Tue Nov 16 00:53:05 2021 +0800

    add achievement popup
    add page adaptive
    add talent extends

commit 05e02de
Author: Vick Scarlet <[email protected]>
Date:   Sat Nov 13 01:24:04 2021 +0800

    add github and discord

commit bff0109
Author: Vick Scarlet <[email protected]>
Date:   Sat Nov 13 00:30:01 2021 +0800

    add trajectory auto mode

commit 54c04f6
Author: Vick Scarlet <[email protected]>
Date:   Fri Nov 12 19:54:31 2021 +0800

    fix property judge negative number bug

commit 6607395
Author: Vick Scarlet <[email protected]>
Date:   Fri Nov 12 19:48:58 2021 +0800

    update achievement

commit c94e9e7
Author: Vick Scarlet <[email protected]>
Date:   Thu Nov 11 21:37:45 2021 +0800

    update daily

commit c06cd9e
Author: Vick Scarlet <[email protected]>
Date:   Tue Nov 9 00:08:05 2021 +0800

    update daily

commit 2666983
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 7 23:00:22 2021 +0800

    add uiManager auto scan and load skin resource

commit 22fa5d7
Author: Vick Scarlet <[email protected]>
Date:   Sun Nov 7 22:17:04 2021 +0800

    update framework

commit f40698d
Author: Vick Scarlet <[email protected]>
Date:   Sun Oct 31 00:13:22 2021 +0800

    add laya
  • Loading branch information
VickScarlet committed Jan 27, 2022
1 parent 150c991 commit 14f9340
Show file tree
Hide file tree
Showing 74 changed files with 7,713 additions and 1,525 deletions.
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"cSpell.words": [
"Laya"
]
}
Binary file added data/en-us/character.xlsx
Binary file not shown.
Binary file added data/zh-cn/character.xlsx
Binary file not shown.
1,204 changes: 1,204 additions & 0 deletions laya/pages/view/CyberTheme/Celebrity.ui

Large diffs are not rendered by default.

128 changes: 128 additions & 0 deletions laya/pages/view/CyberTheme/Mode.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"x":0,
"type":"View",
"selectedBox":1,
"selecteID":8,
"props":{"width":1125,"sceneColor":"#000000","height":2436},
"nodeParent":-1,
"label":"View",
"isOpen":true,
"isDirectory":true,
"isAniNode":true,
"hasChild":true,
"compId":1,
"child":[
{
"x":15,
"type":"Box",
"props":{"y":10,"x":10,"width":600,"var":"btnCustom","runtime":"Laya.runtime.ScaleButton","name":"btn","height":400,"centerY":-400,"centerX":0},
"nodeParent":1,
"label":"Box(btnCustom)",
"isOpen":true,
"isDirectory":true,
"isAniNode":true,
"hasChild":true,
"compId":2,
"child":[
{
"x":30,
"type":"Image",
"props":{"top":-15,"skin":"images/border/[email protected]","right":-15,"left":-15,"bottom":-15},
"nodeParent":2,
"label":"Image",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":10,
"child":[
]
},
{
"x":30,
"type":"Label",
"props":{"top":50,"text":"UI_CustomMode","fontSize":80,"font":"方正像素12","color":"#ffffff","centerX":0,"bold":true},
"nodeParent":2,
"label":"Label",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":4,
"child":[
]
},
{
"x":30,
"type":"Label",
"props":{"top":200,"text":"UI_CustomModeDescription","right":0,"left":0,"leading":20,"fontSize":40,"font":"方正像素12","color":"#bcbcbc","bottom":0,"align":"center"},
"nodeParent":2,
"label":"Label",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":5,
"child":[
]
}]
},
{
"x":15,
"type":"Box",
"props":{"y":10,"x":20,"width":600,"var":"btnCelebrity","runtime":"Laya.runtime.ScaleButton","name":"btn","height":400,"centerY":400,"centerX":0},
"nodeParent":1,
"label":"Box(btnCelebrity)",
"isOpen":true,
"isDirectory":true,
"isAniNode":true,
"hasChild":true,
"compId":3,
"child":[
{
"x":30,
"type":"Image",
"props":{"y":-15,"x":-15,"top":-15,"skin":"images/border/[email protected]","right":-15,"left":-15,"bottom":-15},
"nodeParent":3,
"label":"Image",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":11,
"child":[
]
},
{
"x":30,
"type":"Label",
"props":{"top":50,"text":"UI_CelebrityMode","fontSize":80,"font":"方正像素12","color":"#ffffff","centerX":0,"bold":true},
"nodeParent":3,
"label":"Label",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":7,
"child":[
]
},
{
"x":30,
"type":"Label",
"props":{"top":200,"text":"UI_CelebrityModeDescription","right":0,"left":0,"leading":20,"fontSize":40,"font":"方正像素12","color":"#bcbcbc","bottom":0,"align":"center"},
"nodeParent":3,
"label":"Label",
"isDirectory":false,
"isAniNode":true,
"hasChild":false,
"compId":8,
"child":[
]
}]
}],
"animations":[
{
"nodes":[
],
"name":"ani1",
"id":1,
"frameRate":24,
"action":0
}]
}
Loading

0 comments on commit 14f9340

Please sign in to comment.