Grasscutters/gc-tools
2
0
Fork 0
mirror of https://github.com/exzork/gc-tools.git synced 2024-11-22 07:08:12 +00:00
Code Issues Projects Releases Wiki Activity

fix changing json type

Browse Source
This commit is contained in:
Muhammad Eko Prasetyo 2022-05-04 05:54:06 +07:00
parent 36ec24f023
commit 96cf7c3f8b
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/pages/Artifacts.tsx
View File

@ -86,15 +86,10 @@ export default function Artifacts() {
};
const getPercent = (affix:IReliquaryAffix)=>{
try{
if (affix.PropType.indexOf("PERCENT") !== -1 || affix.PropType.indexOf("CRITICAL") !== -1 || affix.PropType.indexOf("EFFICIENCY") !== -1 || affix.PropType.indexOf("HURT") !== -1) {
return parseFloat(String(affix.PropValue*100)).toPrecision(3) + "%";
}
return parseInt(String(affix.PropValue));
}catch (e) {
console.log(e);
return parseInt(String(affix.PropValue));
if (affix.propType.indexOf("PERCENT") !== -1 || affix.propType.indexOf("CRITICAL") !== -1 || affix.propType.indexOf("EFFICIENCY") !== -1 || affix.propType.indexOf("HURT") !== -1) {
return parseFloat(String(affix.propValue*100)).toPrecision(3) + "%";
}
return parseInt(String(affix.propValue));
};
const handleGeneratedArtifact = () => {
@ -158,7 +153,7 @@ export default function Artifacts() {
aria-label="Artifact Main Stats" id="ArtifactMainStats"
className="block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm border-gray-300 rounded-md"
options={reliquaryMains}
getOptionLabel={(option) => option.PropType}
getOptionLabel={(option) => option.propType}
onChange={handleMainStatChange}
renderInput={(params) => <TextField {...params} label="Main Stats" variant="outlined"/>}
/>
@ -175,9 +170,9 @@ export default function Artifacts() {
{reliquaryAffixes.map((affix, index) => {
return (
<div key={index} className="flex">
<input type="checkbox" className="mr-4 ml-4 focus:ring-indigo-500 h-4 w-4 mt-1 text-indigo-600 border-gray-300 rounded" value={affix.Id} id={"select-"+affix.Id} onChange={(e)=>handleAffixSelected(e,false,0)}/>
<label className="flex-grow" htmlFor={"select-"+affix.Id}>{affix.PropType +" - "+getPercent(affix)}</label>
<input type="number" defaultValue="1" min="1" className="flex-none block shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm border-gray-300 rounded-md" onChange={(e)=>handleAffixSelected(e,true, affix.Id)}/>
<input type="checkbox" className="mr-4 ml-4 focus:ring-indigo-500 h-4 w-4 mt-1 text-indigo-600 border-gray-300 rounded" value={affix.id} id={"select-"+affix.id} onChange={(e)=>handleAffixSelected(e,false,0)}/>
<label className="flex-grow" htmlFor={"select-"+affix.id}>{affix.propType +" - "+getPercent(affix)}</label>
<input type="number" defaultValue="1" min="1" className="flex-none block shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm border-gray-300 rounded-md" onChange={(e)=>handleAffixSelected(e,true, affix.id)}/>
</div>
);
})}

20
src/components/providers/ReliquaryDataProvider.ts
View File

@ -1,15 +1,15 @@
export interface IReliquaryMain {
Id: number;
PropDepotId: number;
PropType:string;
AffixName:string;
id: number;
propDepotId: number;
propType:string;
affixName:string;
}
export interface IReliquaryAffix {
Id: number;
DepotId: number;
GroupId: number;
PropType:string;
PropValue:number;
id: number;
depotId: number;
groupId: number;
propType:string;
propValue:number;
}
export default class ReliquaryDataProvider {
private static reliquaryMains:IReliquaryMain[] = [];
@ -25,7 +25,7 @@ export default class ReliquaryDataProvider {
let json:IReliquaryMain[] = await data.json();
this.reliquaryMains = [];
json.forEach(element => {
if (this.reliquaryMains.filter(x => x.PropType === element.PropType).length === 0)
if (this.reliquaryMains.filter(x => x.propType === element.propType).length === 0)
this.reliquaryMains.push(element)
});
}