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:
@@ -30,6 +30,8 @@ module.exports = {
|
||||
'menu.skin': 'Skins',
|
||||
'menu.ranking': 'Ranking',
|
||||
'menu.settings': 'Settings',
|
||||
'menu.profile': 'Profile',
|
||||
'menu.chat': 'Chat',
|
||||
|
||||
// ============================================================
|
||||
// Room Scene (PVP)
|
||||
@@ -207,6 +209,7 @@ module.exports = {
|
||||
'settings.music': 'Music',
|
||||
'settings.vibration': 'Vibration',
|
||||
'settings.nickname': 'Display Name',
|
||||
'settings.profile': 'Profile',
|
||||
|
||||
// ============================================================
|
||||
// Shop Scene (Simplified)
|
||||
@@ -226,6 +229,44 @@ module.exports = {
|
||||
|
||||
|
||||
|
||||
// ============================================================
|
||||
// Profile Scene
|
||||
// ============================================================
|
||||
'profile.title': 'Profile',
|
||||
'profile.nickname': 'Nickname',
|
||||
'profile.signature': 'Signature',
|
||||
'profile.description': 'Space Description',
|
||||
'profile.changeAvatar': 'Change Avatar',
|
||||
'profile.tapToEdit': 'Tap to edit',
|
||||
'profile.save': 'Save',
|
||||
|
||||
// ============================================================
|
||||
// Chat Room Scene
|
||||
// ============================================================
|
||||
'chat.title': 'Chat Room',
|
||||
'chat.inputPlaceholder': 'Type a message...',
|
||||
'chat.send': 'Send',
|
||||
'chat.reportTitle': 'Report',
|
||||
'chat.reportPolitics': 'Harmful politics',
|
||||
'chat.reportPornography': 'Pornography',
|
||||
'chat.reportGambling': 'Gambling & fraud',
|
||||
'chat.reportOther': 'Other',
|
||||
'chat.reportCancel': 'Cancel',
|
||||
|
||||
// ============================================================
|
||||
// Content Security
|
||||
// ============================================================
|
||||
'contentSecurity.violation': 'Content contains prohibited information',
|
||||
'contentSecurity.nicknameViolation': 'Nickname contains prohibited content',
|
||||
'contentSecurity.chatViolation': 'Message failed: content violation',
|
||||
'contentSecurity.muted': 'You cannot modify profile due to violation',
|
||||
'contentSecurity.mutedChat': 'You are muted, remaining: {time}',
|
||||
'contentSecurity.imageViolation': 'Image contains prohibited content',
|
||||
'contentSecurity.checking': 'Checking...',
|
||||
'contentSecurity.timeout': 'Check timeout, please retry',
|
||||
'contentSecurity.reportSuccess': 'Report submitted',
|
||||
'contentSecurity.reportFail': 'Report failed',
|
||||
|
||||
// ============================================================
|
||||
// Ad System
|
||||
// ============================================================
|
||||
|
||||
Reference in New Issue
Block a user