add two jewel type ,add some event
merge commit