Merge feature/add_skin into master: resolve all conflicts
- GameGlobal.js: keep upstream SERVER_URL with /ws suffix - en.js/zh.js: merge both settings.nickname and settings.profile keys - SettingsScene.js: keep both nickname row and profile button - server/index.js: merge express app + content security proxy with noServer WebSocket mode and path validation - Add .gitignore for node_modules and .codebuddy
This commit is contained in:
@@ -172,6 +172,8 @@ const SCENE = {
|
||||
TEAM_ROOM: 'team_room',
|
||||
TEAM_GAME: 'team_game',
|
||||
TEAM_RESULT: 'team_result',
|
||||
PROFILE: 'profile',
|
||||
CHAT_ROOM: 'chat_room',
|
||||
};
|
||||
|
||||
// ============================================================
|
||||
|
||||
Reference in New Issue
Block a user