Permalink
Browse files

Merge branch 'master' of github.com:NetEase/lordofpomelo

Conflicts:
	.gitignore
	README.md
	game-server/app/consts/consts.js
	game-server/app/consts/formula.js
	game-server/app/dao/userDao.js
	game-server/app/domain/action/revive.js
	game-server/app/domain/area/area.js
	game-server/app/domain/bag.js
	game-server/app/domain/entity/character.js
	game-server/app/domain/entity/mob.js
	game-server/app/domain/entity/player.js
	game-server/app/domain/event/npcEvent.js
	game-server/app/domain/map/map.js
	game-server/app/domain/messageService.js
	game-server/app/servers/area/handler/fightHandler.js
	game-server/app/servers/area/handler/playerHandler.js
	game-server/app/util/dataApi.js
	game-server/app/util/dispatcher.js
	game-server/config/data/area.json
	game-server/config/data/character.json
	game-server/config/data/equipment.json
	game-server/config/data/fightskill.json
	game-server/config/data/item.json
	game-server/config/data/npc.json
	game-server/config/data/talk.json
	game-server/config/data/task.json
	game-server/package.json
	shared/config/mysql.json
	web-server/public/css/client.css
	web-server/public/image/rolelst.png
	web-server/public/index.html
	web-server/public/js/app.js
	web-server/public/js/config/config.js
	web-server/public/js/config/consts.js
	web-server/public/js/handler/gameMsgHandler.js
	web-server/public/js/lib/colorbox/frameanimation.js
	web-server/public/js/lib/colorbox/tiled_map.js
	web-server/public/js/lib/colorbox/view.js
	web-server/public/js/lib/colorbox/view/honestview.js
	web-server/public/js/model/animation.js
	web-server/public/js/model/area.js
	web-server/public/js/model/character.js
	web-server/public/js/model/sprite.js
	web-server/public/js/ui/bagPanelView.js
	web-server/public/js/ui/dialogPanelView.js
	web-server/public/js/ui/equipmentsPanelView.js
	web-server/public/js/ui/heroSelectView.js
	web-server/public/js/ui/mainPanelView.js
	web-server/public/js/ui/playerPanelView.js
	web-server/public/js/utils/pool/objectPoolFactory.js
	web-server/public/js/utils/resourceLoader.js
	web-server/public/js/utils/utils.js
  • Loading branch information...
xiecc committed Nov 30, 2012
2 parents 108eb81 + 2bb768b commit a1ad545ac48745343f5978185799297a502f9fc1
Showing with 12 additions and 17 deletions.
  1. +3 −11 .gitignore
  2. +8 −3 .jshintrc
  3. +0 −1 start-game.sh
  4. +0 −1 start-web.sh
  5. +1 −1 web-server/public/js/ui/chat.js
View
@@ -1,17 +1,9 @@
.project
-logs/*
-logs/tmp
*.log
-logs/*
*/node-log.log
-/game-server/logs/*
+logs/*.log
!.gitignore
-/web-server/logs/*
-!.gitignore
-/node_modules/*
-/game-server/node_modules/*
-/web-server/node_modules/*
-/shared/node_modules/*
+node_modules/*
.project
.settings/
**/*.svn
@@ -20,4 +12,4 @@ logs/*
*.sublime-workspace
*.swp
.DS_Store
-.idea
+.idea
View
@@ -5,8 +5,11 @@
"before",
"after",
"window",
- "__resources__"
- ],
+ "__resources__",
+ "$",
+ "alert"
+ ],
+ "browser": true,
"es5": true,
"node": true,
"eqeqeq": true,
@@ -16,5 +19,7 @@
"immed": false,
"newcap": true,
"nonew": true,
- "white": false
+ "white": false,
+ "smarttabs": true,
+ "multistr": true
}
View
@@ -1 +0,0 @@
-pomelo start
View
@@ -1 +0,0 @@
-cd web-server && node app.js
@@ -99,7 +99,7 @@ __resources__["/chat.js"] = {meta: {mimetype: "application/javascript"}, data: f
if (data.code === 3004) {
alert(' user is offline ');
} else {
- alert(' things go bad ');
+ // may be some thing error in channel push
}
return;
} else {

0 comments on commit a1ad545

Please sign in to comment.