diff --git a/packages/web/src/blocks.ts b/packages/web/src/blocks.ts index 6508319..8a91042 100644 --- a/packages/web/src/blocks.ts +++ b/packages/web/src/blocks.ts @@ -132,8 +132,12 @@ Blockly.JavaScript[GET_PROPERTY_OF_FIGHTER] = (block: Blockly.Block) => [ block, OBJECT, Blockly.JavaScript.ORDER_MEMBER - )}.${block.getFieldValue(PROPERTY_NAME)}`, - Blockly.JavaScript.ORDER_MEMBER, + )}.${block.getFieldValue(PROPERTY_NAME)} ? ${Blockly.JavaScript.valueToCode( + block, + OBJECT, + Blockly.JavaScript.ORDER_MEMBER + )}.${block.getFieldValue(PROPERTY_NAME)} : 0`, + Blockly.JavaScript.ORDER_CONDITIONAL, ]; // 意思決定 @@ -488,7 +492,7 @@ Blockly.Blocks[CONSOLE_LOG] = { this.appendValueInput(VALUE).appendField("console.log"); this.setPreviousStatement(true); this.setNextStatement(true); - this.setColour(0); + this.setColour(160); }, }; Blockly.JavaScript[CONSOLE_LOG] = (block: Blockly.Block) => diff --git a/packages/web/src/component/Arena.tsx b/packages/web/src/component/Arena.tsx index 4194c6c..bd44b75 100644 --- a/packages/web/src/component/Arena.tsx +++ b/packages/web/src/component/Arena.tsx @@ -124,6 +124,7 @@ export default function Arena(props: ArenaProps) { const [open, setOpen] = useState(false); const [errorMessage, setErrorMessage] = useState(" "); const [name, setName] = useState(""); + const [uploaded, setUploaded] = useState(false); const { password } = useApiPasswordContext(); if (!password) throw new Error("Missing password"); @@ -143,6 +144,7 @@ export default function Arena(props: ArenaProps) { }, password ); + setUploaded(true); }; const handleClickOpen = () => { @@ -266,6 +268,16 @@ export default function Arena(props: ArenaProps) { name={name} setName={setName} /> + {uploaded && ( + { + setUploaded(false); + }} + > + アップロードしました + + )} ); } diff --git a/packages/web/src/component/TestPlay.tsx b/packages/web/src/component/TestPlay.tsx index 95ffadf..efd9dc5 100644 --- a/packages/web/src/component/TestPlay.tsx +++ b/packages/web/src/component/TestPlay.tsx @@ -423,7 +423,7 @@ export default function TestPlay(props: TestPlayProps) { setSubmitted(false); }} > - {currentUser.program} + 反映しました )}