edit game scene
Merge commit
Added water script asset