deleted:    client/res/npc_1.png
	modified:   client/src/common/Dialog.js
	modified:   client/src/common/FriendList.js
	modified:   client/src/common/RadioButton.js
	modified:   client/src/core/Npc.js
	modified:   client/src/core/NpcDialog.js
	modified:   client/src/core/NpcFactory.js
	modified:   client/src/resource.js
	modified:   "docs/\346\270\270\346\210\217\347\225\214\351\235\2421.psd"
	client/res/npc/
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform

Conflicts:
	client/src/resource.js

	new file:   assets/2e0ff8f8/autocomplete/indicator.gif
	new file:   assets/2e0ff8f8/autocomplete/jquery.autocomplete.css
	new file:   assets/2e0ff8f8/jquery.ajaxqueue.js
	new file:   assets/2e0ff8f8/jquery.autocomplete.js
	new file:   assets/2e0ff8f8/jquery.ba-bbq.js
	new file:   assets/2e0ff8f8/jquery.bgiframe.js
	new file:   assets/2e0ff8f8/jquery.cookie.js
	new file:   assets/2e0ff8f8/jquery.history.js
	new file:   assets/2e0ff8f8/jquery.js
	new file:   assets/2e0ff8f8/jquery.maskedinput.js
	new file:   assets/2e0ff8f8/jquery.maskedinput.min.js
	new file:   assets/2e0ff8f8/jquery.metadata.js
	new file:   assets/2e0ff8f8/jquery.min.js
	new file:   assets/2e0ff8f8/jquery.multifile.js
	new file:   assets/2e0ff8f8/jquery.rating.js
	new file:   assets/2e0ff8f8/jquery.treeview.async.js
	new file:   assets/2e0ff8f8/jquery.treeview.edit.js
	new file:   assets/2e0ff8f8/jquery.treeview.js
	new file:   assets/2e0ff8f8/jquery.yii.js
	new file:   assets/2e0ff8f8/jquery.yiiactiveform.js
	new file:   assets/2e0ff8f8/jquery.yiitab.js
	new file:   assets/2e0ff8f8/jui/MIT-LICENSE.txt
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-icons_222222_256x240.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-icons_2e83ff_256x240.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-icons_454545_256x240.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-icons_888888_256x240.png
	new file:   assets/2e0ff8f8/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	new file:   assets/2e0ff8f8/jui/css/base/jquery-ui.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.accordion.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.autocomplete.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.button.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.core.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.datepicker.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.dialog.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.progressbar.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.resizable.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.selectable.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.slider.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.tabs.css
	new file:   assets/2e0ff8f8/jui/css/base/jquery.ui.theme.css
	new file:   assets/2e0ff8f8/jui/js/jquery-ui-i18n.min.js
	new file:   assets/2e0ff8f8/jui/js/jquery-ui.min.js
	new file:   assets/2e0ff8f8/rating/delete.gif
	new file:   assets/2e0ff8f8/rating/jquery.rating.css
	new file:   assets/2e0ff8f8/rating/star.gif
	new file:   assets/2e0ff8f8/treeview/images/ajax-loader.gif
	new file:   assets/2e0ff8f8/treeview/images/file.gif
	new file:   assets/2e0ff8f8/treeview/images/folder-closed.gif
	new file:   assets/2e0ff8f8/treeview/images/folder.gif
	new file:   assets/2e0ff8f8/treeview/images/minus.gif
	new file:   assets/2e0ff8f8/treeview/images/plus.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-black-line.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-black.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-default-line.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-default.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-famfamfam-line.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-famfamfam.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-gray-line.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-gray.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-red-line.gif
	new file:   assets/2e0ff8f8/treeview/images/treeview-red.gif
	new file:   assets/2e0ff8f8/treeview/jquery.treeview.css
	new file:   assets/2e0ff8f8/yiitab/jquery.yiitab.css
	new file:   assets/afc2bf63/pager.css
	new file:   assets/d6213649/detailview/styles.css
	new file:   assets/d6213649/gridview/bg.gif
	new file:   assets/d6213649/gridview/delete.png
	new file:   assets/d6213649/gridview/down.gif
	new file:   assets/d6213649/gridview/jquery.yiigridview.js
	new file:   assets/d6213649/gridview/loading.gif
	new file:   assets/d6213649/gridview/styles.css
	new file:   assets/d6213649/gridview/up.gif
	new file:   assets/d6213649/gridview/update.png
	new file:   assets/d6213649/gridview/view.png
	new file:   assets/d6213649/listview/down.gif
	new file:   assets/d6213649/listview/jquery.yiilistview.js
	new file:   assets/d6213649/listview/loading.gif
	new file:   assets/d6213649/listview/styles.css
	new file:   assets/d6213649/listview/up.gif
	new file:   assets/e0c778c6/autocomplete/indicator.gif
	new file:   assets/e0c778c6/autocomplete/jquery.autocomplete.css
	new file:   assets/e0c778c6/jquery.ajaxqueue.js
	new file:   assets/e0c778c6/jquery.autocomplete.js
	new file:   assets/e0c778c6/jquery.ba-bbq.js
	new file:   assets/e0c778c6/jquery.bgiframe.js
	new file:   assets/e0c778c6/jquery.cookie.js
	new file:   assets/e0c778c6/jquery.history.js
	new file:   assets/e0c778c6/jquery.js
	new file:   assets/e0c778c6/jquery.maskedinput.js
	new file:   assets/e0c778c6/jquery.maskedinput.min.js
	new file:   assets/e0c778c6/jquery.metadata.js
	new file:   assets/e0c778c6/jquery.min.js
	new file:   assets/e0c778c6/jquery.multifile.js
	new file:   assets/e0c778c6/jquery.rating.js
	new file:   assets/e0c778c6/jquery.treeview.async.js
	new file:   assets/e0c778c6/jquery.treeview.edit.js
	new file:   assets/e0c778c6/jquery.treeview.js
	new file:   assets/e0c778c6/jquery.yii.js
	new file:   assets/e0c778c6/jquery.yiiactiveform.js
	new file:   assets/e0c778c6/jquery.yiitab.js
	new file:   assets/e0c778c6/jui/MIT-LICENSE.txt
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_flat_75_ffffff_40x100.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_glass_65_ffffff_1x400.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_glass_75_dadada_1x400.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_glass_95_fef1ec_1x400.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-icons_222222_256x240.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-icons_2e83ff_256x240.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-icons_454545_256x240.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-icons_888888_256x240.png
	new file:   assets/e0c778c6/jui/css/base/images/ui-icons_cd0a0a_256x240.png
	new file:   assets/e0c778c6/jui/css/base/jquery-ui.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.accordion.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.autocomplete.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.button.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.core.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.datepicker.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.dialog.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.progressbar.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.resizable.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.selectable.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.slider.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.tabs.css
	new file:   assets/e0c778c6/jui/css/base/jquery.ui.theme.css
	new file:   assets/e0c778c6/jui/js/jquery-ui-i18n.min.js
	new file:   assets/e0c778c6/jui/js/jquery-ui.min.js
	new file:   assets/e0c778c6/rating/delete.gif
	new file:   assets/e0c778c6/rating/jquery.rating.css
	new file:   assets/e0c778c6/rating/star.gif
	new file:   assets/e0c778c6/treeview/images/ajax-loader.gif
	new file:   assets/e0c778c6/treeview/images/file.gif
	new file:   assets/e0c778c6/treeview/images/folder-closed.gif
	new file:   assets/e0c778c6/treeview/images/folder.gif
	new file:   assets/e0c778c6/treeview/images/minus.gif
	new file:   assets/e0c778c6/treeview/images/plus.gif
	new file:   assets/e0c778c6/treeview/images/treeview-black-line.gif
	new file:   assets/e0c778c6/treeview/images/treeview-black.gif
	new file:   assets/e0c778c6/treeview/images/treeview-default-line.gif
	new file:   assets/e0c778c6/treeview/images/treeview-default.gif
	new file:   assets/e0c778c6/treeview/images/treeview-famfamfam-line.gif
	new file:   assets/e0c778c6/treeview/images/treeview-famfamfam.gif
	new file:   assets/e0c778c6/treeview/images/treeview-gray-line.gif
	new file:   assets/e0c778c6/treeview/images/treeview-gray.gif
	new file:   assets/e0c778c6/treeview/images/treeview-red-line.gif
	new file:   assets/e0c778c6/treeview/images/treeview-red.gif
	new file:   assets/e0c778c6/treeview/jquery.treeview.css
	new file:   assets/e0c778c6/yiitab/jquery.yiitab.css
	new file:   client/res/heroFrames.png
	new file:   "client/res/heroFrames\345\244\207\347\224\2501.png"
	new file:   "client/res/heroFrames\345\244\207\347\224\2502.png"
	deleted:    client/res/huan.png
	deleted:    client/res/map/edgeBgtmp.png
	modified:   client/res/map/map1.tmx
	modified:   client/res/map/map1_s.png
	modified:   client/res/map/map2.tmx
	new file:   client/res/map/map2_s.png
	modified:   client/res/map/map3.tmx
	modified:   client/res/map/map3_s.png
	new file:   client/res/process_bg.png
	modified:   client/src/common/Dialog.js
	modified:   client/src/common/Tools.js
	modified:   client/src/config/global.js
	modified:   client/src/config/mapConfig.js
	modified:   client/src/core/ChildScene.js
	modified:   client/src/core/Hero.js
	modified:   client/src/core/HeroPanel.js
	modified:   client/src/core/Map.js
	modified:   client/src/core/Mediator.js
	modified:   client/src/resource.js

	client/res/npc/
	modified:   client/src/core/ChildScene.js
	modified:   client/src/core/Hero.js
	modified:   client/src/core/Map.js
	modified:   client/src/core/Mediator.js
	modified:   client/src/core/UserContral.js
	modified:   client/src/resource.js
	client/res/npc/