sigonasr2/ngsplanner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sigonasr2/ngsplanner

Browse Source
This commit is contained in:
Joshua Sigona 2021-08-18 21:58:51 +09:00
commit 3883abf06b
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TestPanel.js
View File

@ -214,7 +214,6 @@ function SkillTreeContainer(p){
const [skillTreeGridPaddingX,setSkillTreeGridPaddingX] = useState(10) const [skillTreeGridPaddingX,setSkillTreeGridPaddingX] = useState(10)
const [skillTreeGridPaddingY,setSkillTreeGridPaddingY] = useState(48) const [skillTreeGridPaddingY,setSkillTreeGridPaddingY] = useState(48)
const [halflineheight,setHalfLineHeight] = useState(60) const [halflineheight,setHalfLineHeight] = useState(60)
const [points,setPoints] = useState(0)
useEffect(()=>{ useEffect(()=>{
if (Object.keys(p.GetData("skill_tree_data")).length>1) { if (Object.keys(p.GetData("skill_tree_data")).length>1) {
@ -246,11 +245,7 @@ function SkillTreeContainer(p){
skillLines={skillTreeData} halflineheight={halflineheight} skillLines={skillTreeData} halflineheight={halflineheight}
/>} />}
<div className="skillTreeGrid"> <div className="skillTreeGrid">
<SkillTreeBoxes points={points} setPoints={setPoints} GetData={p.GetData} skillTreeSkillData={skillTreeSkillData}/> <SkillTreeBoxes points={p.points} setPoints={p.setPoints} GetData={p.GetData} skillTreeSkillData={skillTreeSkillData}/>
</div>
<div className="skillPoints">
<div>Your Skill Points<span>6</span></div>
<div>SP<span></span>{points}</div>
</div> </div>
</div> </div>
</div> </div>
@ -288,6 +283,7 @@ const [armorSlotSelection,setArmorSlotSelection] = useState(1)
const [classNameSetter,setClassNameSetter] = useState(0) const [classNameSetter,setClassNameSetter] = useState(0)
const [points,setPoints] = useState(0)
function rarityCheck(v) { function rarityCheck(v) {
return v!==undefined?v.rarity!==undefined?" r"+v.rarity:"":"" return v!==undefined?v.rarity!==undefined?" r"+v.rarity:"":""
@ -611,9 +607,14 @@ AUGMENT
<h1>Class Skill Tree</h1> <h1>Class Skill Tree</h1>
<div className="boxExit" onClick={() => { setClassSkillTreeWindowOpen(false) }}></div> <div className="boxExit" onClick={() => { setClassSkillTreeWindowOpen(false) }}></div>
</div> </div>
<PageControl pages={Object.keys(p.GetData("class")).length} pageNames={Object.keys(p.GetData("class")).map((cl)=>cl)} pageDisplay={Object.keys(p.GetData("class")).map((cl)=><><img alt="" src={p.GetData("class",cl,"icon")}/> {cl}</>)} currentPage={treePage} setCurrentPage={setTreePage} /> <PageControl pages={Object.keys(p.GetData("class")).length} pageNames={Object.keys(p.GetData("class")).map((cl)=>cl)} pageDisplay={Object.keys(p.GetData("class")).map((cl)=><><img className="boxMenuClassIcon" alt="" src={p.GetData("class",cl,"icon")}/> {cl}</>)} currentPage={treePage} setCurrentPage={setTreePage} />
<SkillTreeContainer GetData={p.GetData} cl={Object.keys(p.GetData("class"))[treePage-1]}/> <SkillTreeContainer points={points} setPoints={setPoints} GetData={p.GetData} cl={Object.keys(p.GetData("class"))[treePage-1]}/>
<div className="skillConfirm"><span>Confirm</span><span>Cancel</span></div>
<div className="skillPoints">
<div>Your Skill Points<span>6</span></div>
<div>SP<span></span>{points}</div>
</div>
<div className="skillConfirm"><span>Confirm</span><span>Cancel</span></div>
</div> </div>
</Modal> </Modal>

4
src/style.css
View File

@ -533,6 +533,9 @@ li.r4 {
.boxmenu img { .boxmenu img {
vertical-align: middle; vertical-align: middle;
} }
.boxMenuClassIcon {
max-height: 16px;
}
.pageControlDetails { .pageControlDetails {
background-color: rgba(25, 30, 35, 0.66) !important; background-color: rgba(25, 30, 35, 0.66) !important;
margin: 10px 5px 0 auto !important; margin: 10px 5px 0 auto !important;
@ -751,6 +754,7 @@ div.skillLocked img, div.skillLocked span.skillAllocated, div.skillLocked em.ski
} }
.skillIcon { .skillIcon {
margin: 0 auto; margin: 0 auto;
max-width: 48px;
} }
.skillAllocated { .skillAllocated {
display: block; display: block;