Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ef0ca99c6 | |||
| 6f8c75c65e | |||
| 45bab7ff78 | |||
| d14b191b28 | |||
| 1c88a8ba86 | |||
| 02c2668378 | |||
| a64e380ce6 | |||
| afa7e65e4b | |||
| ea4ba45d5e | |||
| 09b7ea575b | |||
| 1d8ae8d4d9 | |||
| f363e89e3d | |||
| 6b7b480816 | |||
| 697c1de4fe | |||
| 2397dbfa4a | |||
| c864b65ef4 | |||
| fb992c7eb5 | |||
| c05c39ff36 | |||
| 8fcef8e720 | |||
| 845969297e | |||
| 5464b53f3f |
@@ -7,6 +7,7 @@
|
||||
"namespace": "android_app",
|
||||
"package_name": "kr.tkrmagid.tetrig",
|
||||
"sha256_cert_fingerprints": [
|
||||
"3F:0E:CE:74:23:FD:4D:09:F5:04:9C:5D:87:FE:CA:FB:BE:98:DE:17:70:C5:B3:D0:26:F0:28:04:38:92:5B:21",
|
||||
"A9:F1:B0:CB:B6:67:8A:BB:30:93:1D:01:C0:2A:B2:B6:A2:42:22:E0:90:38:C2:A9:1F:60:30:68:02:8F:DB:46"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -180,9 +180,11 @@ scripts/release.sh patch # 또는 minor / major
|
||||
|
||||
`index.html` 기반 PWA 는 그대로 유지한다 (아이폰 사용자용 / 데모).
|
||||
`dist/privacy.html` 은 개인정보처리방침이고 `/privacy` 로 서빙된다.
|
||||
`/r/<코드>` 는 커스텀 방 초대 링크 안내 페이지(`store/room.html`)다. 앱이 있으면 앱 링크로 바로 그 방에 들어가고,
|
||||
없으면 Play 스토어로 보낸다. 앱 링크 검증 파일은 `.well-known/assetlinks.json`.
|
||||
|
||||
```bash
|
||||
node build.js
|
||||
scripts/build-pages.sh # node build.js + dist/ 조립
|
||||
wrangler pages deploy dist --project-name tetrig --branch main
|
||||
```
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ kotlin {
|
||||
implementation(compose.ui)
|
||||
implementation(compose.components.resources)
|
||||
implementation(libs.androidx.lifecycle.viewmodel)
|
||||
implementation(libs.kotlinx.serialization.json)
|
||||
}
|
||||
commonTest.dependencies {
|
||||
implementation(libs.kotlin.test)
|
||||
@@ -41,6 +42,12 @@ kotlin {
|
||||
androidMain.dependencies {
|
||||
implementation(compose.preview)
|
||||
implementation(libs.androidx.activity.compose)
|
||||
implementation(libs.okhttp)
|
||||
implementation(libs.play.services.ads)
|
||||
implementation(libs.ump)
|
||||
// AdMob 미디에이션: AdMob 콘솔에서 미디에이션 그룹을 만들어야 실제로 입찰에 들어온다.
|
||||
implementation(libs.admob.applovin)
|
||||
implementation(libs.admob.pangle)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,6 +62,14 @@ android {
|
||||
targetSdk = 36
|
||||
versionCode = appVersionCode
|
||||
versionName = appVersionName
|
||||
|
||||
// AdMob — 기본값은 Google 공식 테스트 ID. 실제 ID 는 gradle.properties 의 admob* 값만 바꾸면 된다.
|
||||
fun prop(k: String, d: String) = (findProperty(k) as String?)?.takeIf { it.isNotBlank() } ?: d
|
||||
manifestPlaceholders["admobAppId"] = prop("admobAppId", "ca-app-pub-3940256099942544~3347511713")
|
||||
resValue("string", "admob_banner", prop("admobBanner", "ca-app-pub-3940256099942544/9214589741"))
|
||||
resValue("string", "admob_card", prop("admobCard", "ca-app-pub-3940256099942544/6300978111"))
|
||||
resValue("string", "admob_interstitial", prop("admobInterstitial", "ca-app-pub-3940256099942544/1033173712"))
|
||||
resValue("string", "admob_rewarded", prop("admobRewarded", "ca-app-pub-3940256099942544/5224354917"))
|
||||
}
|
||||
|
||||
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
|
||||
<!-- 폴드/플립/태블릿 대응: 화면 크기가 자유롭게 바뀌어도 액티비티를 재시작하지 않는다. -->
|
||||
<supports-screens
|
||||
android:anyDensity="true"
|
||||
@@ -19,6 +22,10 @@
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Tetrig">
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.ads.APPLICATION_ID"
|
||||
android:value="${admobAppId}" />
|
||||
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden|density|uiMode|layoutDirection|navigation"
|
||||
@@ -31,6 +38,24 @@
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<!-- 커스텀 방 초대 링크 https://tetrig.pages.dev/r/CODE (assetlinks.json 으로 검증) -->
|
||||
<intent-filter android:autoVerify="true">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="https" android:host="tetrig.pages.dev" android:pathPrefix="/r/" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<!-- 결과 이미지 공유용 (cache/share 만 노출) -->
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="${applicationId}.share"
|
||||
android:exported="false"
|
||||
android:grantUriPermissions="true">
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/share_paths" />
|
||||
</provider>
|
||||
</application>
|
||||
</manifest>
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
package kr.tkrmagid.tetrig
|
||||
|
||||
import android.app.Application
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import kr.tkrmagid.tetrig.ads.AdsAndroid
|
||||
import kr.tkrmagid.tetrig.data.AndroidStoreHolder
|
||||
import kr.tkrmagid.tetrig.i18n.I18n
|
||||
import kr.tkrmagid.tetrig.share.DeepLink
|
||||
import kr.tkrmagid.tetrig.share.ShareAndroid
|
||||
import kr.tkrmagid.tetrig.ui.App
|
||||
|
||||
class TetrigApp : Application() {
|
||||
@@ -19,7 +24,24 @@ class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
enableEdgeToEdge()
|
||||
super.onCreate(savedInstanceState)
|
||||
// 화면 언어 = 기기 언어. 언어를 바꾸면 Android 가 Activity 를 다시 만들어 여기서 다시 고른다.
|
||||
resources.configuration.locales[0].let { I18n.select(it.language, it.script, it.country) }
|
||||
AndroidStoreHolder.init(this)
|
||||
ShareAndroid.activity = this
|
||||
AdsAndroid.start(this)
|
||||
if (savedInstanceState == null) handleLink(intent)
|
||||
setContent { App() }
|
||||
}
|
||||
|
||||
// launchMode=singleTop: 앱이 떠 있을 때 초대 링크를 누르면 여기로 온다.
|
||||
override fun onNewIntent(intent: Intent) {
|
||||
super.onNewIntent(intent)
|
||||
setIntent(intent)
|
||||
handleLink(intent)
|
||||
}
|
||||
|
||||
private fun handleLink(intent: Intent?) {
|
||||
if (intent?.action != Intent.ACTION_VIEW) return
|
||||
DeepLink.roomFromPath(intent.data?.path)?.let { DeepLink.pendingRoom = it }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,261 @@
|
||||
package kr.tkrmagid.tetrig.ads
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
import android.util.Log
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.viewinterop.AndroidView
|
||||
import com.google.android.gms.ads.AdListener
|
||||
import com.google.android.gms.ads.AdRequest
|
||||
import com.google.android.gms.ads.AdSize
|
||||
import com.google.android.gms.ads.AdView
|
||||
import com.google.android.gms.ads.FullScreenContentCallback
|
||||
import com.google.android.gms.ads.LoadAdError
|
||||
import com.google.android.gms.ads.MobileAds
|
||||
import com.google.android.gms.ads.interstitial.InterstitialAd
|
||||
import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
|
||||
import com.google.android.ump.ConsentInformation
|
||||
import com.google.android.ump.ConsentRequestParameters
|
||||
import com.google.android.ump.UserMessagingPlatform
|
||||
import com.google.android.gms.ads.rewarded.RewardedAd
|
||||
import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback
|
||||
import kr.tkrmagid.tetrig.R
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
|
||||
private const val TAG = "TetrigAds"
|
||||
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
object AdsAndroid {
|
||||
var activity: Activity? = null
|
||||
private val started = AtomicBoolean(false)
|
||||
/** 동의 확인 + SDK 초기화가 끝나야 광고를 요청한다 (Compose 가 관찰). */
|
||||
var ready by mutableStateOf(false)
|
||||
private set
|
||||
private var interstitial: InterstitialAd? = null
|
||||
private var rewarded: RewardedAd? = null
|
||||
/** 보상형 광고가 로드돼 있는지 (Compose 가 관찰). */
|
||||
var rewardedReady by mutableStateOf(false)
|
||||
private set
|
||||
private var rewardedLoading = false
|
||||
/** GDPR 지역 등에서 동의를 다시 고칠 수 있는 진입점이 필요한지 (Compose 가 관찰). */
|
||||
var privacyRequired by mutableStateOf(false)
|
||||
private set
|
||||
|
||||
/**
|
||||
* UMP 동의(유럽·영국 등 필요한 지역에서만 팝업) → MobileAds 초기화 → 전면 광고 선로드.
|
||||
* 동의 결과와 무관하게 canRequestAds() 가 true 일 때만 광고를 요청한다.
|
||||
*/
|
||||
fun start(act: Activity) {
|
||||
activity = act
|
||||
val consent = UserMessagingPlatform.getConsentInformation(act)
|
||||
consent.requestConsentInfoUpdate(
|
||||
act, ConsentRequestParameters.Builder().build(),
|
||||
{
|
||||
UserMessagingPlatform.loadAndShowConsentFormIfRequired(act) { err ->
|
||||
if (err != null) Log.w(TAG, "consent form: ${err.message}")
|
||||
updatePrivacyRequired(consent)
|
||||
if (consent.canRequestAds()) init(act)
|
||||
}
|
||||
},
|
||||
{ err -> Log.w(TAG, "consent update: ${err.message}"); if (consent.canRequestAds()) init(act) },
|
||||
)
|
||||
if (consent.canRequestAds()) init(act)
|
||||
}
|
||||
|
||||
private fun updatePrivacyRequired(consent: ConsentInformation) {
|
||||
privacyRequired = consent.privacyOptionsRequirementStatus ==
|
||||
ConsentInformation.PrivacyOptionsRequirementStatus.REQUIRED
|
||||
Log.i(TAG, "consent status=${consent.consentStatus} privacyOptions=${consent.privacyOptionsRequirementStatus}")
|
||||
}
|
||||
|
||||
/** 설정 화면의 "광고 개인정보 설정": 동의 양식을 다시 띄워 선택을 바꿀 수 있게 한다. */
|
||||
fun showPrivacyOptions() {
|
||||
val act = activity ?: return
|
||||
UserMessagingPlatform.showPrivacyOptionsForm(act) { err ->
|
||||
if (err != null) Log.w(TAG, "privacy options: ${err.message}")
|
||||
val consent = UserMessagingPlatform.getConsentInformation(act)
|
||||
updatePrivacyRequired(consent)
|
||||
if (consent.canRequestAds()) init(act)
|
||||
}
|
||||
}
|
||||
|
||||
private fun init(act: Activity) {
|
||||
if (!started.compareAndSet(false, true)) return
|
||||
MobileAds.initialize(act.applicationContext) {
|
||||
ready = true
|
||||
Log.i(TAG, "MobileAds ready")
|
||||
loadInterstitial()
|
||||
loadRewarded()
|
||||
}
|
||||
}
|
||||
|
||||
fun loadInterstitial() {
|
||||
val act = activity ?: return
|
||||
if (!ready || interstitial != null) return
|
||||
InterstitialAd.load(act, act.getString(R.string.admob_interstitial), AdRequest.Builder().build(),
|
||||
object : InterstitialAdLoadCallback() {
|
||||
override fun onAdLoaded(ad: InterstitialAd) {
|
||||
interstitial = ad
|
||||
Log.i(TAG, "interstitial loaded")
|
||||
}
|
||||
override fun onAdFailedToLoad(e: LoadAdError) {
|
||||
Log.w(TAG, "interstitial failed code=${e.code}: ${e.message}")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun show(then: () -> Unit) {
|
||||
val act = activity
|
||||
val ad = interstitial
|
||||
if (act == null || ad == null) {
|
||||
Log.i(TAG, "interstitial skipped (not loaded)")
|
||||
then()
|
||||
loadInterstitial()
|
||||
return
|
||||
}
|
||||
interstitial = null
|
||||
ad.fullScreenContentCallback = object : FullScreenContentCallback() {
|
||||
override fun onAdDismissedFullScreenContent() {
|
||||
Log.i(TAG, "interstitial dismissed")
|
||||
then()
|
||||
loadInterstitial()
|
||||
}
|
||||
override fun onAdFailedToShowFullScreenContent(e: com.google.android.gms.ads.AdError) {
|
||||
then()
|
||||
loadInterstitial()
|
||||
}
|
||||
}
|
||||
Log.i(TAG, "interstitial show")
|
||||
ad.show(act)
|
||||
}
|
||||
|
||||
fun loadRewarded() {
|
||||
val act = activity ?: return
|
||||
if (!ready || rewarded != null || rewardedLoading) return
|
||||
rewardedLoading = true
|
||||
RewardedAd.load(act, act.getString(R.string.admob_rewarded), AdRequest.Builder().build(),
|
||||
object : RewardedAdLoadCallback() {
|
||||
override fun onAdLoaded(ad: RewardedAd) {
|
||||
rewarded = ad
|
||||
rewardedLoading = false
|
||||
rewardedReady = true
|
||||
Log.i(TAG, "rewarded loaded")
|
||||
}
|
||||
override fun onAdFailedToLoad(e: LoadAdError) {
|
||||
rewardedLoading = false
|
||||
Log.w(TAG, "rewarded failed code=${e.code}: ${e.message}")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/** 끝까지 봐서 onUserEarnedReward 가 불렸을 때만 earned = true. 결과는 광고가 닫힌 뒤 한 번 알린다. */
|
||||
fun showRewarded(onResult: (Boolean) -> Unit) {
|
||||
val act = activity
|
||||
val ad = rewarded
|
||||
if (act == null || ad == null) {
|
||||
onResult(false)
|
||||
loadRewarded()
|
||||
return
|
||||
}
|
||||
rewarded = null
|
||||
rewardedReady = false
|
||||
var earned = false
|
||||
ad.fullScreenContentCallback = object : FullScreenContentCallback() {
|
||||
override fun onAdDismissedFullScreenContent() {
|
||||
Log.i(TAG, "rewarded dismissed earned=$earned")
|
||||
onResult(earned)
|
||||
loadRewarded()
|
||||
}
|
||||
override fun onAdFailedToShowFullScreenContent(e: com.google.android.gms.ads.AdError) {
|
||||
Log.w(TAG, "rewarded show failed: ${e.message}")
|
||||
onResult(false)
|
||||
loadRewarded()
|
||||
}
|
||||
}
|
||||
Log.i(TAG, "rewarded show")
|
||||
ad.show(act) { item ->
|
||||
Log.i(TAG, "rewarded earned ${item.amount} ${item.type}")
|
||||
earned = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
actual fun showInterstitial(then: () -> Unit) = AdsAndroid.show(then)
|
||||
|
||||
actual fun privacyOptionsRequired(): Boolean = AdsAndroid.privacyRequired
|
||||
|
||||
actual fun showPrivacyOptions() = AdsAndroid.showPrivacyOptions()
|
||||
|
||||
actual fun rewardedAvailable(): Boolean = AdsAndroid.rewardedReady
|
||||
|
||||
actual fun showRewarded(onResult: (earned: Boolean) -> Unit) = AdsAndroid.showRewarded(onResult)
|
||||
|
||||
@Composable
|
||||
actual fun AdBanner(modifier: Modifier) {
|
||||
val widthDp = LocalConfiguration.current.screenWidthDp
|
||||
// 광고를 못 받으면(계정 승인 전·no fill 등) 자리를 아예 없앤다.
|
||||
var failed by remember { mutableStateOf(false) }
|
||||
if (failed) return
|
||||
if (!AdsAndroid.ready) {
|
||||
Box(modifier.fillMaxWidth().height(50.dp))
|
||||
return
|
||||
}
|
||||
AndroidView(
|
||||
modifier = modifier.fillMaxWidth(),
|
||||
factory = { ctx ->
|
||||
AdView(ctx).apply {
|
||||
adUnitId = ctx.getString(R.string.admob_banner)
|
||||
setAdSize(AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(ctx, widthDp))
|
||||
adListener = object : AdListener() {
|
||||
override fun onAdLoaded() { Log.i(TAG, "banner loaded") }
|
||||
override fun onAdFailedToLoad(e: LoadAdError) {
|
||||
Log.w(TAG, "banner failed code=${e.code}: ${e.message}")
|
||||
failed = true
|
||||
}
|
||||
}
|
||||
loadAd(AdRequest.Builder().build())
|
||||
}
|
||||
},
|
||||
onRelease = { it.destroy() },
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
actual fun AdCard(modifier: Modifier) {
|
||||
// 실패하면 300×250 빈 상자를 남기지 않고 접는다.
|
||||
var failed by remember { mutableStateOf(false) }
|
||||
if (failed) return
|
||||
if (!AdsAndroid.ready) {
|
||||
Box(modifier.size(300.dp, 250.dp))
|
||||
return
|
||||
}
|
||||
AndroidView(
|
||||
modifier = modifier.size(300.dp, 250.dp),
|
||||
factory = { ctx ->
|
||||
AdView(ctx).apply {
|
||||
adUnitId = ctx.getString(R.string.admob_card)
|
||||
setAdSize(AdSize.MEDIUM_RECTANGLE)
|
||||
adListener = object : AdListener() {
|
||||
override fun onAdLoaded() { Log.i(TAG, "card loaded") }
|
||||
override fun onAdFailedToLoad(e: LoadAdError) {
|
||||
Log.w(TAG, "card failed code=${e.code}: ${e.message}")
|
||||
failed = true
|
||||
}
|
||||
}
|
||||
loadAd(AdRequest.Builder().build())
|
||||
}
|
||||
},
|
||||
onRelease = { it.destroy() },
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package kr.tkrmagid.tetrig.net
|
||||
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.Request
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import okhttp3.Response
|
||||
import okhttp3.WebSocket
|
||||
import okhttp3.WebSocketListener
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
private val client = OkHttpClient.Builder()
|
||||
.connectTimeout(10, TimeUnit.SECONDS)
|
||||
.readTimeout(15, TimeUnit.SECONDS)
|
||||
// 프로토콜 ping 은 쓰지 않는다: 하이버네이션 DO 가 pong 을 늦게/안 줘서 OkHttp 가 연결을 끊었다.
|
||||
// 대신 앱 레벨 {"t":"ping"} keepalive (서버 auto-response) 를 RoomClient/QueueClient 가 보낸다.
|
||||
.build()
|
||||
|
||||
private val JSON = "application/json; charset=utf-8".toMediaType()
|
||||
|
||||
actual suspend fun httpRequest(method: String, url: String, body: String?, token: String?): HttpResult =
|
||||
withContext(Dispatchers.IO) {
|
||||
val b = Request.Builder().url(url)
|
||||
if (token != null) b.header("Authorization", "Bearer $token")
|
||||
when (method) {
|
||||
"GET" -> b.get()
|
||||
else -> b.method(method, (body ?: "{}").toRequestBody(JSON))
|
||||
}
|
||||
try {
|
||||
client.newCall(b.build()).execute().use { HttpResult(it.code, it.body?.string() ?: "") }
|
||||
} catch (e: Exception) {
|
||||
HttpResult(0, "")
|
||||
}
|
||||
}
|
||||
|
||||
actual fun openSocket(url: String, listener: SocketListener): PlatformSocket {
|
||||
var closed = false
|
||||
val ws = client.newWebSocket(Request.Builder().url(url).build(), object : WebSocketListener() {
|
||||
override fun onOpen(webSocket: WebSocket, response: Response) = listener.onOpen()
|
||||
override fun onMessage(webSocket: WebSocket, text: String) = listener.onMessage(text)
|
||||
override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
|
||||
webSocket.close(1000, null)
|
||||
}
|
||||
override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
|
||||
if (!closed) { closed = true; listener.onClosed(code, reason) }
|
||||
}
|
||||
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
|
||||
android.util.Log.w("TetrigNet", "ws failure ${response?.code}: ${t.javaClass.simpleName} ${t.message}")
|
||||
if (!closed) { closed = true; listener.onClosed(response?.code ?: 0, t.message ?: "연결 실패") }
|
||||
}
|
||||
})
|
||||
return object : PlatformSocket {
|
||||
override fun send(text: String): Boolean = ws.send(text)
|
||||
override fun close() {
|
||||
ws.close(1000, "bye")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
actual fun nowMs(): Long = System.currentTimeMillis()
|
||||
@@ -0,0 +1,115 @@
|
||||
package kr.tkrmagid.tetrig.share
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
import android.content.Intent
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.Paint
|
||||
import android.graphics.Path
|
||||
import android.graphics.Typeface
|
||||
import android.util.Log
|
||||
import androidx.core.content.FileProvider
|
||||
import java.io.File
|
||||
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
object ShareAndroid {
|
||||
var activity: Activity? = null
|
||||
}
|
||||
|
||||
actual fun shareText(text: String) {
|
||||
val act = ShareAndroid.activity ?: return
|
||||
val send = Intent(Intent.ACTION_SEND).apply {
|
||||
type = "text/plain"
|
||||
putExtra(Intent.EXTRA_TEXT, text)
|
||||
}
|
||||
act.startActivity(Intent.createChooser(send, S.share))
|
||||
}
|
||||
|
||||
actual fun shareCard(card: ShareCard) {
|
||||
val act = ShareAndroid.activity ?: return
|
||||
runCatching {
|
||||
val dir = File(act.cacheDir, "share").apply { mkdirs() }
|
||||
val file = File(dir, "tetrig-result.png")
|
||||
file.outputStream().use { renderCard(card).compress(Bitmap.CompressFormat.PNG, 100, it) }
|
||||
val uri = FileProvider.getUriForFile(act, "${act.packageName}.share", file)
|
||||
val send = Intent(Intent.ACTION_SEND).apply {
|
||||
type = "image/png"
|
||||
putExtra(Intent.EXTRA_STREAM, uri)
|
||||
putExtra(Intent.EXTRA_TEXT, "TETRIG ${card.mode} ${card.headline}\n$PLAY_URL")
|
||||
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
}
|
||||
act.startActivity(Intent.createChooser(send, S.shareResult))
|
||||
}.onFailure { Log.w("TetrigShare", "share failed", it) }
|
||||
}
|
||||
|
||||
// NEOBRUTAL 팔레트 (명세서 §13)
|
||||
private const val INK = 0xFF17161B.toInt()
|
||||
private const val BONE = 0xFFEDE7DA.toInt()
|
||||
private const val PAPER = 0xFFE1D9C7.toInt()
|
||||
private const val SAFETY = 0xFFFF4E11.toInt()
|
||||
private const val SUB = 0xFF6E6A5E.toInt()
|
||||
|
||||
/** 1080×1350 (인스타 세로 비율) 결과 카드. 플랫 도형 + 하드 섀도 + 우하단 챔퍼컷만 쓴다. */
|
||||
internal fun renderCard(card: ShareCard): Bitmap {
|
||||
val w = 1080
|
||||
val h = 1350
|
||||
val bmp = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
|
||||
val c = Canvas(bmp)
|
||||
c.drawColor(BONE)
|
||||
val mono = Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL)
|
||||
val monoBold = Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)
|
||||
val disp = Typeface.create(Typeface.MONOSPACE, Typeface.BOLD_ITALIC)
|
||||
fun paint(color: Int, size: Float, tf: Typeface = mono) = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
||||
this.color = color; textSize = size; typeface = tf
|
||||
}
|
||||
val fill = Paint(Paint.ANTI_ALIAS_FLAG)
|
||||
|
||||
// 로고
|
||||
val logoTet = paint(SAFETY, 112f, disp)
|
||||
val logoRig = paint(INK, 112f, disp)
|
||||
c.drawText("TET", 80f, 190f, logoTet)
|
||||
c.drawText("RIG", 80f + logoTet.measureText("TET"), 190f, logoRig)
|
||||
fill.color = INK
|
||||
c.drawRect(80f, 215f, 520f, 245f, fill)
|
||||
|
||||
// 카드 (하드 섀도 → 본체 → 테두리)
|
||||
val left = 80f
|
||||
val top = 320f
|
||||
val right = w - 80f
|
||||
val bottom = 1130f
|
||||
val cut = 70f
|
||||
fun cardPath(dx: Float, dy: Float) = Path().apply {
|
||||
moveTo(left + dx, top + dy)
|
||||
lineTo(right + dx, top + dy)
|
||||
lineTo(right + dx, bottom - cut + dy)
|
||||
lineTo(right - cut + dx, bottom + dy)
|
||||
lineTo(left + dx, bottom + dy)
|
||||
close()
|
||||
}
|
||||
fill.color = INK
|
||||
c.drawPath(cardPath(16f, 16f), fill)
|
||||
fill.color = PAPER
|
||||
c.drawPath(cardPath(0f, 0f), fill)
|
||||
val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = INK; style = Paint.Style.STROKE; strokeWidth = 8f }
|
||||
c.drawPath(cardPath(0f, 0f), stroke)
|
||||
fill.color = SAFETY
|
||||
c.drawRect(left + 4f, top + 4f, left + 44f, bottom - 4f, fill)
|
||||
|
||||
val x = left + 90f
|
||||
c.drawText(card.mode, x, top + 110f, paint(SUB, 52f, monoBold))
|
||||
c.drawText(card.headline, x, top + 270f, paint(INK, 150f, disp))
|
||||
var y = top + 400f
|
||||
val label = paint(SUB, 44f)
|
||||
val value = paint(INK, 56f, monoBold)
|
||||
for ((k, v) in card.rows.take(5)) {
|
||||
c.drawText(k, x, y, label)
|
||||
c.drawText(v, right - 70f - value.measureText(v), y, value)
|
||||
y += 92f
|
||||
}
|
||||
|
||||
card.nickname?.let { c.drawText(it, 80f, 1230f, paint(INK, 48f, monoBold)) }
|
||||
c.drawText(S.searchOnPlay, 80f, 1295f, paint(SUB, 38f))
|
||||
return bmp
|
||||
}
|
||||
4
app/composeApp/src/androidMain/res/xml/share_paths.xml
Normal file
4
app/composeApp/src/androidMain/res/xml/share_paths.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths>
|
||||
<cache-path name="share" path="share/" />
|
||||
</paths>
|
||||
@@ -0,0 +1,86 @@
|
||||
package kr.tkrmagid.tetrig.ads
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
import kr.tkrmagid.tetrig.shop.Entitlements
|
||||
|
||||
/**
|
||||
* 광고 슬롯 (명세서 §10). 플레이 중 화면(솔로·대전 인게임)에는 절대 넣지 않는다.
|
||||
* - AdBanner: 메인(탭바 위)·커스텀 로비 하단, 적응형 배너
|
||||
* - AdCard: 모든 결과 화면, 300×250
|
||||
* - 전면: 결과 확인 → 다음 행동 사이에만, 마지막 전면 뒤 3판 이상 + 세션 첫 판 제외
|
||||
* - 보상형: 사용자가 직접 고를 때만 (30분 전면 끄기 · TIME ATTACK 이어하기 · 스킨 해금)
|
||||
* 광고 제거(또는 서포터 팩)를 사면 배너·카드·전면은 모두 사라지고 보상형만 선택지로 남는다.
|
||||
*/
|
||||
@Composable
|
||||
expect fun AdBanner(modifier: Modifier = Modifier)
|
||||
|
||||
@Composable
|
||||
expect fun AdCard(modifier: Modifier = Modifier)
|
||||
|
||||
/**
|
||||
* 전면 광고 간격 규칙 (순수 함수).
|
||||
*
|
||||
* @param total 지금까지(앱을 껐다 켜도 이어서) 끝낸 판 수
|
||||
* @param lastShownAt 마지막 전면 광고를 띄웠을 때의 total (없으면 0)
|
||||
* @param session 이번 앱 실행에서 끝낸 판 수
|
||||
*
|
||||
* 예) 한 번에 2판씩 하는 사용자 → 4·8·12…번째 판, 3판씩 → 3·6·9…번째 판.
|
||||
*/
|
||||
fun interstitialDue(total: Int, lastShownAt: Int, session: Int): Boolean =
|
||||
session >= 2 && total - lastShownAt >= AdPolicy.MIN_GAP
|
||||
|
||||
/** 전면 광고 빈도 규칙. 판 수는 기기에 저장해 앱을 다시 켜도 이어서 센다. */
|
||||
object AdPolicy {
|
||||
const val MIN_GAP = 3
|
||||
const val AD_FREE_MS = 30 * 60_000L
|
||||
|
||||
/** 이번 세션(앱 실행)에서 끝낸 판 수. */
|
||||
var gamesThisSession = 0
|
||||
private set
|
||||
|
||||
val totalGames: Int get() = Prefs.str("ads.total", "0").toIntOrNull() ?: 0
|
||||
private val lastShownAt: Int get() = Prefs.str("ads.lastShown", "0").toIntOrNull() ?: 0
|
||||
|
||||
fun onGameFinished() {
|
||||
gamesThisSession++
|
||||
Prefs.setStr("ads.total", (totalGames + 1).toString())
|
||||
}
|
||||
|
||||
fun shouldShow(now: Long = nowMs()): Boolean =
|
||||
!Entitlements.adFreeActive(now) &&
|
||||
interstitialDue(totalGames, lastShownAt, gamesThisSession)
|
||||
|
||||
fun markShown() {
|
||||
Prefs.setStr("ads.lastShown", totalGames.toString())
|
||||
}
|
||||
}
|
||||
|
||||
/** 결과 화면의 "다음 행동" 버튼에서 부른다. 광고를 띄우면 닫힌 뒤 then 실행. */
|
||||
fun maybeInterstitial(then: () -> Unit) {
|
||||
if (!AdPolicy.shouldShow()) {
|
||||
then()
|
||||
return
|
||||
}
|
||||
AdPolicy.markShown()
|
||||
showInterstitial(then)
|
||||
}
|
||||
|
||||
expect fun showInterstitial(then: () -> Unit)
|
||||
|
||||
/** 보상형 광고가 로드돼 바로 띄울 수 있는지 (Compose 가 관찰하는 상태를 읽는다). */
|
||||
expect fun rewardedAvailable(): Boolean
|
||||
|
||||
/**
|
||||
* 보상형 광고를 띄운다. 끝까지 봐서 보상 조건을 채웠을 때만 earned = true.
|
||||
* 광고가 닫힌 뒤(또는 띄우지 못했을 때) 한 번 호출된다.
|
||||
*/
|
||||
expect fun showRewarded(onResult: (earned: Boolean) -> Unit)
|
||||
|
||||
/** 유럽·영국 등에서 광고 동의를 다시 고칠 수 있는 진입점을 보여야 하는지 (UMP 판정, Compose 가 관찰). */
|
||||
expect fun privacyOptionsRequired(): Boolean
|
||||
|
||||
/** 광고 동의 양식(개인정보 옵션)을 다시 띄운다. */
|
||||
expect fun showPrivacyOptions()
|
||||
@@ -23,6 +23,9 @@ object Prefs {
|
||||
store.putString(key, value)
|
||||
}
|
||||
|
||||
fun str(key: String, default: String = ""): String = read(key, default)
|
||||
fun setStr(key: String, value: String) = write(key, value)
|
||||
|
||||
// ── 설정 ──
|
||||
fun flag(key: String, default: Boolean): Boolean = read("flag.$key", if (default) "1" else "0") == "1"
|
||||
fun setFlag(key: String, value: Boolean) = write("flag.$key", if (value) "1" else "0")
|
||||
|
||||
@@ -360,13 +360,13 @@ class TetrigGame(seed: Int = 1) {
|
||||
}
|
||||
|
||||
/** 하드드롭. 떨어진 칸 수와 락 결과를 반환한다. */
|
||||
fun hardDrop(): Pair<Int, LockResult>? {
|
||||
fun hardDrop(beforeSpawn: (LockResult) -> Unit = {}): Pair<Int, LockResult>? {
|
||||
if (over) return null
|
||||
val a = active
|
||||
var d = 0
|
||||
while (!collides(board, pieceCells(a.type, a.state, a.x, a.y - d - 1))) d++
|
||||
a.y -= d
|
||||
return d to lock()
|
||||
return d to lock(beforeSpawn)
|
||||
}
|
||||
|
||||
fun holdSwap(): Boolean {
|
||||
@@ -384,7 +384,20 @@ class TetrigGame(seed: Int = 1) {
|
||||
return true
|
||||
}
|
||||
|
||||
fun lock(): LockResult {
|
||||
/**
|
||||
* 가비지 n줄을 바닥에 밀어 넣는다 (구멍 열 hole). 위로 밀려 버퍼 밖으로 나가는
|
||||
* 블록이 있으면 톱아웃. 락과 다음 스폰 사이(beforeSpawn)에서 부른다.
|
||||
*/
|
||||
fun insertGarbage(n: Int, hole: Int) {
|
||||
if (n <= 0) return
|
||||
val w = board[0].size
|
||||
val h = board.size
|
||||
for (y in h - n until h) if (board[y].any { it != null }) over = true
|
||||
for (y in h - 1 downTo n) board[y] = board[y - n]
|
||||
for (y in 0 until n) board[y] = Array(w) { x -> if (x == hole) null else 'G' }
|
||||
}
|
||||
|
||||
fun lock(beforeSpawn: (LockResult) -> Unit = {}): LockResult {
|
||||
val a = active
|
||||
val tspin = detectTSpin(board, a.type, a.state, a.x, a.y, lastMoveRotation)
|
||||
for (c in cells()) {
|
||||
@@ -398,7 +411,8 @@ class TetrigGame(seed: Int = 1) {
|
||||
val result = LockResult(a.type, cleared, tspin, allClear, combo, b2b, diff)
|
||||
lastClear = result
|
||||
holdUsed = false
|
||||
spawn()
|
||||
beforeSpawn(result)
|
||||
if (!over) spawn()
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package kr.tkrmagid.tetrig.engine
|
||||
|
||||
/**
|
||||
* 대전 규칙 (명세서 §6). 서버 server/src/rules.js 의 attackFor 와 값이 같아야 한다.
|
||||
*/
|
||||
object VersusRules {
|
||||
val LINES = intArrayOf(0, 0, 1, 2, 4)
|
||||
val TSPIN_MINI = intArrayOf(0, 1)
|
||||
val TSPIN = intArrayOf(0, 2, 4, 6)
|
||||
const val B2B_BONUS = 1
|
||||
const val ALL_CLEAR = 5
|
||||
val COMBO = intArrayOf(1, 1, 2, 2, 3, 3, 4, 4, 4, 5)
|
||||
const val MAX_INSERT = 8
|
||||
const val SAME_HOLE_CHANCE = 0.7
|
||||
}
|
||||
|
||||
/** 한 번의 락으로 보낼 줄 수 (상쇄 전). */
|
||||
fun attackFor(r: LockResult): Int {
|
||||
if (r.lines <= 0) return 0
|
||||
var n = when (r.tspin) {
|
||||
"tspin" -> VersusRules.TSPIN[minOf(r.lines, 3)]
|
||||
"mini" -> VersusRules.TSPIN_MINI[minOf(r.lines, 1)]
|
||||
else -> VersusRules.LINES[minOf(r.lines, 4)]
|
||||
}
|
||||
if (r.difficult && r.b2b >= 1) n += VersusRules.B2B_BONUS
|
||||
if (r.combo >= 1) n += VersusRules.COMBO[minOf(r.combo - 1, VersusRules.COMBO.size - 1)]
|
||||
if (r.allClear) n += VersusRules.ALL_CLEAR
|
||||
return n
|
||||
}
|
||||
|
||||
/**
|
||||
* 받은 가비지 대기열. 상쇄(counter)는 내 클라이언트가 직접 처리하고, 상쇄 후 남은
|
||||
* 공격만 서버로 보낸다 — 대기열을 고치는 쪽이 한 곳뿐이라 desync 가 생기지 않는다.
|
||||
*/
|
||||
class GarbageQueue(private val rng: () -> Double) {
|
||||
private val chunks = ArrayDeque<Int>()
|
||||
private var lastHole = (rng() * Config.BOARD_W).toInt()
|
||||
|
||||
val total: Int get() = chunks.sum()
|
||||
|
||||
fun add(lines: Int) {
|
||||
if (lines > 0) chunks.addLast(lines)
|
||||
}
|
||||
|
||||
/** 공격량으로 대기열을 깎고, 남은 공격량을 돌려준다. */
|
||||
fun counter(attack: Int): Int {
|
||||
var a = attack
|
||||
while (a > 0 && chunks.isNotEmpty()) {
|
||||
val c = chunks.removeFirst()
|
||||
if (c > a) {
|
||||
chunks.addFirst(c - a)
|
||||
a = 0
|
||||
} else {
|
||||
a -= c
|
||||
}
|
||||
}
|
||||
return a
|
||||
}
|
||||
|
||||
/** 이번 락에 밀어 넣을 줄들: (줄 수, 구멍 열) 목록. 한 번에 최대 8줄. */
|
||||
fun take(): List<Pair<Int, Int>> {
|
||||
val out = mutableListOf<Pair<Int, Int>>()
|
||||
var budget = VersusRules.MAX_INSERT
|
||||
while (budget > 0 && chunks.isNotEmpty()) {
|
||||
val c = chunks.removeFirst()
|
||||
val n = minOf(c, budget)
|
||||
if (c > n) chunks.addFirst(c - n)
|
||||
budget -= n
|
||||
if (rng() >= VersusRules.SAME_HOLE_CHANCE) {
|
||||
var h = (rng() * (Config.BOARD_W - 1)).toInt()
|
||||
if (h >= lastHole) h++
|
||||
lastHole = h
|
||||
}
|
||||
out += n to lastHole
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
fun clear() = chunks.clear()
|
||||
}
|
||||
|
||||
/** 보이는 20행을 200자 문자열로 (위→아래, '.' = 빈칸). 서버 board 메시지 형식. */
|
||||
fun encodeBoard(board: Board, active: Active? = null): String {
|
||||
val sb = StringBuilder(Config.BOARD_W * Config.VISIBLE_H)
|
||||
val act = HashSet<Int>()
|
||||
if (active != null) for (c in pieceCells(active.type, active.state, active.x, active.y)) act += c[1] * 100 + c[0]
|
||||
for (y in Config.VISIBLE_H - 1 downTo 0) {
|
||||
for (x in 0 until Config.BOARD_W) {
|
||||
val v = board[y][x]
|
||||
sb.append(
|
||||
when {
|
||||
v != null -> v
|
||||
active != null && (y * 100 + x) in act -> active.type
|
||||
else -> '.'
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
return sb.toString()
|
||||
}
|
||||
|
||||
/** encodeBoard 의 역. grid[row][col], row 0 = 맨 위. */
|
||||
fun decodeBoard(s: String): List<CharArray> =
|
||||
(0 until Config.VISIBLE_H).map { r ->
|
||||
CharArray(Config.BOARD_W) { c -> s.getOrElse(r * Config.BOARD_W + c) { '.' } }
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package kr.tkrmagid.tetrig.game
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
@@ -11,10 +12,31 @@ import kr.tkrmagid.tetrig.engine.gravityMsForLevel
|
||||
import kr.tkrmagid.tetrig.engine.levelForLines
|
||||
import kr.tkrmagid.tetrig.engine.scoreClear
|
||||
|
||||
enum class Mode(val id: String, val title: String, val desc: String) {
|
||||
Sprint("sprint", "SPRINT", "40줄 최속 클리어"),
|
||||
TimeAttack("time", "TIME ATTACK", "2분 점수 어택 · 레벨 가속"),
|
||||
Endless("endless", "ENDLESS", "무한 · 톱아웃해도 계속"),
|
||||
enum class Mode(val id: String, val title: String) {
|
||||
Sprint("sprint", "SPRINT"),
|
||||
TimeAttack("time", "TIME ATTACK"),
|
||||
Endless("endless", "ENDLESS"),
|
||||
Versus("versus", "VERSUS");
|
||||
|
||||
val desc: String
|
||||
get() = when (this) {
|
||||
Sprint -> S.sprintDesc
|
||||
TimeAttack -> S.timeAttackDesc
|
||||
Endless -> S.endlessDesc
|
||||
Versus -> S.versusDesc
|
||||
}
|
||||
|
||||
companion object {
|
||||
val solo = listOf(Sprint, TimeAttack, Endless)
|
||||
}
|
||||
}
|
||||
|
||||
/** 대전 모드에서 GameState 가 부르는 훅. 가비지 삽입·공격 전송·톱아웃 보고. */
|
||||
interface VersusHooks {
|
||||
/** 락 직후, 다음 피스가 나오기 전. 여기서 가비지를 밀어 넣는다. */
|
||||
fun beforeSpawn(game: TetrigGame, res: LockResult)
|
||||
fun afterLock(res: LockResult, piecesPlaced: Int)
|
||||
fun onTopOut()
|
||||
}
|
||||
|
||||
const val SPRINT_GOAL_LINES = 40
|
||||
@@ -24,7 +46,7 @@ const val TIME_ATTACK_MS = 120_000L
|
||||
* 모드 규칙 + 타이밍(중력/락딜레이/DAS/ARR)을 담당하는 상태 홀더.
|
||||
* 엔진은 순수 로직이고, 시간은 전부 여기서 구동한다.
|
||||
*/
|
||||
class GameState(val mode: Mode, seed: Int) {
|
||||
class GameState(val mode: Mode, seed: Int, val versus: VersusHooks? = null) {
|
||||
|
||||
var game = TetrigGame(seed)
|
||||
private set
|
||||
@@ -45,6 +67,17 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
var lastEvent by mutableStateOf<String?>(null)
|
||||
private set
|
||||
|
||||
/**
|
||||
* TIME ATTACK 톱아웃 직후 "광고 보고 이어하기" 선택을 기다리는 중. 이 동안 시간은 멈춘다.
|
||||
* canOfferContinue 가 false 면 (광고 미로드 등) 묻지 않고 바로 끝낸다.
|
||||
*/
|
||||
var awaitingContinue by mutableStateOf(false)
|
||||
private set
|
||||
/** 이어하기를 쓴 판. 기록·리더보드에 넣지 않는다. */
|
||||
var continued by mutableStateOf(false)
|
||||
private set
|
||||
var canOfferContinue: () -> Boolean = { false }
|
||||
|
||||
/** UI 리컴포지션 트리거. 엔진 내부는 가변이라 버전 번호로 갱신을 알린다. */
|
||||
var version by mutableIntStateOf(0)
|
||||
private set
|
||||
@@ -68,12 +101,12 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
}
|
||||
|
||||
private fun gravityMs(): Int = when (mode) {
|
||||
Mode.Sprint -> Config.DEFAULT_GRAVITY_MS
|
||||
Mode.Sprint, Mode.Versus -> Config.DEFAULT_GRAVITY_MS
|
||||
else -> gravityMsForLevel(level)
|
||||
}
|
||||
|
||||
fun tick(dtMs: Long) {
|
||||
if (finished || paused) return
|
||||
if (finished || paused || awaitingContinue) return
|
||||
elapsedMs += dtMs
|
||||
|
||||
if (mode == Mode.TimeAttack && elapsedMs >= TIME_ATTACK_MS) {
|
||||
@@ -129,7 +162,7 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
} else {
|
||||
lockAcc += dtMs
|
||||
if (lockAcc >= Config.LOCK_DELAY_MS) {
|
||||
applyLock(game.lock())
|
||||
applyLock(game.lock(::beforeSpawn))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -142,7 +175,7 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
}
|
||||
|
||||
fun press(dir: Int) {
|
||||
if (finished || paused) return
|
||||
if (finished || paused || awaitingContinue) return
|
||||
heldDir = dir
|
||||
dasAcc = 0
|
||||
arrAcc = 0
|
||||
@@ -159,12 +192,12 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
}
|
||||
|
||||
fun rotate(dir: String) {
|
||||
if (finished || paused) return
|
||||
if (finished || paused || awaitingContinue) return
|
||||
if (game.rotate(dir)) onMoveSucceeded()
|
||||
}
|
||||
|
||||
fun hold() {
|
||||
if (finished || paused) return
|
||||
if (finished || paused || awaitingContinue) return
|
||||
if (game.holdSwap()) {
|
||||
gravityAcc = 0
|
||||
lockAcc = 0
|
||||
@@ -173,12 +206,22 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
}
|
||||
|
||||
fun hardDrop() {
|
||||
if (finished || paused) return
|
||||
val r = game.hardDrop() ?: return
|
||||
if (finished || paused || awaitingContinue) return
|
||||
val r = game.hardDrop(::beforeSpawn) ?: return
|
||||
score += r.first * 2
|
||||
applyLock(r.second)
|
||||
}
|
||||
|
||||
private fun beforeSpawn(res: LockResult) {
|
||||
versus?.beforeSpawn(game, res)
|
||||
}
|
||||
|
||||
/** 대전에서 라운드가 바깥 사유(상대 전멸 등)로 끝났을 때. */
|
||||
fun forceEnd() {
|
||||
finished = true
|
||||
bump()
|
||||
}
|
||||
|
||||
private fun applyLock(res: LockResult) {
|
||||
piecesPlaced++
|
||||
gravityAcc = 0
|
||||
@@ -193,18 +236,20 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
when (mode) {
|
||||
Mode.Sprint -> if (lines >= SPRINT_GOAL_LINES) finished = true
|
||||
Mode.TimeAttack -> Unit
|
||||
Mode.Endless -> Unit
|
||||
Mode.Endless, Mode.Versus -> Unit
|
||||
}
|
||||
versus?.afterLock(res, piecesPlaced)
|
||||
if (game.over) {
|
||||
if (mode == Mode.Endless) {
|
||||
if (mode == Mode.Versus) {
|
||||
finished = true
|
||||
versus?.onTopOut()
|
||||
} else if (mode == Mode.Endless) {
|
||||
// 톱아웃해도 계속: 보드를 비우고 이어간다.
|
||||
val keptScore = score
|
||||
val keptLines = lines
|
||||
game = TetrigGame((elapsedMs.toInt() xor score) or 1)
|
||||
score = keptScore
|
||||
lines = keptLines
|
||||
lastEvent = "TOP OUT · 계속"
|
||||
eventAcc = 0
|
||||
freshBoard(S.topOutContinue)
|
||||
} else if (mode == Mode.TimeAttack && !continued && canOfferContinue()) {
|
||||
awaitingContinue = true
|
||||
heldDir = 0
|
||||
softHeld = false
|
||||
} else {
|
||||
finished = true
|
||||
}
|
||||
@@ -212,6 +257,32 @@ class GameState(val mode: Mode, seed: Int) {
|
||||
bump()
|
||||
}
|
||||
|
||||
/** 점수·라인·시간은 그대로 두고 보드만 새로 깐다. */
|
||||
private fun freshBoard(event: String) {
|
||||
game = TetrigGame((elapsedMs.toInt() xor score) or 1)
|
||||
gravityAcc = 0
|
||||
lockAcc = 0
|
||||
lastEvent = event
|
||||
eventAcc = 0
|
||||
}
|
||||
|
||||
/** 보상형 광고를 끝까지 봤을 때: 남은 시간 그대로 빈 보드에서 이어간다 (1판 1회). */
|
||||
fun acceptContinue() {
|
||||
if (!awaitingContinue) return
|
||||
awaitingContinue = false
|
||||
continued = true
|
||||
freshBoard(S.continuedBanner)
|
||||
bump()
|
||||
}
|
||||
|
||||
/** 이어하기를 거절했거나 광고를 끝까지 보지 않았을 때. */
|
||||
fun declineContinue() {
|
||||
if (!awaitingContinue) return
|
||||
awaitingContinue = false
|
||||
finished = true
|
||||
bump()
|
||||
}
|
||||
|
||||
private fun describe(res: LockResult): String {
|
||||
val name = when {
|
||||
res.tspin == "tspin" -> "T-SPIN " + countName(res.lines)
|
||||
|
||||
@@ -0,0 +1,407 @@
|
||||
package kr.tkrmagid.tetrig.game
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.I18n
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
import androidx.compose.runtime.mutableStateMapOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import kotlinx.serialization.json.jsonObject
|
||||
import kr.tkrmagid.tetrig.engine.GarbageQueue
|
||||
import kr.tkrmagid.tetrig.engine.LockResult
|
||||
import kr.tkrmagid.tetrig.engine.TetrigGame
|
||||
import kr.tkrmagid.tetrig.engine.attackFor
|
||||
import kr.tkrmagid.tetrig.engine.encodeBoard
|
||||
import kr.tkrmagid.tetrig.engine.makeRng
|
||||
import kr.tkrmagid.tetrig.net.JsonCodec
|
||||
import kr.tkrmagid.tetrig.net.PlatformSocket
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.SocketListener
|
||||
import kr.tkrmagid.tetrig.net.WS_SERVER
|
||||
import kr.tkrmagid.tetrig.net.arr
|
||||
import kr.tkrmagid.tetrig.net.bool
|
||||
import kr.tkrmagid.tetrig.net.dbl
|
||||
import kr.tkrmagid.tetrig.net.int
|
||||
import kr.tkrmagid.tetrig.net.jsonOf
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
import kr.tkrmagid.tetrig.net.obj
|
||||
import kr.tkrmagid.tetrig.net.openSocket
|
||||
import kr.tkrmagid.tetrig.net.str
|
||||
|
||||
private const val PING = "{\"t\":\"ping\"}"
|
||||
|
||||
data class RoomPlayer(
|
||||
val id: String, val nick: String, val guest: Boolean, val wins: Int, val alive: Boolean, val inRound: Boolean,
|
||||
val connected: Boolean, val rematch: Boolean, val tr: Int?, val rank: String?, val badge: String? = null,
|
||||
)
|
||||
|
||||
data class RoomRules(val garbageMul: Double = 1.0, val ft: Int = 0, val sameBag: Boolean = false, val overtime: Boolean = true)
|
||||
|
||||
data class Standing(val id: String, val nick: String, val wins: Int, val rank: Int)
|
||||
|
||||
data class MatchEnd(
|
||||
val winner: String?,
|
||||
val standings: List<Standing>,
|
||||
val score: Map<String, Int>,
|
||||
val trDelta: Int?,
|
||||
val trAfter: Int?,
|
||||
val rankAfter: String?,
|
||||
val placementAfter: Int?,
|
||||
)
|
||||
|
||||
enum class Conn { Connecting, Open, Reconnecting, Closed }
|
||||
|
||||
/**
|
||||
* 경기방 WebSocket 클라이언트 (커스텀·리그 공용). 서버 메시지를 Compose 상태로 옮기고,
|
||||
* 내 라운드 GameState 에 대전 훅(가비지·공격·톱아웃)을 연결한다.
|
||||
*/
|
||||
class RoomClient(val kind: String, val roomId: String) {
|
||||
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
|
||||
private var socket: PlatformSocket? = null
|
||||
private var leaving = false
|
||||
private var reconnectUntil = 0L
|
||||
|
||||
var conn by mutableStateOf(Conn.Connecting)
|
||||
private set
|
||||
var fatal by mutableStateOf<String?>(null)
|
||||
private set
|
||||
var toast by mutableStateOf<String?>(null)
|
||||
|
||||
var me by mutableStateOf("")
|
||||
private set
|
||||
var code by mutableStateOf<String?>(null)
|
||||
private set
|
||||
var host by mutableStateOf<String?>(null)
|
||||
private set
|
||||
var phase by mutableStateOf("lobby")
|
||||
private set
|
||||
var round by mutableIntStateOf(0)
|
||||
private set
|
||||
var rules by mutableStateOf(RoomRules())
|
||||
private set
|
||||
val players = mutableStateListOf<RoomPlayer>()
|
||||
val boards = mutableStateMapOf<String, String>()
|
||||
val koFeed = mutableStateListOf<String>()
|
||||
var targeting by mutableStateOf<String?>(null)
|
||||
private set
|
||||
var manualTarget by mutableStateOf(false)
|
||||
private set
|
||||
|
||||
/** 내 라운드. 관전 중이면 null. */
|
||||
var game by mutableStateOf<GameState?>(null)
|
||||
private set
|
||||
var roundStartsAt by mutableStateOf(0L)
|
||||
private set
|
||||
var pending by mutableIntStateOf(0)
|
||||
private set
|
||||
var roundBanner by mutableStateOf<String?>(null)
|
||||
private set
|
||||
var matchEnd by mutableStateOf<MatchEnd?>(null)
|
||||
private set
|
||||
var rematchVotes by mutableStateOf<List<String>>(emptyList())
|
||||
private set
|
||||
var rematchNeeded by mutableIntStateOf(0)
|
||||
private set
|
||||
|
||||
private var garbage = GarbageQueue(makeRng(1))
|
||||
private var lastBoardSent = ""
|
||||
|
||||
val isHost get() = host == me
|
||||
fun nick(id: String?): String = players.firstOrNull { it.id == id }?.nick ?: "?"
|
||||
val opponents get() = players.filter { it.id != me && it.inRound }
|
||||
|
||||
private val url get() = if (kind == "league") "$WS_SERVER/ws/league/$roomId?token=${Session.token}" else "$WS_SERVER/ws/room/$roomId?token=${Session.token}"
|
||||
|
||||
private var generation = 0
|
||||
private var lastHeard = 0L
|
||||
|
||||
init {
|
||||
// keepalive: 4초마다 ping, 9초 넘게 아무것도 못 받으면 죽은 연결로 보고 다시 붙는다.
|
||||
// 서버 재접속 유예가 15초라 그 안에 감지·재연결이 끝나야 한다.
|
||||
scope.launch {
|
||||
while (true) {
|
||||
delay(4_000)
|
||||
val s = socket ?: continue
|
||||
if (conn != Conn.Open) continue
|
||||
if (nowMs() - lastHeard > 9_000) {
|
||||
generation++ // 옛 소켓 콜백 무시
|
||||
s.close()
|
||||
socket = null
|
||||
onSocketClosed(1006, "keepalive timeout")
|
||||
} else {
|
||||
s.send(PING)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun connect() {
|
||||
leaving = false
|
||||
conn = if (conn == Conn.Reconnecting) Conn.Reconnecting else Conn.Connecting
|
||||
// 소켓마다 세대 번호를 붙여, 교체된 옛 소켓의 콜백이 새 연결 상태를 덮어쓰지 않게 한다.
|
||||
val gen = ++generation
|
||||
socket = openSocket(url, object : SocketListener {
|
||||
override fun onOpen() {
|
||||
scope.launch { if (gen == generation) { conn = Conn.Open; reconnectUntil = 0; lastHeard = nowMs() } }
|
||||
}
|
||||
|
||||
override fun onMessage(text: String) {
|
||||
val m = runCatching { JsonCodec.parseToJsonElement(text).jsonObject }.getOrNull() ?: return
|
||||
scope.launch { if (gen == generation) { lastHeard = nowMs(); handle(m) } }
|
||||
}
|
||||
|
||||
override fun onClosed(code: Int, reason: String) {
|
||||
scope.launch { if (gen == generation) onSocketClosed(code, reason) }
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private suspend fun onSocketClosed(code: Int, reason: String) {
|
||||
socket = null
|
||||
if (leaving || fatal != null || code == 4000) {
|
||||
conn = Conn.Closed
|
||||
return
|
||||
}
|
||||
// 서버 유예 15초 안에 다시 붙는다.
|
||||
if (reconnectUntil == 0L) reconnectUntil = nowMs() + 14_000
|
||||
if (nowMs() > reconnectUntil) {
|
||||
conn = Conn.Closed
|
||||
fatal = S.connectionLost
|
||||
return
|
||||
}
|
||||
conn = Conn.Reconnecting
|
||||
delay(1_000)
|
||||
if (!leaving) connect()
|
||||
}
|
||||
|
||||
fun send(vararg pairs: Pair<String, Any?>) {
|
||||
socket?.send(jsonOf(*pairs).toString())
|
||||
}
|
||||
|
||||
// ── 사용자 동작 ──
|
||||
fun start() = send("t" to "start")
|
||||
fun updateRules(r: RoomRules) = send("t" to "rules", "rules" to mapOf("garbageMul" to r.garbageMul, "ft" to r.ft, "sameBag" to r.sameBag, "overtime" to r.overtime))
|
||||
fun target(id: String) = send("t" to "target", "id" to id)
|
||||
fun rematch(vote: Boolean) = send("t" to "rematch", "vote" to vote)
|
||||
fun stopToLobby() = send("t" to "stop")
|
||||
|
||||
fun leave() {
|
||||
leaving = true
|
||||
send("t" to "leave")
|
||||
socket?.close()
|
||||
scope.launch {
|
||||
delay(300)
|
||||
scope.cancel()
|
||||
}
|
||||
}
|
||||
|
||||
/** 화면이 주기적으로 부른다: 보드 스냅샷 (변경 있을 때만). */
|
||||
fun pushBoard(lock: Boolean = false) {
|
||||
val g = game ?: return
|
||||
if (!g.game.over && g.finished) return
|
||||
val s = encodeBoard(g.game.board, if (g.game.over) null else g.game.active)
|
||||
if (s == lastBoardSent && !lock) return
|
||||
lastBoardSent = s
|
||||
send("t" to "board", "grid" to s, "lock" to lock, "pending" to garbage.total)
|
||||
}
|
||||
|
||||
// ── 서버 메시지 ──
|
||||
private fun handle(m: JsonObject) {
|
||||
when (m.str("t")) {
|
||||
"sync" -> {
|
||||
me = m.str("you") ?: me
|
||||
applyLobby(m)
|
||||
m.obj("boards")?.forEach { (k, v) -> (v as? kotlinx.serialization.json.JsonPrimitive)?.content?.let { boards[k] = it } }
|
||||
}
|
||||
"lobby" -> applyLobby(m)
|
||||
"round_start" -> onRoundStart(m)
|
||||
"garbage" -> {
|
||||
val n = m.int("lines") ?: 0
|
||||
garbage.add(n)
|
||||
pending = garbage.total
|
||||
}
|
||||
"board" -> {
|
||||
val id = m.str("id") ?: return
|
||||
boards[id] = m.str("grid") ?: return
|
||||
}
|
||||
"ko" -> {
|
||||
val who = m.str("who")
|
||||
val by = m.str("by")
|
||||
val line = when {
|
||||
m.bool("forfeit") == true -> S.feedForfeit(nick(who))
|
||||
by != null -> S.feedKo(nick(by), nick(who))
|
||||
else -> S.feedOut(nick(who))
|
||||
}
|
||||
koFeed.add(0, line)
|
||||
while (koFeed.size > 5) koFeed.removeAt(koFeed.lastIndex)
|
||||
if (targeting == who) targeting = null
|
||||
}
|
||||
"targeting" -> {
|
||||
targeting = m.str("id")
|
||||
manualTarget = m.bool("manual") == true
|
||||
}
|
||||
"round_end" -> {
|
||||
val w = m.str("winner")
|
||||
game?.let { if (!it.finished) it.forceEnd() }
|
||||
roundBanner = when {
|
||||
w == null -> S.roundDraw(m.int("n") ?: 0)
|
||||
w == me -> S.roundWinMe(m.int("n") ?: 0)
|
||||
else -> S.roundWinOther(m.int("n") ?: 0, nick(w))
|
||||
}
|
||||
}
|
||||
"match_end" -> onMatchEnd(m)
|
||||
"rematch_state" -> {
|
||||
rematchVotes = (m["votes"] as? kotlinx.serialization.json.JsonArray)?.mapNotNull { (it as? kotlinx.serialization.json.JsonPrimitive)?.content } ?: emptyList()
|
||||
rematchNeeded = m.int("needed") ?: 0
|
||||
}
|
||||
"error" -> {
|
||||
val msg = m.str("msg")?.let { I18n.server(it) } ?: S.error
|
||||
if (m.bool("fatal") == true) fatal = msg else toast = msg
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun applyLobby(m: JsonObject) {
|
||||
code = m.str("code") ?: code
|
||||
host = m.str("host")
|
||||
val newPhase = m.str("phase") ?: phase
|
||||
if (newPhase == "lobby" && phase != "lobby") {
|
||||
game = null
|
||||
roundBanner = null
|
||||
}
|
||||
if (newPhase != "match_end") matchEnd?.let { if (newPhase == "countdown") matchEnd = null }
|
||||
phase = newPhase
|
||||
round = m.int("round") ?: round
|
||||
m.obj("rules")?.let { r ->
|
||||
rules = RoomRules(r.dbl("garbageMul") ?: 1.0, r.int("ft") ?: 0, r.bool("sameBag") ?: false, r.bool("overtime") ?: true)
|
||||
}
|
||||
val list = m.arr("players").map { p ->
|
||||
RoomPlayer(
|
||||
p.str("id") ?: "", p.str("nick") ?: "?", p.bool("guest") ?: false, p.int("wins") ?: 0,
|
||||
p.bool("alive") ?: false, p.bool("inRound") ?: false, p.bool("connected") ?: false,
|
||||
p.bool("rematch") ?: false, p.int("tr"), p.str("rank"), p.str("badge"),
|
||||
)
|
||||
}
|
||||
players.clear()
|
||||
players.addAll(list)
|
||||
val ids = list.map { it.id }.toSet()
|
||||
boards.keys.filter { it !in ids }.forEach { boards.remove(it) }
|
||||
}
|
||||
|
||||
private fun onRoundStart(m: JsonObject) {
|
||||
matchEnd = null
|
||||
roundBanner = null
|
||||
koFeed.clear()
|
||||
boards.clear()
|
||||
targeting = null
|
||||
manualTarget = false
|
||||
lastBoardSent = ""
|
||||
round = m.int("n") ?: round
|
||||
roundStartsAt = nowMs() + (m.int("startIn") ?: 3000)
|
||||
val seed = m.int("seed")
|
||||
if (seed == null) {
|
||||
game = null // 관전 (도중 입장)
|
||||
return
|
||||
}
|
||||
garbage = GarbageQueue(makeRng(seed xor 0x5bd1e995))
|
||||
pending = 0
|
||||
game = GameState(Mode.Versus, seed, hooks)
|
||||
}
|
||||
|
||||
private val hooks = object : VersusHooks {
|
||||
override fun beforeSpawn(game: TetrigGame, res: LockResult) {
|
||||
if (res.lines == 0) {
|
||||
for ((n, hole) in garbage.take()) game.insertGarbage(n, hole)
|
||||
pending = garbage.total
|
||||
}
|
||||
}
|
||||
|
||||
override fun afterLock(res: LockResult, piecesPlaced: Int) {
|
||||
val atk = attackFor(res)
|
||||
val net = garbage.counter(atk)
|
||||
pending = garbage.total
|
||||
send("t" to "attack", "lines" to net, "pieces" to piecesPlaced)
|
||||
pushBoard(lock = true)
|
||||
}
|
||||
|
||||
override fun onTopOut() {
|
||||
pushBoard(lock = true)
|
||||
send("t" to "topout")
|
||||
}
|
||||
}
|
||||
|
||||
private fun onMatchEnd(m: JsonObject) {
|
||||
game?.let { if (!it.finished) it.forceEnd() }
|
||||
val standings = m.arr("result").map { Standing(it.str("id") ?: "", it.str("nick") ?: "?", it.int("wins") ?: 0, it.int("rank") ?: 0) }
|
||||
val score = m.obj("score")?.mapValues { (_, v) -> (v as? kotlinx.serialization.json.JsonPrimitive)?.content?.toIntOrNull() ?: 0 } ?: emptyMap()
|
||||
val after = m.obj("after")
|
||||
matchEnd = MatchEnd(
|
||||
winner = m.str("winner"), standings = standings, score = score,
|
||||
trDelta = m.int("trDelta"), trAfter = after?.int("tr"), rankAfter = after?.str("rank"), placementAfter = after?.int("placement"),
|
||||
)
|
||||
phase = "match_end"
|
||||
}
|
||||
}
|
||||
|
||||
/** 리그 대기열 (MatchmakerDO). matched 를 받으면 onMatched(roomId). */
|
||||
class QueueClient(private val onMatched: (room: String, opponent: String) -> Unit) {
|
||||
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
|
||||
private var socket: PlatformSocket? = null
|
||||
var waitMs by mutableStateOf(0L)
|
||||
private set
|
||||
var hint by mutableStateOf(false)
|
||||
private set
|
||||
var error by mutableStateOf<String?>(null)
|
||||
private set
|
||||
private var done = false
|
||||
|
||||
init {
|
||||
scope.launch {
|
||||
while (true) {
|
||||
delay(8_000)
|
||||
socket?.send(PING)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun connect() {
|
||||
socket = openSocket("$WS_SERVER/ws/queue?token=${Session.token}", object : SocketListener {
|
||||
override fun onOpen() {}
|
||||
override fun onMessage(text: String) {
|
||||
val m = runCatching { JsonCodec.parseToJsonElement(text).jsonObject }.getOrNull() ?: return
|
||||
scope.launch {
|
||||
when (m.str("t")) {
|
||||
"queue" -> {
|
||||
waitMs = m.long2("waitMs")
|
||||
hint = m.bool("hint") == true
|
||||
}
|
||||
"matched" -> {
|
||||
done = true
|
||||
onMatched(m.str("room") ?: return@launch, m.obj("opponent")?.str("nick") ?: "?")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
override fun onClosed(code: Int, reason: String) {
|
||||
scope.launch { if (!done) error = if (code == 403) S.leagueNeedsLogin else S.queueLost }
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun cancel() {
|
||||
done = true
|
||||
socket?.close()
|
||||
scope.cancel()
|
||||
}
|
||||
|
||||
private fun JsonObject.long2(k: String): Long = (this[k] as? kotlinx.serialization.json.JsonPrimitive)?.content?.toLongOrNull() ?: 0L
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
/** 지금 화면 언어의 문구. */
|
||||
val S: Strings get() = I18n.strings
|
||||
|
||||
object I18n {
|
||||
/** 기기 언어로 정해진다(MainActivity). 지원하지 않는 언어면 영어. */
|
||||
var strings: Strings = En
|
||||
private set
|
||||
|
||||
fun select(language: String, script: String = "", region: String = "") {
|
||||
strings = pick(language, script, region)
|
||||
}
|
||||
|
||||
fun pick(language: String, script: String = "", region: String = ""): Strings = when (language.lowercase()) {
|
||||
"ko" -> Ko
|
||||
"ja" -> Ja
|
||||
"zh" -> if (script.equals("Hant", true) || region.uppercase() in setOf("TW", "HK", "MO")) ZhHant else ZhHans
|
||||
"es" -> Es
|
||||
"pt" -> Pt
|
||||
"fr" -> Fr
|
||||
"de" -> De
|
||||
"ru" -> Ru
|
||||
"id", "in" -> Id // 오래된 Android 는 인도네시아어를 "in" 으로 준다
|
||||
"vi" -> Vi
|
||||
"th" -> Th
|
||||
"tr" -> Tr
|
||||
else -> En
|
||||
}
|
||||
|
||||
/**
|
||||
* 서버 오류 문구(서버는 한국어로 보낸다)를 지금 언어로 바꾼다.
|
||||
* 모르는 문구는 한국어 화면이면 그대로, 다른 언어면 일반 오류 문구로 보여 준다.
|
||||
*/
|
||||
fun server(msg: String, code: Int? = null): String {
|
||||
val s = strings
|
||||
val known: ((Strings) -> String)? = serverMessages[msg]
|
||||
if (known != null) return known(s)
|
||||
NICK_COOLDOWN.matchEntire(msg)?.let { return s.srvNickCooldown(it.groupValues[1].toInt()) }
|
||||
if (s === Ko) return msg
|
||||
return if (code != null && code != 0) s.errorCode(code) else s.error
|
||||
}
|
||||
|
||||
private val NICK_COOLDOWN = Regex("""닉네임은 30일에 한 번 바꿀 수 있습니다 \((\d+)일 남음\)""")
|
||||
|
||||
// 키는 server/src 의 한국어 문구와 글자 하나까지 같아야 한다.
|
||||
private val serverMessages: Map<String, (Strings) -> String> = mapOf(
|
||||
"닉네임은 2~12자의 한글·영문·숫자·_ 만 쓸 수 있습니다" to { it.srvNickRule },
|
||||
"게스트 이름 형식은 쓸 수 없습니다" to { it.srvNickGuestPattern },
|
||||
"이미 사용 중인 닉네임입니다" to { it.srvNickTaken },
|
||||
"이메일 형식이 올바르지 않습니다" to { it.srvEmailInvalid },
|
||||
"비밀번호는 8자 이상이어야 합니다" to { it.srvPasswordShort },
|
||||
"이미 가입된 이메일입니다" to { it.srvEmailTaken },
|
||||
"이메일 또는 비밀번호가 맞지 않습니다" to { it.srvWrongLogin },
|
||||
"Google 로그인이 아직 설정되지 않았습니다" to { it.srvGoogleNotReady },
|
||||
"Google 인증에 실패했습니다" to { it.srvGoogleFailed },
|
||||
"로그인이 필요합니다" to { it.srvLoginRequired },
|
||||
"게스트는 닉네임을 바꿀 수 없습니다. 로그인해 주세요" to { it.srvGuestNick },
|
||||
"잘못된 기록" to { it.srvBadRecord },
|
||||
"기록이 비정상입니다" to { it.srvBadRecord },
|
||||
"방 코드를 만들지 못했습니다. 다시 시도해 주세요" to { it.srvRoomCreateFailed },
|
||||
"잘못된 코드" to { it.srvBadCode },
|
||||
"없는 방입니다" to { it.srvNoRoom },
|
||||
"리그전은 로그인 후 참가할 수 있습니다" to { it.leagueNeedsLogin },
|
||||
"서버 오류" to { it.srvServerError },
|
||||
"이미 끝난 경기입니다" to { it.srvMatchOver },
|
||||
"이 경기의 참가자가 아닙니다" to { it.srvNotParticipant },
|
||||
"2명 이상 있어야 시작할 수 있습니다" to { it.srvNeedTwo },
|
||||
"잘못된 배지입니다" to { it.srvBadBadge },
|
||||
"가지고 있지 않은 배지입니다" to { it.srvNoBadge },
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object De : Strings {
|
||||
override val back = "← Zurück"
|
||||
override val home = "Zum Start"
|
||||
override val exit = "Verlassen"
|
||||
override val cancel = "Abbrechen"
|
||||
override val loading = "Lädt…"
|
||||
override val guest = "Gast"
|
||||
override val account = "Konto"
|
||||
override val offline = "Offline"
|
||||
override val comingSoon = "Bald"
|
||||
override val shareResult = "Ergebnisbild teilen"
|
||||
override val league = "Liga"
|
||||
override val custom = "Custom"
|
||||
override val win = "Sieg!"
|
||||
override val lose = "Niederlage"
|
||||
override val ended = "Vorbei"
|
||||
override val disconnected = "Getrennt"
|
||||
override val meSuffix = " (ich)"
|
||||
override fun wins(n: Int) = if (n == 1) "1 Sieg" else "$n Siege"
|
||||
override fun placement(n: Int) = "Platzierung $n/10"
|
||||
override val score = "Punkte"
|
||||
override val lines = "Reihen"
|
||||
override val time = "Zeit"
|
||||
override val rank = "Rang"
|
||||
override val error = "Fehler"
|
||||
override fun errorCode(code: Int) = "Fehler ($code)"
|
||||
override val cannotConnect = "Keine Verbindung zum Server"
|
||||
override val connectionLost = "Verbindung verloren"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Liga"
|
||||
override val modeLeagueSub = "Echtzeit-1-gegen-1, gewertet · 10 Platzierungsspiele"
|
||||
override val modeCustomSub = "Per Code erstellen oder beitreten · Keine Spielerbegrenzung"
|
||||
override val tabHome = "Start"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Profil"
|
||||
override val tabShop = "Shop"
|
||||
override val tabSettings = "Optionen"
|
||||
override val noRecord = "Kein Rekord"
|
||||
override val sprintDesc = "Räume 40 Reihen so schnell du kannst"
|
||||
override val timeAttackDesc = "2 Minuten Punktejagd · Wird schneller"
|
||||
override val endlessDesc = "Endlos · Weiter nach TOP OUT"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "Du hast in dieser Runde weitergespielt, deshalb zählt sie nicht für Rekorde und Rangliste"
|
||||
override val playAgain = "Nochmal"
|
||||
|
||||
override val ghost = "Landevorschau"
|
||||
override val ghostSub = "Zeigt, wo der Stein landet"
|
||||
override val lefty = "Linkshänder-Layout"
|
||||
override val leftySub = "Steuertasten spiegeln"
|
||||
override val bigButtons = "Große Tasten"
|
||||
override val bigButtonsSub = "Größere Tasten auf Tablets und Foldables"
|
||||
override val adPrivacy = "Werbe-Datenschutz"
|
||||
override val adPrivacySub = "Einwilligung zu personalisierter Werbung ändern"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Weiter"
|
||||
override val continuedBanner = "Fortgesetzt · Nicht gewertet"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Restzeit $time · Punkte $score"
|
||||
override val continueOffer = "Schau dir eine Werbung bis zum Ende an, um mit leerem Feld, deinem Punktestand und der Restzeit weiterzuspielen (einmal pro Spiel).\nPunkte aus fortgesetzten Spielen zählen nicht für Rekorde und Rangliste."
|
||||
override val loadingAd = "Werbung lädt…"
|
||||
override val watchToContinue = "▶ Werbung ansehen und weiterspielen"
|
||||
override val seeResult = "Ergebnis"
|
||||
override val hardDrop = "Hard Drop"
|
||||
override val softDrop = "▼ Soft"
|
||||
override val paused = "Pause"
|
||||
override val resume = "Weiter"
|
||||
|
||||
override val loginPitch = "Melde dich an, um Liga zu spielen, in der Rangliste zu erscheinen und deinen Nickname zu ändern. Deine Gast-Rekorde werden in dein Konto übernommen."
|
||||
override val emailSignup = "Per E-Mail"
|
||||
override val login = "Anmelden"
|
||||
override val email = "E-Mail"
|
||||
override val passwordHint = "Passwort (mind. 8 Zeichen)"
|
||||
override val nickOptional = "Nickname (optional, 2–12 Zeichen)"
|
||||
override val processing = "Einen Moment…"
|
||||
override val signUp = "Konto erstellen"
|
||||
override val noPasswordReset = "Passwort zurücksetzen geht noch nicht. Merk dir dein Passwort gut."
|
||||
override val nickChangeTitle = "Nickname ändern (alle 30 Tage)"
|
||||
override val nickChange = "Nickname ändern"
|
||||
override val changed = "Geändert"
|
||||
override val logout = "Abmelden"
|
||||
override val deleteConfirm = "Wirklich löschen (unwiderruflich)"
|
||||
override val deleteAccount = "Konto löschen"
|
||||
override val deleteWarning = "Dein Konto, deine Ligawertung, Serverrekorde und der Custom-Verlauf werden komplett gelöscht. Tippe noch einmal, um fortzufahren."
|
||||
override val seasonRecord = "Saisonbilanz"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}S ${losses}N"
|
||||
override val recentMatches = "Letzte Spiele"
|
||||
override val noMatches = "Noch keine Spiele"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Liga · ${if (won) "S" else "N"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Custom · Platz $place von $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Noch niemand hat 10 Platzierungsspiele abgeschlossen"
|
||||
override val lbEmptySolo = "Noch keine Rekorde (nur angemeldete Spieler werden gelistet)"
|
||||
|
||||
override val createRoom = "Raum erstellen"
|
||||
override val createRoomDesc = "Du bekommst einen 6-stelligen Code. Teile ihn mit deinen Freunden. Keine Spielerbegrenzung."
|
||||
override val creating = "Wird erstellt…"
|
||||
override val joinTitle = "Raum beitreten"
|
||||
override val codeHint = "6-stelliger Code"
|
||||
override val join = "Beitreten"
|
||||
override val noSuchRoom = "Kein Raum mit diesem Code"
|
||||
|
||||
override val matchFound = "Match gefunden!"
|
||||
override val searching = "Suche Gegner"
|
||||
override fun seconds(s: String) = "${s}s"
|
||||
override val rankPending = "Rang offen"
|
||||
override val queueLong = "Die Wartezeit wird lang. Spiel doch mit Freunden in einem Custom-Raum."
|
||||
override val openCustom = "Custom-Raum öffnen"
|
||||
override val leagueNeedsLogin = "Melde dich an, um Liga zu spielen"
|
||||
override val queueLost = "Verbindung zur Warteschlange verloren"
|
||||
|
||||
override val connectionClosed = "Getrennt"
|
||||
override val connecting = "Verbinde"
|
||||
override val reconnecting = "Verbinde neu…"
|
||||
override val customLobby = "Custom-Lobby"
|
||||
override val roomCode = "Raumcode"
|
||||
override val inviteHint = "Schick Freunden den Code oder einen Einladungslink"
|
||||
override val sendInvite = "Einladungslink senden"
|
||||
override fun playersCount(n: Int) = if (n == 1) "1 Spieler" else "$n Spieler"
|
||||
override val rulesHost = "Regeln (Host)"
|
||||
override val rules = "Regeln"
|
||||
override val garbageMul = "Garbage-Multiplikator"
|
||||
override val targetWins = "Ziel-Siege"
|
||||
override val unlimited = "Unbegrenzt"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Gleiche Bag (fair)"
|
||||
override val personalBag = "Eigene Bag"
|
||||
override val overtime = "Overtime-Multiplikator"
|
||||
override val overtimeOn = "An (+25 %/30 s nach 90 s)"
|
||||
override val off = "Aus"
|
||||
override val needTwo = "Start ab 2 Spielern"
|
||||
override val start = "Start"
|
||||
override val waitingHost = "Warte auf den Host…"
|
||||
override val host = "Host"
|
||||
override val waitingOpponent = "Warte auf Gegner…"
|
||||
override val forfeitExit = "Aufgeben und verlassen"
|
||||
override val forfeit = "Aufgeben"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Meine Siege $wins · Im Spiel $alive/$total"
|
||||
override val spectating = "Zuschauen"
|
||||
override val joinNextRound = "Du steigst in der nächsten Runde ein"
|
||||
override val nextRoundPrep = "Nächste Runde startet…"
|
||||
override val spectatingSub = "Zuschauen · Nach der Runde spielst du wieder mit"
|
||||
override val leagueResult = "Liga-Ergebnis"
|
||||
override val casualResult = "Match-Ergebnis"
|
||||
override fun placementReveal(n: Int) = "Platzierung $n/10 — TR wird nach 10 Spielen enthüllt"
|
||||
override val ratingError = "Wertung konnte nicht aktualisiert werden — das Match wurde evtl. nicht gespeichert"
|
||||
override val opponent = "Gegner"
|
||||
override val scoreLabel = "Punkte"
|
||||
override val standing = "Platz"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Gewonnene Runden"
|
||||
override val customBrawl = "Custom-Brawl"
|
||||
override val requeue = "Neues Match"
|
||||
override val rematchVote = "Für Rematch stimmen"
|
||||
override val rematchCancel = "Rematch-Stimme zurückziehen"
|
||||
override fun feedForfeit(nick: String) = "$nick gibt auf"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick ist raus"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Unentschieden"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Du gewinnst!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick gewinnt"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Komm in meinen TETRIG-Custom-Raum! Code $code\n$url"
|
||||
override val share = "Teilen"
|
||||
override val searchOnPlay = "TETRIG bei Google Play suchen"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Zwischenwerbung aus · noch $minutes Min."
|
||||
override val adPlaying = "Werbung läuft…"
|
||||
override val adFreeOffer = "▶ 1 Werbung ansehen: 30 Min. keine Zwischenwerbung"
|
||||
override val adFreeNotReady = "30 Min. keine Zwischenwerbung · Werbung nicht bereit"
|
||||
override val adFreeDesc = "Sieh sie dir bis zum Ende an, und 30 Minuten lang erscheint zwischen den Spielen keine Zwischenwerbung"
|
||||
override val blockSkins = "Block-Skins"
|
||||
override val boardThemes = "Spielfeld-Designs"
|
||||
override val unlockFree = "Standard"
|
||||
override val unlockRewarded = "Per Werbung freischalten"
|
||||
override fun unlockPass(level: Int) = "Saisonpass Lv $level"
|
||||
override val equipped = "Angelegt"
|
||||
override val equip = "Anlegen"
|
||||
override val watchToUnlock = "▶ Per Werbung frei"
|
||||
override val adNotReady = "Werbung nicht bereit"
|
||||
override val badges = "Abzeichen"
|
||||
override val badgesDesc = "Erscheinen neben deinem Nickname in Lobbys und in der Rangliste. Gibt es über den Saisonpass."
|
||||
override val noBadges = "Noch keine Abzeichen"
|
||||
override val equippedUnequip = "Angelegt · Ablegen"
|
||||
override val seasonPass = "Saisonpass"
|
||||
override val seasonPassDesc = "Sammle in jedem Spiel XP und schalte Levelbelohnungen frei. Solo +10 · Custom +20 (Platz 1 +10) · Liga +25 (Sieg +15)"
|
||||
override val passComplete = "Komplett"
|
||||
override val obtained = "Erhalten"
|
||||
override val passFooter = "Belohnungen bleiben auch nach Saisonende dein."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Klassisch"; "riso" -> "Riso"; "chalk" -> "Kreide"; "outline" -> "Kontur"
|
||||
"signal" -> "Signal"; "mono" -> "Mono"; "supporter" -> "Supporter"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Tinte"; "graphite" -> "Graphit"; "oxide" -> "Oxid"; "nogrid" -> "Ohne Raster"; "moss" -> "Moos"; else -> id
|
||||
}
|
||||
override val itemSkin = "Block-Skin"
|
||||
override val itemBoard = "Spielfeld-Design"
|
||||
override val itemBadge = "Abzeichen"
|
||||
override fun badgeFinish(season: String) = "S$season FINISH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Der Nickname muss 2–12 Zeichen lang sein und darf nur aus koreanischen (Hangul) oder englischen Buchstaben, Ziffern oder _ bestehen (keine Umlaute)"
|
||||
override val srvNickGuestPattern = "Dieser Nickname sieht wie ein Gastname aus und ist nicht erlaubt"
|
||||
override val srvNickTaken = "Dieser Nickname ist schon vergeben"
|
||||
override val srvEmailInvalid = "Ungültige E-Mail-Adresse"
|
||||
override val srvPasswordShort = "Das Passwort muss mindestens 8 Zeichen lang sein"
|
||||
override val srvEmailTaken = "Diese E-Mail ist bereits registriert"
|
||||
override val srvWrongLogin = "E-Mail oder Passwort falsch"
|
||||
override val srvGoogleNotReady = "Google-Anmeldung ist noch nicht eingerichtet"
|
||||
override val srvGoogleFailed = "Google-Anmeldung fehlgeschlagen"
|
||||
override val srvLoginRequired = "Bitte melde dich an"
|
||||
override val srvGuestNick = "Gäste können ihren Nickname nicht ändern. Bitte melde dich an"
|
||||
override fun srvNickCooldown(days: Int) = "Du kannst deinen Nickname nur alle 30 Tage ändern (noch ${if (days == 1) "1 Tag" else "$days Tage"})"
|
||||
override val srvBadRecord = "Ungültiger Rekord"
|
||||
override val srvRoomCreateFailed = "Raumcode konnte nicht erstellt werden. Bitte versuche es erneut"
|
||||
override val srvBadCode = "Ungültiger Code"
|
||||
override val srvNoRoom = "Diesen Raum gibt es nicht"
|
||||
override val srvServerError = "Serverfehler"
|
||||
override val srvMatchOver = "Dieses Match ist bereits beendet"
|
||||
override val srvNotParticipant = "Du nimmst an diesem Match nicht teil"
|
||||
override val srvNeedTwo = "Zum Start braucht es mindestens 2 Spieler"
|
||||
override val srvBadBadge = "Ungültiges Abzeichen"
|
||||
override val srvNoBadge = "Du besitzt dieses Abzeichen nicht"
|
||||
}
|
||||
@@ -0,0 +1,229 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
/** 기본 언어. 기기 언어가 지원 목록에 없으면 이 문구를 쓴다. */
|
||||
object En : Strings {
|
||||
override val back = "← Back"
|
||||
override val home = "Home"
|
||||
override val exit = "Leave"
|
||||
override val cancel = "Cancel"
|
||||
override val loading = "Loading…"
|
||||
override val guest = "Guest"
|
||||
override val account = "Account"
|
||||
override val offline = "Offline"
|
||||
override val comingSoon = "Soon"
|
||||
override val shareResult = "Share result image"
|
||||
override val league = "League"
|
||||
override val custom = "Custom"
|
||||
override val win = "Victory!"
|
||||
override val lose = "Defeat"
|
||||
override val ended = "Over"
|
||||
override val disconnected = "Offline"
|
||||
override val meSuffix = " (me)"
|
||||
override fun wins(n: Int) = if (n == 1) "1 win" else "$n wins"
|
||||
override fun placement(n: Int) = "Placement $n/10"
|
||||
override val score = "Score"
|
||||
override val lines = "Lines"
|
||||
override val time = "Time"
|
||||
override val rank = "Rank"
|
||||
override val error = "Error"
|
||||
override fun errorCode(code: Int) = "Error ($code)"
|
||||
override val cannotConnect = "Can't connect to the server"
|
||||
override val connectionLost = "Connection lost"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · League"
|
||||
override val modeLeagueSub = "Real-time 1v1 ranked · 10 placement games"
|
||||
override val modeCustomSub = "Create or join with a code · No player limit"
|
||||
override val tabHome = "Home"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Profile"
|
||||
override val tabShop = "Shop"
|
||||
override val tabSettings = "Settings"
|
||||
override val noRecord = "No record"
|
||||
override val sprintDesc = "Clear 40 lines as fast as you can"
|
||||
override val timeAttackDesc = "2-minute score attack · Speeds up"
|
||||
override val endlessDesc = "Endless · Keeps going after top out"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "You continued this game, so it doesn't count toward your records or the leaderboard"
|
||||
override val playAgain = "Play again"
|
||||
|
||||
override val ghost = "Ghost piece"
|
||||
override val ghostSub = "Preview where the piece lands"
|
||||
override val lefty = "Left-handed layout"
|
||||
override val leftySub = "Mirror the control buttons"
|
||||
override val bigButtons = "Large buttons"
|
||||
override val bigButtonsSub = "Bigger buttons on tablets and foldables"
|
||||
override val adPrivacy = "Ad privacy settings"
|
||||
override val adPrivacySub = "Change your ad personalization consent"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Continue"
|
||||
override val continuedBanner = "Continued · Not recorded"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Time left $time · Score $score"
|
||||
override val continueOffer = "Watch an ad to the end to keep playing on an empty board with your score and time left (once per game).\nScores from continued games don't count toward your records or the leaderboard."
|
||||
override val loadingAd = "Loading ad…"
|
||||
override val watchToContinue = "▶ Watch an ad to continue"
|
||||
override val seeResult = "See result"
|
||||
override val hardDrop = "Hard drop"
|
||||
override val softDrop = "▼ Soft"
|
||||
override val paused = "Paused"
|
||||
override val resume = "Resume"
|
||||
|
||||
override val loginPitch = "Log in to play League, appear on the leaderboard and change your nickname. Your guest records move to your account."
|
||||
override val emailSignup = "Sign up"
|
||||
override val login = "Log in"
|
||||
override val email = "Email"
|
||||
override val passwordHint = "Password (8+ characters)"
|
||||
override val nickOptional = "Nickname (optional, 2–12 chars)"
|
||||
override val processing = "Working…"
|
||||
override val signUp = "Create account"
|
||||
override val noPasswordReset = "Password reset isn't available yet. Please remember your password."
|
||||
override val nickChangeTitle = "Change nickname (once every 30 days)"
|
||||
override val nickChange = "Change nickname"
|
||||
override val changed = "Changed"
|
||||
override val logout = "Log out"
|
||||
override val deleteConfirm = "Really delete (can't be undone)"
|
||||
override val deleteAccount = "Delete account"
|
||||
override val deleteWarning = "Your account, league rating, server records and custom match history will all be deleted. Tap again to continue."
|
||||
override val seasonRecord = "Season record"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}W ${losses}L"
|
||||
override val recentMatches = "Recent matches"
|
||||
override val noMatches = "No matches yet"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "League · ${if (won) "W" else "L"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Custom · #$place of $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "No player has finished 10 placement games yet"
|
||||
override val lbEmptySolo = "No records yet (only logged-in players are listed)"
|
||||
|
||||
override val createRoom = "Create room"
|
||||
override val createRoomDesc = "You'll get a 6-character code. Share it with friends. No player limit."
|
||||
override val creating = "Creating…"
|
||||
override val joinTitle = "Join a room"
|
||||
override val codeHint = "6-character code"
|
||||
override val join = "Join"
|
||||
override val noSuchRoom = "No room with that code"
|
||||
|
||||
override val matchFound = "Match found!"
|
||||
override val searching = "Finding an opponent"
|
||||
override fun seconds(s: String) = "${s}s"
|
||||
override val rankPending = "Rank pending"
|
||||
override val queueLong = "The wait is getting long. Try playing with friends in a custom room."
|
||||
override val openCustom = "Open a custom room"
|
||||
override val leagueNeedsLogin = "Log in to play League"
|
||||
override val queueLost = "Lost connection to the queue"
|
||||
|
||||
override val connectionClosed = "Disconnected"
|
||||
override val connecting = "Connecting"
|
||||
override val reconnecting = "Reconnecting…"
|
||||
override val customLobby = "Custom lobby"
|
||||
override val roomCode = "Room code"
|
||||
override val inviteHint = "Send friends the code or an invite link"
|
||||
override val sendInvite = "Send invite link"
|
||||
override fun playersCount(n: Int) = if (n == 1) "1 player" else "$n players"
|
||||
override val rulesHost = "Rules (host)"
|
||||
override val rules = "Rules"
|
||||
override val garbageMul = "Garbage multiplier"
|
||||
override val targetWins = "First to"
|
||||
override val unlimited = "Unlimited"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Same bag (fair)"
|
||||
override val personalBag = "Own bag"
|
||||
override val overtime = "Overtime multiplier"
|
||||
override val overtimeOn = "On (+25%/30s after 90s)"
|
||||
override val off = "Off"
|
||||
override val needTwo = "Starts with 2+ players"
|
||||
override val start = "Start"
|
||||
override val waitingHost = "Waiting for the host to start…"
|
||||
override val host = "Host"
|
||||
override val waitingOpponent = "Waiting for opponent…"
|
||||
override val forfeitExit = "Forfeit and leave"
|
||||
override val forfeit = "Forfeit"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "My wins $wins · Alive $alive/$total"
|
||||
override val spectating = "Spectating"
|
||||
override val joinNextRound = "You'll join from the next round"
|
||||
override val nextRoundPrep = "Next round starting…"
|
||||
override val spectatingSub = "Spectating · You'll play again when the round ends"
|
||||
override val leagueResult = "League result"
|
||||
override val casualResult = "Match result"
|
||||
override fun placementReveal(n: Int) = "Placement $n/10 — TR is revealed after 10 games"
|
||||
override val ratingError = "Rating update failed — this match may not have been saved"
|
||||
override val opponent = "Opponent"
|
||||
override val scoreLabel = "Score"
|
||||
override val standing = "Place"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Rounds won"
|
||||
override val customBrawl = "Custom brawl"
|
||||
override val requeue = "Find another match"
|
||||
override val rematchVote = "Vote rematch"
|
||||
override val rematchCancel = "Cancel rematch vote"
|
||||
override fun feedForfeit(nick: String) = "$nick forfeited"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick is out"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Draw"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · You win!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick wins"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Join my TETRIG custom room! Code $code\n$url"
|
||||
override val share = "Share"
|
||||
override val searchOnPlay = "Search TETRIG on Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Interstitial ads off · $minutes min left"
|
||||
override val adPlaying = "Playing ad…"
|
||||
override val adFreeOffer = "▶ Watch 1 ad to turn off interstitial ads for 30 min"
|
||||
override val adFreeNotReady = "Turn off interstitial ads for 30 min · Ad not ready"
|
||||
override val adFreeDesc = "Watch to the end and no interstitial ads will show between games for 30 minutes"
|
||||
override val blockSkins = "Block skins"
|
||||
override val boardThemes = "Board themes"
|
||||
override val unlockFree = "Default"
|
||||
override val unlockRewarded = "Unlock with an ad"
|
||||
override fun unlockPass(level: Int) = "Season pass Lv $level"
|
||||
override val equipped = "Equipped"
|
||||
override val equip = "Equip"
|
||||
override val watchToUnlock = "▶ Unlock with ad"
|
||||
override val adNotReady = "Ad not ready"
|
||||
override val badges = "Badges"
|
||||
override val badgesDesc = "Shown next to your nickname in lobbies and on the leaderboard. Earned from the season pass."
|
||||
override val noBadges = "No badges yet"
|
||||
override val equippedUnequip = "Equipped · Remove"
|
||||
override val seasonPass = "Season pass"
|
||||
override val seasonPassDesc = "Earn XP every game to unlock level rewards. Solo +10 · Custom +20 (1st +10) · League +25 (win +15)"
|
||||
override val passComplete = "Complete"
|
||||
override val obtained = "Got it"
|
||||
override val passFooter = "Rewards stay yours after the season ends."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Classic"; "riso" -> "Riso"; "chalk" -> "Chalk"; "outline" -> "Outline"
|
||||
"signal" -> "Signal"; "mono" -> "Mono"; "supporter" -> "Supporter"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Ink"; "graphite" -> "Graphite"; "oxide" -> "Oxide"; "nogrid" -> "No grid"; "moss" -> "Moss"; else -> id
|
||||
}
|
||||
override val itemSkin = "Block skin"
|
||||
override val itemBoard = "Board theme"
|
||||
override val itemBadge = "Badge"
|
||||
override fun badgeFinish(season: String) = "S$season FINISH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Nicknames must be 2–12 characters: Korean or English letters, numbers or _"
|
||||
override val srvNickGuestPattern = "That nickname looks like a guest name and can't be used"
|
||||
override val srvNickTaken = "That nickname is already taken"
|
||||
override val srvEmailInvalid = "Invalid email address"
|
||||
override val srvPasswordShort = "Password must be at least 8 characters"
|
||||
override val srvEmailTaken = "This email is already registered"
|
||||
override val srvWrongLogin = "Wrong email or password"
|
||||
override val srvGoogleNotReady = "Google sign-in isn't set up yet"
|
||||
override val srvGoogleFailed = "Google sign-in failed"
|
||||
override val srvLoginRequired = "Please log in"
|
||||
override val srvGuestNick = "Guests can't change their nickname. Please log in"
|
||||
override fun srvNickCooldown(days: Int) = "You can change your nickname once every 30 days ($days days left)"
|
||||
override val srvBadRecord = "Invalid record"
|
||||
override val srvRoomCreateFailed = "Couldn't create a room code. Please try again"
|
||||
override val srvBadCode = "Invalid code"
|
||||
override val srvNoRoom = "That room doesn't exist"
|
||||
override val srvServerError = "Server error"
|
||||
override val srvMatchOver = "This match has already ended"
|
||||
override val srvNotParticipant = "You're not in this match"
|
||||
override val srvNeedTwo = "Need at least 2 players to start"
|
||||
override val srvBadBadge = "Invalid badge"
|
||||
override val srvNoBadge = "You don't have this badge"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Es : Strings {
|
||||
override val back = "← Atrás"
|
||||
override val home = "Inicio"
|
||||
override val exit = "Salir"
|
||||
override val cancel = "Cancelar"
|
||||
override val loading = "Cargando…"
|
||||
override val guest = "Invitado"
|
||||
override val account = "Cuenta"
|
||||
override val offline = "Sin conexión"
|
||||
override val comingSoon = "Pronto"
|
||||
override val shareResult = "Compartir imagen del resultado"
|
||||
override val league = "Liga"
|
||||
override val custom = "Personalizada"
|
||||
override val win = "¡Victoria!"
|
||||
override val lose = "Derrota"
|
||||
override val ended = "Fin"
|
||||
override val disconnected = "Desconectado"
|
||||
override val meSuffix = " (yo)"
|
||||
override fun wins(n: Int) = if (n == 1) "1 victoria" else "$n victorias"
|
||||
override fun placement(n: Int) = "Colocación $n/10"
|
||||
override val score = "Puntos"
|
||||
override val lines = "Líneas"
|
||||
override val time = "Tiempo"
|
||||
override val rank = "Rango"
|
||||
override val error = "Error"
|
||||
override fun errorCode(code: Int) = "Error ($code)"
|
||||
override val cannotConnect = "No se pudo conectar con el servidor"
|
||||
override val connectionLost = "Conexión perdida"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Liga"
|
||||
override val modeLeagueSub = "1v1 clasificatorio en tiempo real · 10 partidas de colocación"
|
||||
override val modeCustomSub = "Crea una sala o únete con un código · Sin límite de jugadores"
|
||||
override val tabHome = "Inicio"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Perfil"
|
||||
override val tabShop = "Tienda"
|
||||
override val tabSettings = "Ajustes"
|
||||
override val noRecord = "Sin récord"
|
||||
override val sprintDesc = "Limpia 40 líneas lo más rápido posible"
|
||||
override val timeAttackDesc = "Ataque de puntos de 2 min · Cada vez más rápido"
|
||||
override val endlessDesc = "Sin fin · Sigues jugando tras el TOP OUT"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "Continuaste esta partida, así que no cuenta para tus récords ni para el ranking"
|
||||
override val playAgain = "Jugar de nuevo"
|
||||
|
||||
override val ghost = "Pieza fantasma"
|
||||
override val ghostSub = "Muestra dónde caerá la pieza"
|
||||
override val lefty = "Modo zurdo"
|
||||
override val leftySub = "Invierte los botones de control"
|
||||
override val bigButtons = "Botones grandes"
|
||||
override val bigButtonsSub = "Botones más grandes en tabletas y plegables"
|
||||
override val adPrivacy = "Privacidad de anuncios"
|
||||
override val adPrivacySub = "Cambia tu consentimiento de anuncios personalizados"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Continuar"
|
||||
override val continuedBanner = "Continuada · Sin registrar"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Tiempo restante $time · Puntos $score"
|
||||
override val continueOffer = "Mira un anuncio completo para seguir jugando con el tablero vacío, conservando tu puntuación y el tiempo restante (una vez por partida).\nLos puntos de las partidas continuadas no cuentan para tus récords ni para el ranking."
|
||||
override val loadingAd = "Cargando anuncio…"
|
||||
override val watchToContinue = "▶ Ver anuncio para continuar"
|
||||
override val seeResult = "Ver resultado"
|
||||
override val hardDrop = "Caída directa"
|
||||
override val softDrop = "▼ Suave"
|
||||
override val paused = "Pausa"
|
||||
override val resume = "Reanudar"
|
||||
|
||||
override val loginPitch = "Inicia sesión para jugar en la Liga, aparecer en el ranking y cambiar tu apodo. Tus récords de invitado se pasarán a tu cuenta."
|
||||
override val emailSignup = "Registro por correo"
|
||||
override val login = "Iniciar sesión"
|
||||
override val email = "Correo"
|
||||
override val passwordHint = "Contraseña (mín. 8 caracteres)"
|
||||
override val nickOptional = "Apodo (opcional, 2–12 caracteres)"
|
||||
override val processing = "Procesando…"
|
||||
override val signUp = "Crear cuenta"
|
||||
override val noPasswordReset = "Aún no es posible restablecer la contraseña. Recuerda bien la tuya."
|
||||
override val nickChangeTitle = "Cambiar apodo (una vez cada 30 días)"
|
||||
override val nickChange = "Cambiar apodo"
|
||||
override val changed = "Cambiado"
|
||||
override val logout = "Cerrar sesión"
|
||||
override val deleteConfirm = "Eliminar de verdad (no se puede deshacer)"
|
||||
override val deleteAccount = "Eliminar cuenta"
|
||||
override val deleteWarning = "Se borrarán tu cuenta, tu rating de la Liga, tus récords del servidor y tu historial de partidas personalizadas. Toca otra vez para continuar."
|
||||
override val seasonRecord = "Récord de temporada"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}V ${losses}D"
|
||||
override val recentMatches = "Partidas recientes"
|
||||
override val noMatches = "Aún no hay partidas"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Liga · ${if (won) "V" else "D"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Personalizada · puesto $place de $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Ningún jugador ha completado aún las 10 partidas de colocación"
|
||||
override val lbEmptySolo = "Aún no hay récords (solo aparecen jugadores con sesión iniciada)"
|
||||
|
||||
override val createRoom = "Crear sala"
|
||||
override val createRoomDesc = "Recibirás un código de 6 caracteres. Compártelo con tus amigos. Sin límite de jugadores."
|
||||
override val creating = "Creando…"
|
||||
override val joinTitle = "Unirse a una sala"
|
||||
override val codeHint = "Código de 6 caracteres"
|
||||
override val join = "Unirse"
|
||||
override val noSuchRoom = "No existe una sala con ese código"
|
||||
|
||||
override val matchFound = "¡Partida encontrada!"
|
||||
override val searching = "Buscando oponente"
|
||||
override fun seconds(s: String) = "${s}s"
|
||||
override val rankPending = "Rango pendiente"
|
||||
override val queueLong = "La espera se está alargando. Prueba a jugar con amigos en una sala personalizada."
|
||||
override val openCustom = "Abrir sala personalizada"
|
||||
override val leagueNeedsLogin = "Inicia sesión para jugar la Liga"
|
||||
override val queueLost = "Se perdió la conexión con la cola"
|
||||
|
||||
override val connectionClosed = "Desconectado"
|
||||
override val connecting = "Conectando"
|
||||
override val reconnecting = "Reconectando…"
|
||||
override val customLobby = "Lobby personalizado"
|
||||
override val roomCode = "Código de sala"
|
||||
override val inviteHint = "Envía a tus amigos el código o un enlace de invitación"
|
||||
override val sendInvite = "Enviar enlace de invitación"
|
||||
override fun playersCount(n: Int) = if (n == 1) "1 jugador" else "$n jugadores"
|
||||
override val rulesHost = "Reglas (anfitrión)"
|
||||
override val rules = "Reglas"
|
||||
override val garbageMul = "Multiplicador de basura"
|
||||
override val targetWins = "Gana el primero a"
|
||||
override val unlimited = "Ilimitado"
|
||||
override val seed = "Semilla"
|
||||
override val sameBag = "Misma bag (justo)"
|
||||
override val personalBag = "Bag propia"
|
||||
override val overtime = "Multiplicador de prórroga"
|
||||
override val overtimeOn = "Activado (+25%/30 s tras 90 s)"
|
||||
override val off = "Desactivado"
|
||||
override val needTwo = "Empieza con 2+ jugadores"
|
||||
override val start = "Empezar"
|
||||
override val waitingHost = "Esperando a que el anfitrión empiece…"
|
||||
override val host = "Anfitrión"
|
||||
override val waitingOpponent = "Esperando al oponente…"
|
||||
override val forfeitExit = "Rendirse y salir"
|
||||
override val forfeit = "Rendirse"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Mis victorias $wins · Vivos $alive/$total"
|
||||
override val spectating = "Espectando"
|
||||
override val joinNextRound = "Te unirás a partir de la próxima ronda"
|
||||
override val nextRoundPrep = "Preparando la siguiente ronda…"
|
||||
override val spectatingSub = "Espectando · Volverás a jugar cuando termine la ronda"
|
||||
override val leagueResult = "Resultado de la Liga"
|
||||
override val casualResult = "Resultado de la partida"
|
||||
override fun placementReveal(n: Int) = "Colocación $n/10 — el TR se revela tras 10 partidas"
|
||||
override val ratingError = "Error al actualizar el rating — puede que esta partida no se haya guardado"
|
||||
override val opponent = "Oponente"
|
||||
override val scoreLabel = "Puntos"
|
||||
override val standing = "Puesto"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Rondas ganadas"
|
||||
override val customBrawl = "Melé personalizada"
|
||||
override val requeue = "Buscar otra partida"
|
||||
override val rematchVote = "Votar revancha"
|
||||
override val rematchCancel = "Cancelar voto de revancha"
|
||||
override fun feedForfeit(nick: String) = "$nick se rindió"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who ¡KO!"
|
||||
override fun feedOut(nick: String) = "$nick eliminado"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Empate"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · ¡Ganaste!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · Gana $nick"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "¡Únete a mi sala personalizada de TETRIG! Código $code\n$url"
|
||||
override val share = "Compartir"
|
||||
override val searchOnPlay = "Busca TETRIG en Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Anuncios intersticiales desactivados · quedan $minutes min"
|
||||
override val adPlaying = "Reproduciendo anuncio…"
|
||||
override val adFreeOffer = "▶ Mira 1 anuncio y desactiva los intersticiales 30 min"
|
||||
override val adFreeNotReady = "Desactivar intersticiales 30 min · Anuncio no listo"
|
||||
override val adFreeDesc = "Míralo completo y no verás anuncios intersticiales entre partidas durante 30 minutos"
|
||||
override val blockSkins = "Skins de bloques"
|
||||
override val boardThemes = "Temas de tablero"
|
||||
override val unlockFree = "Básico"
|
||||
override val unlockRewarded = "Desbloquear con anuncio"
|
||||
override fun unlockPass(level: Int) = "Pase de temporada Lv $level"
|
||||
override val equipped = "Equipado"
|
||||
override val equip = "Equipar"
|
||||
override val watchToUnlock = "▶ Ver y obtener"
|
||||
override val adNotReady = "Anuncio no listo"
|
||||
override val badges = "Insignias"
|
||||
override val badgesDesc = "Se muestran junto a tu apodo en los lobbies y en el ranking. Se consiguen con el pase de temporada."
|
||||
override val noBadges = "Aún no tienes insignias"
|
||||
override val equippedUnequip = "Equipada · Quitar"
|
||||
override val seasonPass = "Pase de temporada"
|
||||
override val seasonPassDesc = "Gana XP en cada partida para desbloquear recompensas por nivel. Solo +10 · Personalizada +20 (1.º +10) · Liga +25 (victoria +15)"
|
||||
override val passComplete = "Completo"
|
||||
override val obtained = "Obtenido"
|
||||
override val passFooter = "Las recompensas siguen siendo tuyas cuando termina la temporada."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Clásico"; "riso" -> "Riso"; "chalk" -> "Tiza"; "outline" -> "Contorno"
|
||||
"signal" -> "Señal"; "mono" -> "Mono"; "supporter" -> "Colaborador"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Tinta"; "graphite" -> "Grafito"; "oxide" -> "Óxido"; "nogrid" -> "Sin cuadrícula"; "moss" -> "Musgo"; else -> id
|
||||
}
|
||||
override val itemSkin = "Skin de bloques"
|
||||
override val itemBoard = "Tema de tablero"
|
||||
override val itemBadge = "Insignia"
|
||||
override fun badgeFinish(season: String) = "S$season FINAL"
|
||||
override fun badgePass(season: String) = "S$season PASE"
|
||||
override fun badgeElite(season: String) = "S$season ÉLITE"
|
||||
|
||||
override val srvNickRule = "El apodo debe tener entre 2 y 12 caracteres: letras coreanas (hangul) o inglesas (sin acentos), números o _"
|
||||
override val srvNickGuestPattern = "Ese apodo parece un nombre de invitado y no se puede usar"
|
||||
override val srvNickTaken = "Ese apodo ya está en uso"
|
||||
override val srvEmailInvalid = "Correo electrónico no válido"
|
||||
override val srvPasswordShort = "La contraseña debe tener al menos 8 caracteres"
|
||||
override val srvEmailTaken = "Este correo ya está registrado"
|
||||
override val srvWrongLogin = "Correo o contraseña incorrectos"
|
||||
override val srvGoogleNotReady = "El inicio de sesión con Google aún no está configurado"
|
||||
override val srvGoogleFailed = "Error al iniciar sesión con Google"
|
||||
override val srvLoginRequired = "Inicia sesión para continuar"
|
||||
override val srvGuestNick = "Los invitados no pueden cambiar su apodo. Inicia sesión"
|
||||
override fun srvNickCooldown(days: Int) = "Puedes cambiar tu apodo una vez cada 30 días (" + (if (days == 1) "falta 1 día" else "faltan $days días") + ")"
|
||||
override val srvBadRecord = "Récord no válido"
|
||||
override val srvRoomCreateFailed = "No se pudo crear el código de sala. Inténtalo de nuevo"
|
||||
override val srvBadCode = "Código no válido"
|
||||
override val srvNoRoom = "Esa sala no existe"
|
||||
override val srvServerError = "Error del servidor"
|
||||
override val srvMatchOver = "Esta partida ya terminó"
|
||||
override val srvNotParticipant = "No participas en esta partida"
|
||||
override val srvNeedTwo = "Se necesitan al menos 2 jugadores para empezar"
|
||||
override val srvBadBadge = "Insignia no válida"
|
||||
override val srvNoBadge = "No tienes esta insignia"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Fr : Strings {
|
||||
override val back = "← Retour"
|
||||
override val home = "Accueil"
|
||||
override val exit = "Quitter"
|
||||
override val cancel = "Annuler"
|
||||
override val loading = "Chargement…"
|
||||
override val guest = "Invité"
|
||||
override val account = "Compte"
|
||||
override val offline = "Hors ligne"
|
||||
override val comingSoon = "Bientôt"
|
||||
override val shareResult = "Partager l'image du résultat"
|
||||
override val league = "Ligue"
|
||||
override val custom = "Perso"
|
||||
override val win = "Victoire !"
|
||||
override val lose = "Défaite"
|
||||
override val ended = "Fini"
|
||||
override val disconnected = "Déconnecté"
|
||||
override val meSuffix = " (moi)"
|
||||
override fun wins(n: Int) = if (n <= 1) "$n victoire" else "$n victoires"
|
||||
override fun placement(n: Int) = "Placement $n/10"
|
||||
override val score = "Score"
|
||||
override val lines = "Lignes"
|
||||
override val time = "Temps"
|
||||
override val rank = "Rang"
|
||||
override val error = "Erreur"
|
||||
override fun errorCode(code: Int) = "Erreur ($code)"
|
||||
override val cannotConnect = "Impossible de se connecter au serveur"
|
||||
override val connectionLost = "Connexion perdue"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "En ligne · Ligue"
|
||||
override val modeLeagueSub = "1v1 classé en temps réel · 10 parties de placement"
|
||||
override val modeCustomSub = "Crée une salle ou rejoins-en une avec un code · Joueurs illimités"
|
||||
override val tabHome = "Accueil"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Profil"
|
||||
override val tabShop = "Boutique"
|
||||
override val tabSettings = "Réglages"
|
||||
override val noRecord = "Aucun record"
|
||||
override val sprintDesc = "Efface 40 lignes le plus vite possible"
|
||||
override val timeAttackDesc = "Attaque de score de 2 min · Ça accélère"
|
||||
override val endlessDesc = "Sans fin · On continue après un TOP OUT"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "Tu as continué cette partie : elle ne compte ni pour tes records ni pour le classement"
|
||||
override val playAgain = "Rejouer"
|
||||
|
||||
override val ghost = "Pièce fantôme"
|
||||
override val ghostSub = "Aperçu de l'endroit où la pièce atterrit"
|
||||
override val lefty = "Mode gaucher"
|
||||
override val leftySub = "Inverse les boutons de contrôle"
|
||||
override val bigButtons = "Gros boutons"
|
||||
override val bigButtonsSub = "Boutons agrandis sur tablettes et pliables"
|
||||
override val adPrivacy = "Confidentialité des pubs"
|
||||
override val adPrivacySub = "Modifie ton consentement aux pubs personnalisées"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Continuer"
|
||||
override val continuedBanner = "Continuée · Non enregistrée"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Temps restant $time · Score $score"
|
||||
override val continueOffer = "Regarde une pub jusqu'au bout pour continuer sur un plateau vide, avec ton score et le temps restant (une fois par partie).\nLe score d'une partie continuée ne compte ni pour tes records ni pour le classement."
|
||||
override val loadingAd = "Chargement de la pub…"
|
||||
override val watchToContinue = "▶ Regarder une pub pour continuer"
|
||||
override val seeResult = "Voir le résultat"
|
||||
override val hardDrop = "Chute directe"
|
||||
override val softDrop = "▼ Douce"
|
||||
override val paused = "Pause"
|
||||
override val resume = "Reprendre"
|
||||
|
||||
override val loginPitch = "Connecte-toi pour jouer en Ligue, apparaître au classement et changer de pseudo. Tes records d'invité seront transférés vers ton compte."
|
||||
override val emailSignup = "Inscription e-mail"
|
||||
override val login = "Connexion"
|
||||
override val email = "E-mail"
|
||||
override val passwordHint = "Mot de passe (8 caractères min.)"
|
||||
override val nickOptional = "Pseudo (facultatif, 2–12 caractères)"
|
||||
override val processing = "Traitement…"
|
||||
override val signUp = "Créer un compte"
|
||||
override val noPasswordReset = "La réinitialisation du mot de passe n'est pas encore disponible. Retiens bien ton mot de passe."
|
||||
override val nickChangeTitle = "Changer de pseudo (une fois tous les 30 jours)"
|
||||
override val nickChange = "Changer de pseudo"
|
||||
override val changed = "Modifié"
|
||||
override val logout = "Se déconnecter"
|
||||
override val deleteConfirm = "Supprimer pour de bon (irréversible)"
|
||||
override val deleteAccount = "Supprimer le compte"
|
||||
override val deleteWarning = "Ton compte, ta cote en Ligue, tes records serveur et ton historique de parties perso seront supprimés. Appuie encore une fois pour continuer."
|
||||
override val seasonRecord = "Bilan de la saison"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}V ${losses}D"
|
||||
override val recentMatches = "Parties récentes"
|
||||
override val noMatches = "Aucune partie pour l'instant"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Ligue · ${if (won) "V" else "D"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Perso · #$place sur $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Aucun joueur n'a encore terminé ses 10 parties de placement"
|
||||
override val lbEmptySolo = "Aucun record pour l'instant (seuls les joueurs connectés apparaissent)"
|
||||
|
||||
override val createRoom = "Créer une salle"
|
||||
override val createRoomDesc = "Tu recevras un code à 6 caractères. Partage-le avec tes amis. Joueurs illimités."
|
||||
override val creating = "Création…"
|
||||
override val joinTitle = "Rejoindre une salle"
|
||||
override val codeHint = "Code à 6 caractères"
|
||||
override val join = "Rejoindre"
|
||||
override val noSuchRoom = "Aucune salle avec ce code"
|
||||
|
||||
override val matchFound = "Adversaire trouvé !"
|
||||
override val searching = "Recherche d'un adversaire"
|
||||
override fun seconds(s: String) = "${s} s"
|
||||
override val rankPending = "Rang en attente"
|
||||
override val queueLong = "L'attente se prolonge. Essaie de jouer entre amis dans une salle perso."
|
||||
override val openCustom = "Ouvrir une salle perso"
|
||||
override val leagueNeedsLogin = "Connecte-toi pour jouer en Ligue"
|
||||
override val queueLost = "Connexion à la file perdue"
|
||||
|
||||
override val connectionClosed = "Déconnecté"
|
||||
override val connecting = "Connexion"
|
||||
override val reconnecting = "Reconnexion…"
|
||||
override val customLobby = "Salon perso"
|
||||
override val roomCode = "Code de la salle"
|
||||
override val inviteHint = "Envoie à tes amis le code ou un lien d'invitation"
|
||||
override val sendInvite = "Envoyer le lien d'invitation"
|
||||
override fun playersCount(n: Int) = if (n <= 1) "$n joueur" else "$n joueurs"
|
||||
override val rulesHost = "Règles (hôte)"
|
||||
override val rules = "Règles"
|
||||
override val garbageMul = "Multiplicateur de garbage"
|
||||
override val targetWins = "Premier à"
|
||||
override val unlimited = "Illimité"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Même bag (équitable)"
|
||||
override val personalBag = "Bag perso"
|
||||
override val overtime = "Multiplicateur de prolongation"
|
||||
override val overtimeOn = "Activé (+25 %/30 s après 90 s)"
|
||||
override val off = "Désactivé"
|
||||
override val needTwo = "Démarre à partir de 2 joueurs"
|
||||
override val start = "Lancer"
|
||||
override val waitingHost = "En attente du lancement par l'hôte…"
|
||||
override val host = "Hôte"
|
||||
override val waitingOpponent = "En attente de l'adversaire…"
|
||||
override val forfeitExit = "Abandonner et quitter"
|
||||
override val forfeit = "Abandonner"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Mes victoires $wins · En vie $alive/$total"
|
||||
override val spectating = "Spectateur"
|
||||
override val joinNextRound = "Tu rejoindras à partir de la prochaine manche"
|
||||
override val nextRoundPrep = "Manche suivante en préparation…"
|
||||
override val spectatingSub = "Spectateur · Tu rejoues à la fin de la manche"
|
||||
override val leagueResult = "Résultat de la Ligue"
|
||||
override val casualResult = "Résultat de la partie"
|
||||
override fun placementReveal(n: Int) = "Placement $n/10 — le TR est révélé après 10 parties"
|
||||
override val ratingError = "Échec de la mise à jour de la cote — cette partie n'a peut-être pas été enregistrée"
|
||||
override val opponent = "Adversaire"
|
||||
override val scoreLabel = "Score"
|
||||
override val standing = "Place"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Manches gagnées"
|
||||
override val customBrawl = "Mêlée perso"
|
||||
override val requeue = "Chercher une autre partie"
|
||||
override val rematchVote = "Voter pour la revanche"
|
||||
override val rematchCancel = "Annuler le vote de revanche"
|
||||
override fun feedForfeit(nick: String) = "$nick a abandonné"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO !"
|
||||
override fun feedOut(nick: String) = "$nick éliminé"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Égalité"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Tu as gagné !"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick gagne"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Rejoins ma salle perso TETRIG ! Code $code\n$url"
|
||||
override val share = "Partager"
|
||||
override val searchOnPlay = "Cherche TETRIG sur Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Pubs plein écran désactivées · $minutes min restantes"
|
||||
override val adPlaying = "Pub en cours…"
|
||||
override val adFreeOffer = "▶ Regarde 1 pub pour couper les pubs plein écran 30 min"
|
||||
override val adFreeNotReady = "Couper les pubs plein écran 30 min · Pub indisponible"
|
||||
override val adFreeDesc = "Regarde-la jusqu'au bout : aucune pub plein écran entre les parties pendant 30 minutes"
|
||||
override val blockSkins = "Skins de blocs"
|
||||
override val boardThemes = "Thèmes de plateau"
|
||||
override val unlockFree = "Par défaut"
|
||||
override val unlockRewarded = "Débloquer avec une pub"
|
||||
override fun unlockPass(level: Int) = "Pass de saison Lv $level"
|
||||
override val equipped = "Équipé"
|
||||
override val equip = "Équiper"
|
||||
override val watchToUnlock = "▶ Débloquer (pub)"
|
||||
override val adNotReady = "Pub indisponible"
|
||||
override val badges = "Badges"
|
||||
override val badgesDesc = "Affichés à côté de ton pseudo dans les salons et au classement. Obtenus grâce au pass de saison."
|
||||
override val noBadges = "Aucun badge pour l'instant"
|
||||
override val equippedUnequip = "Équipé · Retirer"
|
||||
override val seasonPass = "Pass de saison"
|
||||
override val seasonPassDesc = "Gagne de l'XP à chaque partie pour débloquer des récompenses par niveau. Solo +10 · Perso +20 (1er +10) · Ligue +25 (victoire +15)"
|
||||
override val passComplete = "Terminé"
|
||||
override val obtained = "Obtenu"
|
||||
override val passFooter = "Tes récompenses restent à toi après la fin de la saison."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Classique"; "riso" -> "Riso"; "chalk" -> "Craie"; "outline" -> "Contour"
|
||||
"signal" -> "Signal"; "mono" -> "Mono"; "supporter" -> "Supporter"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Encre"; "graphite" -> "Graphite"; "oxide" -> "Oxyde"; "nogrid" -> "Sans grille"; "moss" -> "Mousse"; else -> id
|
||||
}
|
||||
override val itemSkin = "Skin de blocs"
|
||||
override val itemBoard = "Thème de plateau"
|
||||
override val itemBadge = "Badge"
|
||||
override fun badgeFinish(season: String) = "S$season COMPLET"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ÉLITE"
|
||||
|
||||
override val srvNickRule = "Le pseudo doit contenir 2 à 12 caractères : lettres coréennes (hangeul) ou anglaises (sans accents), chiffres ou _"
|
||||
override val srvNickGuestPattern = "Ce pseudo ressemble à un nom d'invité et ne peut pas être utilisé"
|
||||
override val srvNickTaken = "Ce pseudo est déjà pris"
|
||||
override val srvEmailInvalid = "Adresse e-mail invalide"
|
||||
override val srvPasswordShort = "Le mot de passe doit contenir au moins 8 caractères"
|
||||
override val srvEmailTaken = "Cet e-mail est déjà inscrit"
|
||||
override val srvWrongLogin = "E-mail ou mot de passe incorrect"
|
||||
override val srvGoogleNotReady = "La connexion Google n'est pas encore configurée"
|
||||
override val srvGoogleFailed = "Échec de la connexion Google"
|
||||
override val srvLoginRequired = "Connexion requise"
|
||||
override val srvGuestNick = "Les invités ne peuvent pas changer de pseudo. Connecte-toi"
|
||||
override fun srvNickCooldown(days: Int) = "Tu peux changer de pseudo une fois tous les 30 jours (il reste $days " + (if (days <= 1) "jour" else "jours") + ")"
|
||||
override val srvBadRecord = "Record invalide"
|
||||
override val srvRoomCreateFailed = "Impossible de créer le code de salle. Réessaie"
|
||||
override val srvBadCode = "Code invalide"
|
||||
override val srvNoRoom = "Cette salle n'existe pas"
|
||||
override val srvServerError = "Erreur serveur"
|
||||
override val srvMatchOver = "Cette partie est déjà terminée"
|
||||
override val srvNotParticipant = "Tu ne participes pas à cette partie"
|
||||
override val srvNeedTwo = "Il faut au moins 2 joueurs pour commencer"
|
||||
override val srvBadBadge = "Badge invalide"
|
||||
override val srvNoBadge = "Tu n'as pas ce badge"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Id : Strings {
|
||||
override val back = "← Kembali"
|
||||
override val home = "Beranda"
|
||||
override val exit = "Keluar"
|
||||
override val cancel = "Batal"
|
||||
override val loading = "Memuat…"
|
||||
override val guest = "Tamu"
|
||||
override val account = "Akun"
|
||||
override val offline = "Offline"
|
||||
override val comingSoon = "Segera"
|
||||
override val shareResult = "Bagikan gambar hasil"
|
||||
override val league = "Liga"
|
||||
override val custom = "Kustom"
|
||||
override val win = "Menang!"
|
||||
override val lose = "Kalah"
|
||||
override val ended = "Selesai"
|
||||
override val disconnected = "Terputus"
|
||||
override val meSuffix = " (saya)"
|
||||
override fun wins(n: Int) = "$n menang"
|
||||
override fun placement(n: Int) = "Penempatan $n/10"
|
||||
override val score = "Skor"
|
||||
override val lines = "Baris"
|
||||
override val time = "Waktu"
|
||||
override val rank = "Peringkat"
|
||||
override val error = "Kesalahan"
|
||||
override fun errorCode(code: Int) = "Kesalahan ($code)"
|
||||
override val cannotConnect = "Tidak dapat terhubung ke server"
|
||||
override val connectionLost = "Koneksi terputus"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Liga"
|
||||
override val modeLeagueSub = "Ranked 1v1 real-time · 10 laga penempatan"
|
||||
override val modeCustomSub = "Buat atau gabung dengan kode · Pemain tanpa batas"
|
||||
override val tabHome = "Beranda"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Profil"
|
||||
override val tabShop = "Toko"
|
||||
override val tabSettings = "Setelan"
|
||||
override val noRecord = "Belum ada rekor"
|
||||
override val sprintDesc = "Bersihkan 40 baris secepat mungkin"
|
||||
override val timeAttackDesc = "Adu skor 2 menit · Makin cepat"
|
||||
override val endlessDesc = "Tanpa akhir · Lanjut meski TOP OUT"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "Game ini dilanjutkan, jadi tidak dihitung dalam rekor maupun papan peringkat"
|
||||
override val playAgain = "Main lagi"
|
||||
|
||||
override val ghost = "Bayangan blok"
|
||||
override val ghostSub = "Pratinjau posisi mendarat"
|
||||
override val lefty = "Tata letak kidal"
|
||||
override val leftySub = "Balik posisi tombol kontrol"
|
||||
override val bigButtons = "Tombol besar"
|
||||
override val bigButtonsSub = "Tombol lebih besar di tablet dan ponsel lipat"
|
||||
override val adPrivacy = "Privasi iklan"
|
||||
override val adPrivacySub = "Ubah persetujuan personalisasi iklan"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Lanjut"
|
||||
override val continuedBanner = "Dilanjutkan · Tidak tercatat"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Sisa waktu $time · Skor $score"
|
||||
override val continueOffer = "Tonton iklan sampai selesai untuk lanjut bermain di papan kosong dengan skor dan sisa waktu yang sama (sekali per game).\nSkor dari game yang dilanjutkan tidak dihitung dalam rekor maupun papan peringkat."
|
||||
override val loadingAd = "Memuat iklan…"
|
||||
override val watchToContinue = "▶ Tonton iklan untuk lanjut"
|
||||
override val seeResult = "Lihat hasil"
|
||||
override val hardDrop = "Hard drop"
|
||||
override val softDrop = "▼ Soft"
|
||||
override val paused = "Jeda"
|
||||
override val resume = "Lanjutkan"
|
||||
|
||||
override val loginPitch = "Masuk untuk main Liga, tampil di papan peringkat, dan mengganti nama panggilan. Rekor tamu kamu akan dipindahkan ke akun."
|
||||
override val emailSignup = "Daftar"
|
||||
override val login = "Masuk"
|
||||
override val email = "Email"
|
||||
override val passwordHint = "Kata sandi (min. 8 karakter)"
|
||||
override val nickOptional = "Nama panggilan (opsional, 2–12 karakter)"
|
||||
override val processing = "Memproses…"
|
||||
override val signUp = "Buat akun"
|
||||
override val noPasswordReset = "Reset kata sandi belum tersedia. Ingat baik-baik kata sandimu."
|
||||
override val nickChangeTitle = "Ganti nama panggilan (sekali per 30 hari)"
|
||||
override val nickChange = "Ganti nama panggilan"
|
||||
override val changed = "Berhasil diubah"
|
||||
override val logout = "Keluar akun"
|
||||
override val deleteConfirm = "Yakin hapus (tidak bisa dibatalkan)"
|
||||
override val deleteAccount = "Hapus akun"
|
||||
override val deleteWarning = "Akun, rating liga, rekor di server, dan riwayat laga kustom akan dihapus semua. Ketuk sekali lagi untuk melanjutkan."
|
||||
override val seasonRecord = "Rekor musim"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}M ${losses}K"
|
||||
override val recentMatches = "Laga terbaru"
|
||||
override val noMatches = "Belum ada laga"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Liga · ${if (won) "Menang" else "Kalah"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Kustom · #$place dari $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Belum ada pemain yang menyelesaikan 10 laga penempatan"
|
||||
override val lbEmptySolo = "Belum ada rekor (hanya pemain yang masuk akun yang tercatat)"
|
||||
|
||||
override val createRoom = "Buat ruang"
|
||||
override val createRoomDesc = "Kamu akan mendapat kode 6 karakter. Bagikan ke teman. Pemain tanpa batas."
|
||||
override val creating = "Membuat…"
|
||||
override val joinTitle = "Gabung ruang"
|
||||
override val codeHint = "Kode 6 karakter"
|
||||
override val join = "Gabung"
|
||||
override val noSuchRoom = "Ruang dengan kode itu tidak ada"
|
||||
|
||||
override val matchFound = "Lawan ditemukan!"
|
||||
override val searching = "Mencari lawan"
|
||||
override fun seconds(s: String) = "${s} dtk"
|
||||
override val rankPending = "Peringkat dihitung"
|
||||
override val queueLong = "Antrean mulai lama. Coba main bareng teman di ruang kustom."
|
||||
override val openCustom = "Buka ruang kustom"
|
||||
override val leagueNeedsLogin = "Masuk dulu untuk main Liga"
|
||||
override val queueLost = "Koneksi antrean terputus"
|
||||
|
||||
override val connectionClosed = "Terputus"
|
||||
override val connecting = "Menghubungkan"
|
||||
override val reconnecting = "Menyambung ulang…"
|
||||
override val customLobby = "Lobi kustom"
|
||||
override val roomCode = "Kode ruang"
|
||||
override val inviteHint = "Kirim kode atau tautan undangan ke teman"
|
||||
override val sendInvite = "Kirim tautan undangan"
|
||||
override fun playersCount(n: Int) = "$n pemain"
|
||||
override val rulesHost = "Aturan (host)"
|
||||
override val rules = "Aturan"
|
||||
override val garbageMul = "Pengali garbage"
|
||||
override val targetWins = "Target menang"
|
||||
override val unlimited = "Tanpa batas"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Bag sama (adil)"
|
||||
override val personalBag = "Bag sendiri"
|
||||
override val overtime = "Pengali overtime"
|
||||
override val overtimeOn = "Aktif (+25%/30 dtk setelah 90 dtk)"
|
||||
override val off = "Mati"
|
||||
override val needTwo = "Mulai jika ada 2+ pemain"
|
||||
override val start = "Mulai"
|
||||
override val waitingHost = "Menunggu host memulai…"
|
||||
override val host = "Host"
|
||||
override val waitingOpponent = "Menunggu lawan…"
|
||||
override val forfeitExit = "Menyerah dan keluar"
|
||||
override val forfeit = "Menyerah"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Menangku $wins · Hidup $alive/$total"
|
||||
override val spectating = "Menonton"
|
||||
override val joinNextRound = "Kamu ikut mulai ronde berikutnya"
|
||||
override val nextRoundPrep = "Ronde berikutnya segera dimulai…"
|
||||
override val spectatingSub = "Menonton · Kamu main lagi setelah ronde selesai"
|
||||
override val leagueResult = "Hasil Liga"
|
||||
override val casualResult = "Hasil laga"
|
||||
override fun placementReveal(n: Int) = "Penempatan $n/10 — TR terlihat setelah 10 laga"
|
||||
override val ratingError = "Gagal memperbarui rating — laga ini mungkin tidak tersimpan"
|
||||
override val opponent = "Lawan"
|
||||
override val scoreLabel = "Skor"
|
||||
override val standing = "Posisi"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Ronde menang"
|
||||
override val customBrawl = "Brawl kustom"
|
||||
override val requeue = "Cari laga lagi"
|
||||
override val rematchVote = "Vote rematch"
|
||||
override val rematchCancel = "Batalkan vote rematch"
|
||||
override fun feedForfeit(nick: String) = "$nick menyerah"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick tersingkir"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Seri"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Kamu menang!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick menang"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Gabung ke ruang kustom TETRIG-ku! Kode $code\n$url"
|
||||
override val share = "Bagikan"
|
||||
override val searchOnPlay = "Cari TETRIG di Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Iklan sela mati · sisa $minutes mnt"
|
||||
override val adPlaying = "Memutar iklan…"
|
||||
override val adFreeOffer = "▶ Tonton 1 iklan untuk mematikan iklan sela 30 menit"
|
||||
override val adFreeNotReady = "Matikan iklan sela 30 menit · Iklan belum siap"
|
||||
override val adFreeDesc = "Tonton sampai selesai, dan iklan sela di antara game tidak muncul selama 30 menit"
|
||||
override val blockSkins = "Skin blok"
|
||||
override val boardThemes = "Tema papan"
|
||||
override val unlockFree = "Bawaan"
|
||||
override val unlockRewarded = "Buka dengan iklan"
|
||||
override fun unlockPass(level: Int) = "Season pass Lv $level"
|
||||
override val equipped = "Dipakai"
|
||||
override val equip = "Pakai"
|
||||
override val watchToUnlock = "▶ Tonton & buka"
|
||||
override val adNotReady = "Iklan belum siap"
|
||||
override val badges = "Lencana"
|
||||
override val badgesDesc = "Tampil di samping nama panggilanmu di lobi dan papan peringkat. Didapat dari season pass."
|
||||
override val noBadges = "Belum punya lencana"
|
||||
override val equippedUnequip = "Dipakai · Lepas"
|
||||
override val seasonPass = "Season pass"
|
||||
override val seasonPassDesc = "Kumpulkan XP di setiap game untuk membuka hadiah level. Solo +10 · Kustom +20 (peringkat 1 +10) · Liga +25 (menang +15)"
|
||||
override val passComplete = "Tamat"
|
||||
override val obtained = "Didapat"
|
||||
override val passFooter = "Hadiah yang sudah didapat tetap jadi milikmu setelah musim berakhir."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Klasik"; "riso" -> "Riso"; "chalk" -> "Kapur"; "outline" -> "Garis tepi"
|
||||
"signal" -> "Sinyal"; "mono" -> "Mono"; "supporter" -> "Supporter"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Tinta"; "graphite" -> "Grafit"; "oxide" -> "Oksida"; "nogrid" -> "Tanpa grid"; "moss" -> "Lumut"; else -> id
|
||||
}
|
||||
override val itemSkin = "Skin blok"
|
||||
override val itemBoard = "Tema papan"
|
||||
override val itemBadge = "Lencana"
|
||||
override fun badgeFinish(season: String) = "S$season TAMAT"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Nama panggilan harus 2–12 karakter: huruf Korea (Hangul), huruf Inggris, angka, atau _"
|
||||
override val srvNickGuestPattern = "Nama itu menyerupai nama tamu dan tidak bisa dipakai"
|
||||
override val srvNickTaken = "Nama panggilan itu sudah dipakai"
|
||||
override val srvEmailInvalid = "Alamat email tidak valid"
|
||||
override val srvPasswordShort = "Kata sandi minimal 8 karakter"
|
||||
override val srvEmailTaken = "Email ini sudah terdaftar"
|
||||
override val srvWrongLogin = "Email atau kata sandi salah"
|
||||
override val srvGoogleNotReady = "Masuk dengan Google belum disiapkan"
|
||||
override val srvGoogleFailed = "Masuk dengan Google gagal"
|
||||
override val srvLoginRequired = "Silakan masuk dulu"
|
||||
override val srvGuestNick = "Tamu tidak bisa mengganti nama panggilan. Silakan masuk"
|
||||
override fun srvNickCooldown(days: Int) = "Nama panggilan hanya bisa diganti sekali per 30 hari (sisa $days hari)"
|
||||
override val srvBadRecord = "Rekor tidak valid"
|
||||
override val srvRoomCreateFailed = "Gagal membuat kode ruang. Silakan coba lagi"
|
||||
override val srvBadCode = "Kode tidak valid"
|
||||
override val srvNoRoom = "Ruang itu tidak ada"
|
||||
override val srvServerError = "Kesalahan server"
|
||||
override val srvMatchOver = "Laga ini sudah berakhir"
|
||||
override val srvNotParticipant = "Kamu bukan peserta laga ini"
|
||||
override val srvNeedTwo = "Minimal 2 pemain untuk memulai"
|
||||
override val srvBadBadge = "Lencana tidak valid"
|
||||
override val srvNoBadge = "Kamu tidak memiliki lencana ini"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Ja : Strings {
|
||||
override val back = "← 戻る"
|
||||
override val home = "ホームへ"
|
||||
override val exit = "退出"
|
||||
override val cancel = "キャンセル"
|
||||
override val loading = "読み込み中…"
|
||||
override val guest = "ゲスト"
|
||||
override val account = "アカウント"
|
||||
override val offline = "オフライン"
|
||||
override val comingSoon = "準備中"
|
||||
override val shareResult = "結果画像を共有"
|
||||
override val league = "リーグ戦"
|
||||
override val custom = "カスタム"
|
||||
override val win = "勝利!"
|
||||
override val lose = "敗北"
|
||||
override val ended = "終了"
|
||||
override val disconnected = "切断"
|
||||
override val meSuffix = " (自分)"
|
||||
override fun wins(n: Int) = "${n}勝"
|
||||
override fun placement(n: Int) = "配置戦 $n/10"
|
||||
override val score = "スコア"
|
||||
override val lines = "ライン"
|
||||
override val time = "タイム"
|
||||
override val rank = "ランク"
|
||||
override val error = "エラー"
|
||||
override fun errorCode(code: Int) = "エラー ($code)"
|
||||
override val cannotConnect = "サーバーに接続できません"
|
||||
override val connectionLost = "接続が切断されました"
|
||||
|
||||
override val solo = "ソロ"
|
||||
override val modeLeague = "オンライン · リーグ戦"
|
||||
override val modeLeagueSub = "リアルタイム1対1ランクマッチ · 配置戦10試合"
|
||||
override val modeCustomSub = "コードで作成・参加 · 人数制限なし"
|
||||
override val tabHome = "ホーム"
|
||||
override val tabLeaderboard = "ランキング"
|
||||
override val tabProfile = "プロフ"
|
||||
override val tabShop = "ショップ"
|
||||
override val tabSettings = "設定"
|
||||
override val noRecord = "記録なし"
|
||||
override val sprintDesc = "40ラインを最速でクリア"
|
||||
override val timeAttackDesc = "2分間スコアアタック · 徐々に加速"
|
||||
override val endlessDesc = "エンドレス · TOP OUTしても続行"
|
||||
override val versusDesc = "対戦"
|
||||
|
||||
override val continuedNotRecorded = "コンティニューを使った試合のため、記録・ランキングには反映されません"
|
||||
override val playAgain = "もう一度"
|
||||
|
||||
override val ghost = "ゴースト表示"
|
||||
override val ghostSub = "落下位置をプレビュー"
|
||||
override val lefty = "左手モード"
|
||||
override val leftySub = "操作ボタンを左右反転"
|
||||
override val bigButtons = "大きなボタン"
|
||||
override val bigButtonsSub = "タブレット・折りたたみ端末でボタンを拡大"
|
||||
override val adPrivacy = "広告のプライバシー設定"
|
||||
override val adPrivacySub = "広告のパーソナライズに関する同意を選び直します"
|
||||
|
||||
override val topOutContinue = "TOP OUT · 続ける"
|
||||
override val continuedBanner = "コンティニュー · 記録対象外"
|
||||
override fun timeLeftScore(time: String, score: Int) = "残り時間 $time · スコア $score"
|
||||
override val continueOffer = "広告を最後まで見ると、空のボードでスコアと残り時間はそのままに続きから遊べます (1試合1回)。\nコンティニューした試合のスコアは、自分の記録とランキングには反映されません。"
|
||||
override val loadingAd = "広告を読み込み中…"
|
||||
override val watchToContinue = "▶ 広告を見て続ける"
|
||||
override val seeResult = "結果を見る"
|
||||
override val hardDrop = "ハードドロップ"
|
||||
override val softDrop = "▼ ソフト"
|
||||
override val paused = "一時停止中"
|
||||
override val resume = "再開"
|
||||
|
||||
override val loginPitch = "ログインすると、リーグ戦への参加、ランキング登録、ニックネームの変更ができます。これまでのゲスト記録はアカウントに引き継がれます。"
|
||||
override val emailSignup = "メールで登録"
|
||||
override val login = "ログイン"
|
||||
override val email = "メールアドレス"
|
||||
override val passwordHint = "パスワード (8文字以上)"
|
||||
override val nickOptional = "ニックネーム (任意、2〜12文字)"
|
||||
override val processing = "処理中…"
|
||||
override val signUp = "登録する"
|
||||
override val noPasswordReset = "パスワードの再設定にはまだ対応していません。パスワードは忘れないようにしてください。"
|
||||
override val nickChangeTitle = "ニックネーム変更 (30日に1回)"
|
||||
override val nickChange = "ニックネームを変更"
|
||||
override val changed = "変更しました"
|
||||
override val logout = "ログアウト"
|
||||
override val deleteConfirm = "本当に削除する (元に戻せません)"
|
||||
override val deleteAccount = "アカウント削除"
|
||||
override val deleteWarning = "アカウント、リーグレーティング、サーバー記録、カスタム戦績がすべて削除されます。もう一度タップすると実行します。"
|
||||
override val seasonRecord = "シーズン戦績"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}勝${losses}敗"
|
||||
override val recentMatches = "最近の戦績"
|
||||
override val noMatches = "対戦記録はまだありません"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "リーグ · ${if (won) "勝" else "敗"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "カスタム · ${size}人中${place}位 · ${wins}勝"
|
||||
|
||||
override val lbEmptyLeague = "配置戦10試合を終えたプレイヤーはまだいません"
|
||||
override val lbEmptySolo = "記録はまだありません (ログイン済みのプレイヤーのみ掲載)"
|
||||
|
||||
override val createRoom = "ルームを作成"
|
||||
override val createRoomDesc = "6桁のコードが発行されます。友達にコードを伝えましょう。人数制限なし。"
|
||||
override val creating = "作成中…"
|
||||
override val joinTitle = "参加する"
|
||||
override val codeHint = "6桁のコード"
|
||||
override val join = "参加"
|
||||
override val noSuchRoom = "そのコードのルームはありません"
|
||||
|
||||
override val matchFound = "マッチ成立!"
|
||||
override val searching = "対戦相手を探しています"
|
||||
override fun seconds(s: String) = "${s}秒"
|
||||
override val rankPending = "ランク算出中"
|
||||
override val queueLong = "待ち時間が長くなっています。カスタムルームで友達と遊んでみましょう。"
|
||||
override val openCustom = "カスタムルームを開く"
|
||||
override val leagueNeedsLogin = "リーグ戦はログイン後に参加できます"
|
||||
override val queueLost = "マッチング待機の接続が切れました"
|
||||
|
||||
override val connectionClosed = "接続終了"
|
||||
override val connecting = "接続中"
|
||||
override val reconnecting = "再接続中…"
|
||||
override val customLobby = "カスタムロビー"
|
||||
override val roomCode = "ルームコード"
|
||||
override val inviteHint = "友達にコードか招待リンクを送りましょう"
|
||||
override val sendInvite = "招待リンクを送る"
|
||||
override fun playersCount(n: Int) = "参加者${n}人"
|
||||
override val rulesHost = "ルール (ホスト)"
|
||||
override val rules = "ルール"
|
||||
override val garbageMul = "お邪魔ライン倍率"
|
||||
override val targetWins = "目標勝利数"
|
||||
override val unlimited = "無制限"
|
||||
override val seed = "シード"
|
||||
override val sameBag = "同一 bag (公平戦)"
|
||||
override val personalBag = "個別 bag"
|
||||
override val overtime = "延長戦倍率"
|
||||
override val overtimeOn = "オン (90秒後、30秒ごとに+25%)"
|
||||
override val off = "オフ"
|
||||
override val needTwo = "2人以上で開始"
|
||||
override val start = "開始"
|
||||
override val waitingHost = "ホストの開始を待っています…"
|
||||
override val host = "ホスト"
|
||||
override val waitingOpponent = "相手の接続を待っています…"
|
||||
override val forfeitExit = "降参して退出"
|
||||
override val forfeit = "降参"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "自分の勝利数 $wins · 生存 $alive/$total"
|
||||
override val spectating = "観戦中"
|
||||
override val joinNextRound = "次のラウンドから参加します"
|
||||
override val nextRoundPrep = "次のラウンドを準備中…"
|
||||
override val spectatingSub = "観戦中 · ラウンド終了後にまた始まります"
|
||||
override val leagueResult = "リーグ戦の結果"
|
||||
override val casualResult = "フリーマッチの結果"
|
||||
override fun placementReveal(n: Int) = "配置戦 $n/10 — 10試合後にTRを公開"
|
||||
override val ratingError = "レーティング反映中にエラーが発生しました — 戦績が保存されていない可能性があります"
|
||||
override val opponent = "対戦相手"
|
||||
override val scoreLabel = "スコア"
|
||||
override val standing = "順位"
|
||||
override fun placeOf(place: Int, total: Int) = "${place}位 / ${total}人"
|
||||
override val roundWins = "ラウンド勝利数"
|
||||
override val customBrawl = "カスタム乱戦"
|
||||
override val requeue = "もう一度マッチング"
|
||||
override val rematchVote = "リマッチに投票"
|
||||
override val rematchCancel = "リマッチ投票を取り消す"
|
||||
override fun feedForfeit(nick: String) = "${nick}が降参"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "${nick}が脱落"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · 引き分け"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · 勝利!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · ${nick}の勝利"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "TETRIGのカスタムルームに招待します! コード $code\n$url"
|
||||
override val share = "共有"
|
||||
override val searchOnPlay = "Google PlayでTETRIGを検索"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "全画面広告オフ · 残り${minutes}分"
|
||||
override val adPlaying = "広告を再生中…"
|
||||
override val adFreeOffer = "▶ 広告を1本見て30分間、全画面広告をオフ"
|
||||
override val adFreeNotReady = "30分間全画面広告をオフ · 広告準備中"
|
||||
override val adFreeDesc = "最後まで見ると、30分間は試合の合間に全画面広告が表示されません"
|
||||
override val blockSkins = "ブロックスキン"
|
||||
override val boardThemes = "ボードテーマ"
|
||||
override val unlockFree = "デフォルト"
|
||||
override val unlockRewarded = "広告で解放"
|
||||
override fun unlockPass(level: Int) = "シーズンパス Lv $level"
|
||||
override val equipped = "装備中"
|
||||
override val equip = "装備"
|
||||
override val watchToUnlock = "▶ 広告を見て解放"
|
||||
override val adNotReady = "広告準備中"
|
||||
override val badges = "バッジ"
|
||||
override val badgesDesc = "ニックネームの横に表示され、ロビーやランキングで他のプレイヤーから見えます。シーズンパスで獲得できます。"
|
||||
override val noBadges = "所持しているバッジはまだありません"
|
||||
override val equippedUnequip = "装備中 · 外す"
|
||||
override val seasonPass = "シーズンパス"
|
||||
override val seasonPassDesc = "プレイするほどXPが貯まり、レベル報酬を受け取れます。ソロ1試合 +10 · カスタム +20 (1位 +10) · リーグ +25 (勝利 +15)"
|
||||
override val passComplete = "完走"
|
||||
override val obtained = "獲得済み"
|
||||
override val passFooter = "獲得した報酬はシーズン終了後も使えます。"
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "クラシック"; "riso" -> "リソ"; "chalk" -> "チョーク"; "outline" -> "アウトライン"
|
||||
"signal" -> "シグナル"; "mono" -> "モノ"; "supporter" -> "サポーター"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "インク"; "graphite" -> "グラファイト"; "oxide" -> "酸化鉄"; "nogrid" -> "グリッドなし"; "moss" -> "苔"; else -> id
|
||||
}
|
||||
override val itemSkin = "ブロックスキン"
|
||||
override val itemBoard = "ボードテーマ"
|
||||
override val itemBadge = "バッジ"
|
||||
override fun badgeFinish(season: String) = "S$season 完走"
|
||||
override fun badgePass(season: String) = "S$season パス"
|
||||
override fun badgeElite(season: String) = "S$season エリート"
|
||||
|
||||
override val srvNickRule = "ニックネームは2〜12文字の韓国語 (ハングル)・英字・数字・_ のみ使用できます"
|
||||
override val srvNickGuestPattern = "ゲスト名の形式は使用できません"
|
||||
override val srvNickTaken = "すでに使われているニックネームです"
|
||||
override val srvEmailInvalid = "メールアドレスの形式が正しくありません"
|
||||
override val srvPasswordShort = "パスワードは8文字以上にしてください"
|
||||
override val srvEmailTaken = "すでに登録されているメールアドレスです"
|
||||
override val srvWrongLogin = "メールアドレスまたはパスワードが違います"
|
||||
override val srvGoogleNotReady = "Googleログインはまだ設定されていません"
|
||||
override val srvGoogleFailed = "Google認証に失敗しました"
|
||||
override val srvLoginRequired = "ログインが必要です"
|
||||
override val srvGuestNick = "ゲストはニックネームを変更できません。ログインしてください"
|
||||
override fun srvNickCooldown(days: Int) = "ニックネームは30日に1回変更できます (あと${days}日)"
|
||||
override val srvBadRecord = "無効な記録です"
|
||||
override val srvRoomCreateFailed = "ルームコードを作成できませんでした。もう一度お試しください"
|
||||
override val srvBadCode = "無効なコードです"
|
||||
override val srvNoRoom = "存在しないルームです"
|
||||
override val srvServerError = "サーバーエラー"
|
||||
override val srvMatchOver = "すでに終了した試合です"
|
||||
override val srvNotParticipant = "この試合の参加者ではありません"
|
||||
override val srvNeedTwo = "開始するには2人以上必要です"
|
||||
override val srvBadBadge = "無効なバッジです"
|
||||
override val srvNoBadge = "所持していないバッジです"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Ko : Strings {
|
||||
override val back = "← 뒤로"
|
||||
override val home = "홈으로"
|
||||
override val exit = "나가기"
|
||||
override val cancel = "취소"
|
||||
override val loading = "불러오는 중…"
|
||||
override val guest = "게스트"
|
||||
override val account = "계정"
|
||||
override val offline = "오프라인"
|
||||
override val comingSoon = "준비 중"
|
||||
override val shareResult = "결과 이미지 공유"
|
||||
override val league = "리그전"
|
||||
override val custom = "커스텀"
|
||||
override val win = "승리!"
|
||||
override val lose = "패배"
|
||||
override val ended = "종료"
|
||||
override val disconnected = "끊김"
|
||||
override val meSuffix = " (나)"
|
||||
override fun wins(n: Int) = "${n}승"
|
||||
override fun placement(n: Int) = "배치 $n/10"
|
||||
override val score = "점수"
|
||||
override val lines = "라인"
|
||||
override val time = "시간"
|
||||
override val rank = "랭크"
|
||||
override val error = "오류"
|
||||
override fun errorCode(code: Int) = "오류 ($code)"
|
||||
override val cannotConnect = "서버에 연결할 수 없습니다"
|
||||
override val connectionLost = "연결이 끊겼습니다"
|
||||
|
||||
override val solo = "솔로"
|
||||
override val modeLeague = "멀티 · 리그전"
|
||||
override val modeLeagueSub = "실시간 1:1 랭크 매치 · 배치 10경기"
|
||||
override val modeCustomSub = "코드로 만들고 참가 · 인원 제한 없음"
|
||||
override val tabHome = "홈"
|
||||
override val tabLeaderboard = "리더보드"
|
||||
override val tabProfile = "프로필"
|
||||
override val tabShop = "상점"
|
||||
override val tabSettings = "설정"
|
||||
override val noRecord = "기록 없음"
|
||||
override val sprintDesc = "40줄 최속 클리어"
|
||||
override val timeAttackDesc = "2분 점수 어택 · 레벨 가속"
|
||||
override val endlessDesc = "무한 · 톱아웃해도 계속"
|
||||
override val versusDesc = "대전"
|
||||
|
||||
override val continuedNotRecorded = "이어하기를 쓴 판이라 기록·리더보드에 반영되지 않았습니다"
|
||||
override val playAgain = "다시 하기"
|
||||
|
||||
override val ghost = "고스트 표시"
|
||||
override val ghostSub = "착지 위치 미리보기"
|
||||
override val lefty = "왼손 배치"
|
||||
override val leftySub = "조작 버튼 좌우 반전"
|
||||
override val bigButtons = "큰 버튼"
|
||||
override val bigButtonsSub = "태블릿·폴드에서 버튼 확대"
|
||||
override val adPrivacy = "광고 개인정보 설정"
|
||||
override val adPrivacySub = "광고 맞춤 설정 동의를 다시 선택합니다"
|
||||
|
||||
override val topOutContinue = "TOP OUT · 계속"
|
||||
override val continuedBanner = "이어하기 · 기록 미반영"
|
||||
override fun timeLeftScore(time: String, score: Int) = "남은 시간 $time · 점수 $score"
|
||||
override val continueOffer = "광고를 끝까지 보면 빈 보드에서 점수와 남은 시간 그대로 이어서 할 수 있습니다 (1판 1회).\n이어한 판의 점수는 내 기록과 리더보드에 올라가지 않습니다."
|
||||
override val loadingAd = "광고 불러오는 중…"
|
||||
override val watchToContinue = "▶ 광고 보고 이어하기"
|
||||
override val seeResult = "결과 보기"
|
||||
override val hardDrop = "하드 드롭"
|
||||
override val softDrop = "▼ 소프트"
|
||||
override val paused = "일시정지"
|
||||
override val resume = "계속하기"
|
||||
|
||||
override val loginPitch = "로그인하면 리그전 참가, 리더보드 등록, 닉네임 변경이 가능합니다. 지금까지의 게스트 기록은 계정으로 옮겨집니다."
|
||||
override val emailSignup = "이메일 가입"
|
||||
override val login = "로그인"
|
||||
override val email = "이메일"
|
||||
override val passwordHint = "비밀번호 (8자 이상)"
|
||||
override val nickOptional = "닉네임 (선택, 2~12자)"
|
||||
override val processing = "처리 중…"
|
||||
override val signUp = "가입하기"
|
||||
override val noPasswordReset = "비밀번호 재설정은 아직 지원하지 않습니다. 비밀번호를 꼭 기억해 주세요."
|
||||
override val nickChangeTitle = "닉네임 변경 (30일에 1회)"
|
||||
override val nickChange = "닉네임 변경"
|
||||
override val changed = "변경되었습니다"
|
||||
override val logout = "로그아웃"
|
||||
override val deleteConfirm = "정말 삭제합니다 (되돌릴 수 없음)"
|
||||
override val deleteAccount = "계정 삭제"
|
||||
override val deleteWarning = "계정, 리그 레이팅, 서버 기록, 커스텀 전적이 모두 삭제됩니다. 한 번 더 누르면 진행합니다."
|
||||
override val seasonRecord = "시즌 전적"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}승 ${losses}패"
|
||||
override val recentMatches = "최근 전적"
|
||||
override val noMatches = "아직 대전 기록이 없습니다"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "리그 · ${if (won) "승" else "패"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "커스텀 · ${size}인 중 ${place}위 · ${wins}승"
|
||||
|
||||
override val lbEmptyLeague = "아직 배치 10경기를 마친 플레이어가 없습니다"
|
||||
override val lbEmptySolo = "아직 등록된 기록이 없습니다 (로그인한 플레이어만 등재)"
|
||||
|
||||
override val createRoom = "방 만들기"
|
||||
override val createRoomDesc = "6자리 코드가 발급됩니다. 친구에게 코드를 알려주세요. 인원 제한 없음."
|
||||
override val creating = "만드는 중…"
|
||||
override val joinTitle = "참가하기"
|
||||
override val codeHint = "코드 6자리"
|
||||
override val join = "참가"
|
||||
override val noSuchRoom = "없는 방 코드입니다"
|
||||
|
||||
override val matchFound = "매칭 완료!"
|
||||
override val searching = "상대 찾는 중"
|
||||
override fun seconds(s: String) = "${s}초"
|
||||
override val rankPending = "랭크 산정 중"
|
||||
override val queueLong = "대기가 길어지고 있습니다. 커스텀 룸에서 친구와 플레이해 보세요."
|
||||
override val openCustom = "커스텀 룸 열기"
|
||||
override val leagueNeedsLogin = "리그전은 로그인 후 참가할 수 있습니다"
|
||||
override val queueLost = "대기열 연결이 끊겼습니다"
|
||||
|
||||
override val connectionClosed = "연결 종료"
|
||||
override val connecting = "연결 중"
|
||||
override val reconnecting = "재접속 중…"
|
||||
override val customLobby = "커스텀 로비"
|
||||
override val roomCode = "방 코드"
|
||||
override val inviteHint = "친구에게 코드나 초대 링크를 보내세요"
|
||||
override val sendInvite = "초대 링크 보내기"
|
||||
override fun playersCount(n: Int) = "참가자 ${n}명"
|
||||
override val rulesHost = "규칙 (호스트)"
|
||||
override val rules = "규칙"
|
||||
override val garbageMul = "가비지 배율"
|
||||
override val targetWins = "목표 승수"
|
||||
override val unlimited = "무제한"
|
||||
override val seed = "시드"
|
||||
override val sameBag = "동일 bag (공정전)"
|
||||
override val personalBag = "개인 bag"
|
||||
override val overtime = "장기전 배율"
|
||||
override val overtimeOn = "켬 (90초 후 +25%/30초)"
|
||||
override val off = "끔"
|
||||
override val needTwo = "2명 이상 모이면 시작"
|
||||
override val start = "시작"
|
||||
override val waitingHost = "호스트가 시작하기를 기다리는 중…"
|
||||
override val host = "호스트"
|
||||
override val waitingOpponent = "상대 접속 대기 중…"
|
||||
override val forfeitExit = "기권하고 나가기"
|
||||
override val forfeit = "기권"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "내 승수 $wins · 생존 $alive/$total"
|
||||
override val spectating = "관전 중"
|
||||
override val joinNextRound = "다음 라운드부터 참가합니다"
|
||||
override val nextRoundPrep = "다음 라운드 준비 중…"
|
||||
override val spectatingSub = "관전 중 · 라운드가 끝나면 다시 시작합니다"
|
||||
override val leagueResult = "리그전 결과"
|
||||
override val casualResult = "일반전 결과"
|
||||
override fun placementReveal(n: Int) = "배치 $n/10 — 10경기 후 TR 공개"
|
||||
override val ratingError = "레이팅 반영 중 오류 — 전적은 저장되지 않았을 수 있습니다"
|
||||
override val opponent = "상대"
|
||||
override val scoreLabel = "스코어"
|
||||
override val standing = "순위"
|
||||
override fun placeOf(place: Int, total: Int) = "${place}위 / ${total}명"
|
||||
override val roundWins = "라운드 승"
|
||||
override val customBrawl = "커스텀 난투"
|
||||
override val requeue = "다시 매칭"
|
||||
override val rematchVote = "리매치 투표"
|
||||
override val rematchCancel = "리매치 투표 취소"
|
||||
override fun feedForfeit(nick: String) = "$nick 기권"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who 격추!"
|
||||
override fun feedOut(nick: String) = "$nick 탈락"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · 무승부"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · 승리!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick 승리"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "TETRIG 커스텀 방에 초대합니다! 코드 $code\n$url"
|
||||
override val share = "공유"
|
||||
override val searchOnPlay = "Google Play 에서 TETRIG 검색"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "전면 광고 꺼짐 · ${minutes}분 남음"
|
||||
override val adPlaying = "광고 재생 중…"
|
||||
override val adFreeOffer = "▶ 광고 1편 보고 30분간 전면 광고 끄기"
|
||||
override val adFreeNotReady = "30분 전면 광고 끄기 · 광고 준비 중"
|
||||
override val adFreeDesc = "끝까지 보면 30분 동안 판 사이 전면 광고가 나오지 않습니다"
|
||||
override val blockSkins = "블록 스킨"
|
||||
override val boardThemes = "보드 테마"
|
||||
override val unlockFree = "기본"
|
||||
override val unlockRewarded = "광고 보고 해금"
|
||||
override fun unlockPass(level: Int) = "시즌 패스 Lv $level"
|
||||
override val equipped = "장착 중"
|
||||
override val equip = "장착"
|
||||
override val watchToUnlock = "▶ 광고 보고 해금"
|
||||
override val adNotReady = "광고 준비 중"
|
||||
override val badges = "배지"
|
||||
override val badgesDesc = "닉네임 옆에 붙어 로비·리더보드에서 다른 플레이어에게 보입니다. 시즌 패스로 얻습니다."
|
||||
override val noBadges = "아직 가진 배지가 없습니다"
|
||||
override val equippedUnequip = "장착 중 · 해제"
|
||||
override val seasonPass = "시즌 패스"
|
||||
override val seasonPassDesc = "게임을 할수록 XP 가 쌓여 레벨 보상을 받습니다. 솔로 1판 +10 · 커스텀 +20(1위 +10) · 리그 +25(승리 +15)"
|
||||
override val passComplete = "완주"
|
||||
override val obtained = "획득"
|
||||
override val passFooter = "받은 보상은 시즌이 끝나도 계속 쓸 수 있습니다."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "클래식"; "riso" -> "리소"; "chalk" -> "분필"; "outline" -> "외곽선"
|
||||
"signal" -> "시그널"; "mono" -> "모노"; "supporter" -> "서포터"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "잉크"; "graphite" -> "흑연"; "oxide" -> "산화철"; "nogrid" -> "무격자"; "moss" -> "이끼"; else -> id
|
||||
}
|
||||
override val itemSkin = "블록 스킨"
|
||||
override val itemBoard = "보드 테마"
|
||||
override val itemBadge = "배지"
|
||||
override fun badgeFinish(season: String) = "S$season 완주"
|
||||
override fun badgePass(season: String) = "S$season 패스"
|
||||
override fun badgeElite(season: String) = "S$season 엘리트"
|
||||
|
||||
override val srvNickRule = "닉네임은 2~12자의 한글·영문·숫자·_ 만 쓸 수 있습니다"
|
||||
override val srvNickGuestPattern = "게스트 이름 형식은 쓸 수 없습니다"
|
||||
override val srvNickTaken = "이미 사용 중인 닉네임입니다"
|
||||
override val srvEmailInvalid = "이메일 형식이 올바르지 않습니다"
|
||||
override val srvPasswordShort = "비밀번호는 8자 이상이어야 합니다"
|
||||
override val srvEmailTaken = "이미 가입된 이메일입니다"
|
||||
override val srvWrongLogin = "이메일 또는 비밀번호가 맞지 않습니다"
|
||||
override val srvGoogleNotReady = "Google 로그인이 아직 설정되지 않았습니다"
|
||||
override val srvGoogleFailed = "Google 인증에 실패했습니다"
|
||||
override val srvLoginRequired = "로그인이 필요합니다"
|
||||
override val srvGuestNick = "게스트는 닉네임을 바꿀 수 없습니다. 로그인해 주세요"
|
||||
override fun srvNickCooldown(days: Int) = "닉네임은 30일에 한 번 바꿀 수 있습니다 (${days}일 남음)"
|
||||
override val srvBadRecord = "잘못된 기록"
|
||||
override val srvRoomCreateFailed = "방 코드를 만들지 못했습니다. 다시 시도해 주세요"
|
||||
override val srvBadCode = "잘못된 코드"
|
||||
override val srvNoRoom = "없는 방입니다"
|
||||
override val srvServerError = "서버 오류"
|
||||
override val srvMatchOver = "이미 끝난 경기입니다"
|
||||
override val srvNotParticipant = "이 경기의 참가자가 아닙니다"
|
||||
override val srvNeedTwo = "2명 이상 있어야 시작할 수 있습니다"
|
||||
override val srvBadBadge = "잘못된 배지입니다"
|
||||
override val srvNoBadge = "가지고 있지 않은 배지입니다"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Pt : Strings {
|
||||
override val back = "← Voltar"
|
||||
override val home = "Início"
|
||||
override val exit = "Sair"
|
||||
override val cancel = "Cancelar"
|
||||
override val loading = "Carregando…"
|
||||
override val guest = "Convidado"
|
||||
override val account = "Conta"
|
||||
override val offline = "Offline"
|
||||
override val comingSoon = "Em breve"
|
||||
override val shareResult = "Compartilhar imagem do resultado"
|
||||
override val league = "Liga"
|
||||
override val custom = "Personalizada"
|
||||
override val win = "Vitória!"
|
||||
override val lose = "Derrota"
|
||||
override val ended = "Fim"
|
||||
override val disconnected = "Desconectado"
|
||||
override val meSuffix = " (eu)"
|
||||
override fun wins(n: Int) = if (n == 1) "1 vitória" else "$n vitórias"
|
||||
override fun placement(n: Int) = "Posicionamento $n/10"
|
||||
override val score = "Pontos"
|
||||
override val lines = "Linhas"
|
||||
override val time = "Tempo"
|
||||
override val rank = "Rank"
|
||||
override val error = "Erro"
|
||||
override fun errorCode(code: Int) = "Erro ($code)"
|
||||
override val cannotConnect = "Não foi possível conectar ao servidor"
|
||||
override val connectionLost = "Conexão perdida"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Liga"
|
||||
override val modeLeagueSub = "1v1 ranqueado em tempo real · 10 partidas de posicionamento"
|
||||
override val modeCustomSub = "Crie ou entre com um código · Sem limite de jogadores"
|
||||
override val tabHome = "Início"
|
||||
override val tabLeaderboard = "Ranking"
|
||||
override val tabProfile = "Perfil"
|
||||
override val tabShop = "Loja"
|
||||
override val tabSettings = "Ajustes"
|
||||
override val noRecord = "Sem recorde"
|
||||
override val sprintDesc = "Limpe 40 linhas o mais rápido possível"
|
||||
override val timeAttackDesc = "Ataque de pontos de 2 min · Fica cada vez mais rápido"
|
||||
override val endlessDesc = "Sem fim · Continua depois do TOP OUT"
|
||||
override val versusDesc = "Versus"
|
||||
|
||||
override val continuedNotRecorded = "Você continuou esta partida, então ela não conta para seus recordes nem para o ranking"
|
||||
override val playAgain = "Jogar de novo"
|
||||
|
||||
override val ghost = "Peça fantasma"
|
||||
override val ghostSub = "Mostra onde a peça vai cair"
|
||||
override val lefty = "Layout para canhotos"
|
||||
override val leftySub = "Inverte os botões de controle"
|
||||
override val bigButtons = "Botões grandes"
|
||||
override val bigButtonsSub = "Botões maiores em tablets e dobráveis"
|
||||
override val adPrivacy = "Privacidade de anúncios"
|
||||
override val adPrivacySub = "Altere seu consentimento de anúncios personalizados"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Continuar"
|
||||
override val continuedBanner = "Continuada · Não registrada"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Tempo restante $time · Pontos $score"
|
||||
override val continueOffer = "Assista a um anúncio até o fim para continuar jogando com o tabuleiro vazio, mantendo sua pontuação e o tempo restante (uma vez por partida).\nA pontuação de partidas continuadas não conta para seus recordes nem para o ranking."
|
||||
override val loadingAd = "Carregando anúncio…"
|
||||
override val watchToContinue = "▶ Ver anúncio para continuar"
|
||||
override val seeResult = "Ver resultado"
|
||||
override val hardDrop = "Queda direta"
|
||||
override val softDrop = "▼ Suave"
|
||||
override val paused = "Pausado"
|
||||
override val resume = "Continuar"
|
||||
|
||||
override val loginPitch = "Faça login para jogar a Liga, aparecer no ranking e mudar seu apelido. Seus recordes de convidado serão transferidos para a conta."
|
||||
override val emailSignup = "Cadastro por e-mail"
|
||||
override val login = "Entrar"
|
||||
override val email = "E-mail"
|
||||
override val passwordHint = "Senha (mín. 8 caracteres)"
|
||||
override val nickOptional = "Apelido (opcional, 2–12 caracteres)"
|
||||
override val processing = "Processando…"
|
||||
override val signUp = "Criar conta"
|
||||
override val noPasswordReset = "A redefinição de senha ainda não está disponível. Guarde bem a sua senha."
|
||||
override val nickChangeTitle = "Mudar apelido (uma vez a cada 30 dias)"
|
||||
override val nickChange = "Mudar apelido"
|
||||
override val changed = "Alterado"
|
||||
override val logout = "Sair da conta"
|
||||
override val deleteConfirm = "Excluir de vez (não dá para desfazer)"
|
||||
override val deleteAccount = "Excluir conta"
|
||||
override val deleteWarning = "Sua conta, sua pontuação da Liga, seus recordes no servidor e o histórico de partidas personalizadas serão apagados. Toque de novo para continuar."
|
||||
override val seasonRecord = "Desempenho da temporada"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}V ${losses}D"
|
||||
override val recentMatches = "Partidas recentes"
|
||||
override val noMatches = "Nenhuma partida ainda"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Liga · ${if (won) "V" else "D"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Personalizada · #$place de $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Nenhum jogador concluiu as 10 partidas de posicionamento ainda"
|
||||
override val lbEmptySolo = "Ainda não há recordes (só aparecem jogadores logados)"
|
||||
|
||||
override val createRoom = "Criar sala"
|
||||
override val createRoomDesc = "Você receberá um código de 6 caracteres. Compartilhe com os amigos. Sem limite de jogadores."
|
||||
override val creating = "Criando…"
|
||||
override val joinTitle = "Entrar em uma sala"
|
||||
override val codeHint = "Código de 6 caracteres"
|
||||
override val join = "Entrar"
|
||||
override val noSuchRoom = "Não existe sala com esse código"
|
||||
|
||||
override val matchFound = "Partida encontrada!"
|
||||
override val searching = "Procurando oponente"
|
||||
override fun seconds(s: String) = "${s}s"
|
||||
override val rankPending = "Rank pendente"
|
||||
override val queueLong = "A espera está demorando. Que tal jogar com amigos em uma sala personalizada?"
|
||||
override val openCustom = "Abrir sala personalizada"
|
||||
override val leagueNeedsLogin = "Faça login para jogar a Liga"
|
||||
override val queueLost = "Conexão com a fila perdida"
|
||||
|
||||
override val connectionClosed = "Desconectado"
|
||||
override val connecting = "Conectando"
|
||||
override val reconnecting = "Reconectando…"
|
||||
override val customLobby = "Lobby personalizado"
|
||||
override val roomCode = "Código da sala"
|
||||
override val inviteHint = "Envie aos amigos o código ou um link de convite"
|
||||
override val sendInvite = "Enviar link de convite"
|
||||
override fun playersCount(n: Int) = if (n == 1) "1 jogador" else "$n jogadores"
|
||||
override val rulesHost = "Regras (anfitrião)"
|
||||
override val rules = "Regras"
|
||||
override val garbageMul = "Multiplicador de lixo"
|
||||
override val targetWins = "Vence quem chegar a"
|
||||
override val unlimited = "Ilimitado"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Mesma bag (justo)"
|
||||
override val personalBag = "Bag própria"
|
||||
override val overtime = "Multiplicador de prorrogação"
|
||||
override val overtimeOn = "Ligado (+25%/30 s após 90 s)"
|
||||
override val off = "Desligado"
|
||||
override val needTwo = "Começa com 2+ jogadores"
|
||||
override val start = "Iniciar"
|
||||
override val waitingHost = "Aguardando o anfitrião iniciar…"
|
||||
override val host = "Anfitrião"
|
||||
override val waitingOpponent = "Aguardando oponente…"
|
||||
override val forfeitExit = "Desistir e sair"
|
||||
override val forfeit = "Desistir"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Minhas vitórias $wins · Vivos $alive/$total"
|
||||
override val spectating = "Assistindo"
|
||||
override val joinNextRound = "Você entra a partir da próxima rodada"
|
||||
override val nextRoundPrep = "Próxima rodada começando…"
|
||||
override val spectatingSub = "Assistindo · Você volta a jogar quando a rodada acabar"
|
||||
override val leagueResult = "Resultado da Liga"
|
||||
override val casualResult = "Resultado da partida"
|
||||
override fun placementReveal(n: Int) = "Posicionamento $n/10 — o TR é revelado após 10 partidas"
|
||||
override val ratingError = "Erro ao atualizar o rating — esta partida pode não ter sido salva"
|
||||
override val opponent = "Oponente"
|
||||
override val scoreLabel = "Pontos"
|
||||
override val standing = "Posição"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Rodadas vencidas"
|
||||
override val customBrawl = "Briga personalizada"
|
||||
override val requeue = "Buscar outra partida"
|
||||
override val rematchVote = "Votar revanche"
|
||||
override val rematchCancel = "Cancelar voto de revanche"
|
||||
override fun feedForfeit(nick: String) = "$nick desistiu"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick eliminado"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Empate"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Você venceu!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick venceu"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Entre na minha sala personalizada de TETRIG! Código $code\n$url"
|
||||
override val share = "Compartilhar"
|
||||
override val searchOnPlay = "Busque TETRIG no Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Anúncios intersticiais desativados · faltam $minutes min"
|
||||
override val adPlaying = "Exibindo anúncio…"
|
||||
override val adFreeOffer = "▶ Veja 1 anúncio e desative os intersticiais por 30 min"
|
||||
override val adFreeNotReady = "Desativar intersticiais por 30 min · Anúncio indisponível"
|
||||
override val adFreeDesc = "Assista até o fim e nenhum anúncio intersticial aparece entre as partidas por 30 minutos"
|
||||
override val blockSkins = "Skins de blocos"
|
||||
override val boardThemes = "Temas de tabuleiro"
|
||||
override val unlockFree = "Padrão"
|
||||
override val unlockRewarded = "Desbloquear com anúncio"
|
||||
override fun unlockPass(level: Int) = "Passe de temporada Lv $level"
|
||||
override val equipped = "Equipado"
|
||||
override val equip = "Equipar"
|
||||
override val watchToUnlock = "▶ Ver e liberar"
|
||||
override val adNotReady = "Anúncio indisponível"
|
||||
override val badges = "Emblemas"
|
||||
override val badgesDesc = "Aparecem ao lado do seu apelido nos lobbies e no ranking. Conquistados com o passe de temporada."
|
||||
override val noBadges = "Você ainda não tem emblemas"
|
||||
override val equippedUnequip = "Equipado · Remover"
|
||||
override val seasonPass = "Passe de temporada"
|
||||
override val seasonPassDesc = "Ganhe XP a cada partida para liberar recompensas por nível. Solo +10 · Personalizada +20 (1º +10) · Liga +25 (vitória +15)"
|
||||
override val passComplete = "Completo"
|
||||
override val obtained = "Obtido"
|
||||
override val passFooter = "As recompensas continuam suas mesmo depois que a temporada acabar."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Clássico"; "riso" -> "Riso"; "chalk" -> "Giz"; "outline" -> "Contorno"
|
||||
"signal" -> "Sinal"; "mono" -> "Mono"; "supporter" -> "Apoiador"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Tinta"; "graphite" -> "Grafite"; "oxide" -> "Óxido"; "nogrid" -> "Sem grade"; "moss" -> "Musgo"; else -> id
|
||||
}
|
||||
override val itemSkin = "Skin de bloco"
|
||||
override val itemBoard = "Tema de tabuleiro"
|
||||
override val itemBadge = "Emblema"
|
||||
override fun badgeFinish(season: String) = "S$season FINAL"
|
||||
override fun badgePass(season: String) = "S$season PASSE"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "O apelido deve ter de 2 a 12 caracteres: letras coreanas (hangul) ou inglesas (sem acentos), números ou _"
|
||||
override val srvNickGuestPattern = "Esse apelido parece um nome de convidado e não pode ser usado"
|
||||
override val srvNickTaken = "Esse apelido já está em uso"
|
||||
override val srvEmailInvalid = "E-mail inválido"
|
||||
override val srvPasswordShort = "A senha deve ter pelo menos 8 caracteres"
|
||||
override val srvEmailTaken = "Este e-mail já está cadastrado"
|
||||
override val srvWrongLogin = "E-mail ou senha incorretos"
|
||||
override val srvGoogleNotReady = "O login com o Google ainda não foi configurado"
|
||||
override val srvGoogleFailed = "Falha no login com o Google"
|
||||
override val srvLoginRequired = "Faça login para continuar"
|
||||
override val srvGuestNick = "Convidados não podem mudar o apelido. Faça login"
|
||||
override fun srvNickCooldown(days: Int) = "Você só pode mudar o apelido uma vez a cada 30 dias (" + (if (days == 1) "falta 1 dia" else "faltam $days dias") + ")"
|
||||
override val srvBadRecord = "Recorde inválido"
|
||||
override val srvRoomCreateFailed = "Não foi possível criar o código da sala. Tente novamente"
|
||||
override val srvBadCode = "Código inválido"
|
||||
override val srvNoRoom = "Essa sala não existe"
|
||||
override val srvServerError = "Erro no servidor"
|
||||
override val srvMatchOver = "Esta partida já terminou"
|
||||
override val srvNotParticipant = "Você não participa desta partida"
|
||||
override val srvNeedTwo = "São necessários pelo menos 2 jogadores para começar"
|
||||
override val srvBadBadge = "Emblema inválido"
|
||||
override val srvNoBadge = "Você não tem este emblema"
|
||||
}
|
||||
@@ -0,0 +1,239 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Ru : Strings {
|
||||
/** Русские формы множественного числа: 1 победа, 2 победы, 5 побед (11–14 — всегда «many»). */
|
||||
private fun pl(n: Int, one: String, few: String, many: String): String {
|
||||
val m100 = n % 100
|
||||
val m10 = n % 10
|
||||
return if (m100 in 11..14) many else when (m10) {
|
||||
1 -> one
|
||||
2, 3, 4 -> few
|
||||
else -> many
|
||||
}
|
||||
}
|
||||
|
||||
override val back = "← Назад"
|
||||
override val home = "На главную"
|
||||
override val exit = "Выйти"
|
||||
override val cancel = "Отмена"
|
||||
override val loading = "Загрузка…"
|
||||
override val guest = "Гость"
|
||||
override val account = "Аккаунт"
|
||||
override val offline = "Офлайн"
|
||||
override val comingSoon = "Скоро"
|
||||
override val shareResult = "Поделиться результатом"
|
||||
override val league = "Лига"
|
||||
override val custom = "Своя игра"
|
||||
override val win = "Победа!"
|
||||
override val lose = "Поражение"
|
||||
override val ended = "Конец"
|
||||
override val disconnected = "Нет связи"
|
||||
override val meSuffix = " (я)"
|
||||
override fun wins(n: Int) = "$n ${pl(n, "победа", "победы", "побед")}"
|
||||
override fun placement(n: Int) = "Калибровка $n/10"
|
||||
override val score = "Счёт"
|
||||
override val lines = "Линии"
|
||||
override val time = "Время"
|
||||
override val rank = "Ранг"
|
||||
override val error = "Ошибка"
|
||||
override fun errorCode(code: Int) = "Ошибка ($code)"
|
||||
override val cannotConnect = "Не удаётся подключиться к серверу"
|
||||
override val connectionLost = "Соединение потеряно"
|
||||
|
||||
override val solo = "Соло"
|
||||
override val modeLeague = "Онлайн · Лига"
|
||||
override val modeLeagueSub = "1 на 1 в реальном времени · 10 калибровочных матчей"
|
||||
override val modeCustomSub = "Создай комнату или войди по коду · Без лимита игроков"
|
||||
override val tabHome = "Главная"
|
||||
override val tabLeaderboard = "Рейтинг"
|
||||
override val tabProfile = "Профиль"
|
||||
override val tabShop = "Магазин"
|
||||
override val tabSettings = "Опции"
|
||||
override val noRecord = "Нет рекорда"
|
||||
override val sprintDesc = "Убери 40 линий как можно быстрее"
|
||||
override val timeAttackDesc = "Очки за 2 минуты · Скорость растёт"
|
||||
override val endlessDesc = "Бесконечно · Играй дальше после TOP OUT"
|
||||
override val versusDesc = "Битва"
|
||||
|
||||
override val continuedNotRecorded = "Ты продолжил эту игру, поэтому она не идёт в рекорды и таблицу лидеров"
|
||||
override val playAgain = "Играть снова"
|
||||
|
||||
override val ghost = "Тень фигуры"
|
||||
override val ghostSub = "Показывает, куда упадёт фигура"
|
||||
override val lefty = "Для левшей"
|
||||
override val leftySub = "Зеркальное расположение кнопок"
|
||||
override val bigButtons = "Крупные кнопки"
|
||||
override val bigButtonsSub = "Увеличенные кнопки на планшетах и складных"
|
||||
override val adPrivacy = "Конфиденциальность рекламы"
|
||||
override val adPrivacySub = "Изменить согласие на персонализацию рекламы"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Дальше"
|
||||
override val continuedBanner = "Продолжение · Не засчитано"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Осталось $time · Счёт $score"
|
||||
override val continueOffer = "Досмотри рекламу до конца и продолжи на пустом поле с тем же счётом и оставшимся временем (один раз за игру).\nОчки из продолженных игр не идут в рекорды и таблицу лидеров."
|
||||
override val loadingAd = "Загрузка рекламы…"
|
||||
override val watchToContinue = "▶ Смотреть рекламу и продолжить"
|
||||
override val seeResult = "Результат"
|
||||
override val hardDrop = "Сброс"
|
||||
override val softDrop = "▼ Мягко"
|
||||
override val paused = "Пауза"
|
||||
override val resume = "Продолжить"
|
||||
|
||||
override val loginPitch = "Войди, чтобы играть в Лигу, попасть в таблицу лидеров и менять ник. Рекорды гостя перенесутся в твой аккаунт."
|
||||
override val emailSignup = "Через e-mail"
|
||||
override val login = "Войти"
|
||||
override val email = "E-mail"
|
||||
override val passwordHint = "Пароль (от 8 символов)"
|
||||
override val nickOptional = "Ник (по желанию, 2–12 симв.)"
|
||||
override val processing = "Подожди…"
|
||||
override val signUp = "Создать аккаунт"
|
||||
override val noPasswordReset = "Сбросить пароль пока нельзя. Обязательно запомни его."
|
||||
override val nickChangeTitle = "Смена ника (раз в 30 дней)"
|
||||
override val nickChange = "Сменить ник"
|
||||
override val changed = "Изменено"
|
||||
override val logout = "Выйти"
|
||||
override val deleteConfirm = "Удалить навсегда (необратимо)"
|
||||
override val deleteAccount = "Удалить аккаунт"
|
||||
override val deleteWarning = "Аккаунт, рейтинг Лиги, рекорды на сервере и история своих игр будут удалены. Нажми ещё раз, чтобы продолжить."
|
||||
override val seasonRecord = "Итоги сезона"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}В ${losses}П"
|
||||
override val recentMatches = "Последние матчи"
|
||||
override val noMatches = "Матчей пока нет"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Лига · ${if (won) "В" else "П"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Своя игра · #$place из $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Пока никто не сыграл 10 калибровочных матчей"
|
||||
override val lbEmptySolo = "Рекордов пока нет (в списке только вошедшие в аккаунт игроки)"
|
||||
|
||||
override val createRoom = "Создать комнату"
|
||||
override val createRoomDesc = "Ты получишь 6-значный код. Отправь его друзьям. Без лимита игроков."
|
||||
override val creating = "Создание…"
|
||||
override val joinTitle = "Войти в комнату"
|
||||
override val codeHint = "6-значный код"
|
||||
override val join = "Войти"
|
||||
override val noSuchRoom = "Комнаты с таким кодом нет"
|
||||
|
||||
override val matchFound = "Соперник найден!"
|
||||
override val searching = "Поиск соперника"
|
||||
override fun seconds(s: String) = "$s с"
|
||||
override val rankPending = "Ранг не определён"
|
||||
override val queueLong = "Ожидание затянулось. Сыграй с друзьями в своей комнате."
|
||||
override val openCustom = "Создать свою комнату"
|
||||
override val leagueNeedsLogin = "Войди, чтобы играть в Лигу"
|
||||
override val queueLost = "Связь с очередью потеряна"
|
||||
|
||||
override val connectionClosed = "Отключено"
|
||||
override val connecting = "Подключение"
|
||||
override val reconnecting = "Переподключение…"
|
||||
override val customLobby = "Лобби своей игры"
|
||||
override val roomCode = "Код комнаты"
|
||||
override val inviteHint = "Отправь друзьям код или ссылку-приглашение"
|
||||
override val sendInvite = "Отправить приглашение"
|
||||
override fun playersCount(n: Int) = "$n ${pl(n, "игрок", "игрока", "игроков")}"
|
||||
override val rulesHost = "Правила (хост)"
|
||||
override val rules = "Правила"
|
||||
override val garbageMul = "Множитель мусора"
|
||||
override val targetWins = "До скольки побед"
|
||||
override val unlimited = "Без лимита"
|
||||
override val seed = "Сид"
|
||||
override val sameBag = "Общий bag (честно)"
|
||||
override val personalBag = "Свой bag"
|
||||
override val overtime = "Множитель овертайма"
|
||||
override val overtimeOn = "Вкл (+25%/30 с после 90 с)"
|
||||
override val off = "Выкл"
|
||||
override val needTwo = "Старт от 2 игроков"
|
||||
override val start = "Старт"
|
||||
override val waitingHost = "Ждём, пока хост начнёт…"
|
||||
override val host = "Хост"
|
||||
override val waitingOpponent = "Ожидание соперника…"
|
||||
override val forfeitExit = "Сдаться и выйти"
|
||||
override val forfeit = "Сдаться"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Мои победы $wins · В игре $alive/$total"
|
||||
override val spectating = "Наблюдение"
|
||||
override val joinNextRound = "Ты вступишь со следующего раунда"
|
||||
override val nextRoundPrep = "Следующий раунд…"
|
||||
override val spectatingSub = "Наблюдение · После раунда ты вернёшься в игру"
|
||||
override val leagueResult = "Итог Лиги"
|
||||
override val casualResult = "Итог матча"
|
||||
override fun placementReveal(n: Int) = "Калибровка $n/10 — TR откроется после 10 матчей"
|
||||
override val ratingError = "Ошибка обновления рейтинга — матч мог не сохраниться"
|
||||
override val opponent = "Соперник"
|
||||
override val scoreLabel = "Очки"
|
||||
override val standing = "Место"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Выиграно раундов"
|
||||
override val customBrawl = "Своя свалка"
|
||||
override val requeue = "Новый матч"
|
||||
override val rematchVote = "Голос за реванш"
|
||||
override val rematchCancel = "Отменить голос"
|
||||
override fun feedForfeit(nick: String) = "$nick сдаётся"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick выбывает"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Ничья"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Победа!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · Победа: $nick"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Заходи в мою комнату TETRIG! Код $code\n$url"
|
||||
override val share = "Поделиться"
|
||||
override val searchOnPlay = "Найди TETRIG в Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Реклама между играми выкл · осталось $minutes мин"
|
||||
override val adPlaying = "Идёт реклама…"
|
||||
override val adFreeOffer = "▶ Посмотри 1 рекламу — 30 мин без рекламы между играми"
|
||||
override val adFreeNotReady = "30 мин без рекламы между играми · Реклама не готова"
|
||||
override val adFreeDesc = "Досмотри до конца, и 30 минут между играми не будет полноэкранной рекламы"
|
||||
override val blockSkins = "Скины блоков"
|
||||
override val boardThemes = "Темы поля"
|
||||
override val unlockFree = "Обычный"
|
||||
override val unlockRewarded = "За рекламу"
|
||||
override fun unlockPass(level: Int) = "Пропуск Lv $level"
|
||||
override val equipped = "Надето"
|
||||
override val equip = "Надеть"
|
||||
override val watchToUnlock = "▶ За рекламу"
|
||||
override val adNotReady = "Реклама не готова"
|
||||
override val badges = "Значки"
|
||||
override val badgesDesc = "Отображаются рядом с ником в лобби и таблице лидеров. Выдаются за сезонный пропуск."
|
||||
override val noBadges = "Значков пока нет"
|
||||
override val equippedUnequip = "Надето · Снять"
|
||||
override val seasonPass = "Сезонный пропуск"
|
||||
override val seasonPassDesc = "Получай XP за каждую игру и открывай награды за уровни. Соло +10 · Своя игра +20 (1-е место +10) · Лига +25 (победа +15)"
|
||||
override val passComplete = "Пройдено"
|
||||
override val obtained = "Получено"
|
||||
override val passFooter = "Награды остаются с тобой и после конца сезона."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Классика"; "riso" -> "Ризо"; "chalk" -> "Мел"; "outline" -> "Контур"
|
||||
"signal" -> "Сигнал"; "mono" -> "Моно"; "supporter" -> "Поддержка"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Чернила"; "graphite" -> "Графит"; "oxide" -> "Оксид"; "nogrid" -> "Без сетки"; "moss" -> "Мох"; else -> id
|
||||
}
|
||||
override val itemSkin = "Скин блоков"
|
||||
override val itemBoard = "Тема поля"
|
||||
override val itemBadge = "Значок"
|
||||
override fun badgeFinish(season: String) = "S$season FINISH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Ник должен быть длиной 2–12 символов и состоять только из корейских (хангыль) или английских букв, цифр и _ (кириллица не допускается)"
|
||||
override val srvNickGuestPattern = "Ник в формате имени гостя использовать нельзя"
|
||||
override val srvNickTaken = "Этот ник уже занят"
|
||||
override val srvEmailInvalid = "Неверный формат e-mail"
|
||||
override val srvPasswordShort = "Пароль должен быть не короче 8 символов"
|
||||
override val srvEmailTaken = "Этот e-mail уже зарегистрирован"
|
||||
override val srvWrongLogin = "Неверный e-mail или пароль"
|
||||
override val srvGoogleNotReady = "Вход через Google пока не настроен"
|
||||
override val srvGoogleFailed = "Не удалось войти через Google"
|
||||
override val srvLoginRequired = "Нужно войти в аккаунт"
|
||||
override val srvGuestNick = "Гости не могут менять ник. Войди в аккаунт"
|
||||
override fun srvNickCooldown(days: Int) = "Ник можно менять раз в 30 дней (осталось: $days ${pl(days, "день", "дня", "дней")})"
|
||||
override val srvBadRecord = "Некорректный рекорд"
|
||||
override val srvRoomCreateFailed = "Не удалось создать код комнаты. Попробуй ещё раз"
|
||||
override val srvBadCode = "Неверный код"
|
||||
override val srvNoRoom = "Такой комнаты нет"
|
||||
override val srvServerError = "Ошибка сервера"
|
||||
override val srvMatchOver = "Этот матч уже завершён"
|
||||
override val srvNotParticipant = "Ты не участвуешь в этом матче"
|
||||
override val srvNeedTwo = "Для старта нужно минимум 2 игрока"
|
||||
override val srvBadBadge = "Недопустимый значок"
|
||||
override val srvNoBadge = "У тебя нет этого значка"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Th : Strings {
|
||||
override val back = "← กลับ"
|
||||
override val home = "หน้าหลัก"
|
||||
override val exit = "ออก"
|
||||
override val cancel = "ยกเลิก"
|
||||
override val loading = "กำลังโหลด…"
|
||||
override val guest = "ผู้เยี่ยมชม"
|
||||
override val account = "บัญชี"
|
||||
override val offline = "ออฟไลน์"
|
||||
override val comingSoon = "เร็วๆ นี้"
|
||||
override val shareResult = "แชร์ภาพผลลัพธ์"
|
||||
override val league = "ลีก"
|
||||
override val custom = "กำหนดเอง"
|
||||
override val win = "ชนะ!"
|
||||
override val lose = "แพ้"
|
||||
override val ended = "จบ"
|
||||
override val disconnected = "หลุด"
|
||||
override val meSuffix = " (ฉัน)"
|
||||
override fun wins(n: Int) = "ชนะ $n"
|
||||
override fun placement(n: Int) = "จัดอันดับ $n/10"
|
||||
override val score = "คะแนน"
|
||||
override val lines = "แถว"
|
||||
override val time = "เวลา"
|
||||
override val rank = "แรงก์"
|
||||
override val error = "ข้อผิดพลาด"
|
||||
override fun errorCode(code: Int) = "ข้อผิดพลาด ($code)"
|
||||
override val cannotConnect = "เชื่อมต่อเซิร์ฟเวอร์ไม่ได้"
|
||||
override val connectionLost = "การเชื่อมต่อขาดหาย"
|
||||
|
||||
override val solo = "เล่นเดี่ยว"
|
||||
override val modeLeague = "ออนไลน์ · ลีก"
|
||||
override val modeLeagueSub = "แรงก์ 1v1 เรียลไทม์ · 10 เกมจัดอันดับ"
|
||||
override val modeCustomSub = "สร้างหรือเข้าด้วยรหัส · ไม่จำกัดจำนวนผู้เล่น"
|
||||
override val tabHome = "หน้าแรก"
|
||||
override val tabLeaderboard = "อันดับ"
|
||||
override val tabProfile = "โปรไฟล์"
|
||||
override val tabShop = "ร้านค้า"
|
||||
override val tabSettings = "ตั้งค่า"
|
||||
override val noRecord = "ไม่มีสถิติ"
|
||||
override val sprintDesc = "เคลียร์ 40 แถวให้เร็วที่สุด"
|
||||
override val timeAttackDesc = "ทำคะแนน 2 นาที · ความเร็วเพิ่มขึ้นเรื่อยๆ"
|
||||
override val endlessDesc = "ไม่จำกัด · เล่นต่อได้แม้ TOP OUT"
|
||||
override val versusDesc = "ประลอง"
|
||||
|
||||
override val continuedNotRecorded = "เกมนี้ใช้การเล่นต่อ จึงไม่นับรวมในสถิติและอันดับ"
|
||||
override val playAgain = "เล่นอีกครั้ง"
|
||||
|
||||
override val ghost = "แสดงเงาบล็อก"
|
||||
override val ghostSub = "ดูตัวอย่างตำแหน่งที่บล็อกจะตก"
|
||||
override val lefty = "เลย์เอาต์มือซ้าย"
|
||||
override val leftySub = "สลับตำแหน่งปุ่มควบคุมซ้าย-ขวา"
|
||||
override val bigButtons = "ปุ่มใหญ่"
|
||||
override val bigButtonsSub = "ขยายปุ่มบนแท็บเล็ตและมือถือพับได้"
|
||||
override val adPrivacy = "ความเป็นส่วนตัวของโฆษณา"
|
||||
override val adPrivacySub = "เปลี่ยนการยินยอมโฆษณาที่ปรับตามความสนใจ"
|
||||
|
||||
override val topOutContinue = "TOP OUT · เล่นต่อ"
|
||||
override val continuedBanner = "เล่นต่อ · ไม่บันทึกสถิติ"
|
||||
override fun timeLeftScore(time: String, score: Int) = "เหลือเวลา $time · คะแนน $score"
|
||||
override val continueOffer = "ดูโฆษณาจนจบเพื่อเล่นต่อบนกระดานว่าง โดยคงคะแนนและเวลาที่เหลือไว้ (1 ครั้งต่อเกม)\nคะแนนจากเกมที่เล่นต่อจะไม่นับรวมในสถิติและอันดับ"
|
||||
override val loadingAd = "กำลังโหลดโฆษณา…"
|
||||
override val watchToContinue = "▶ ดูโฆษณาเพื่อเล่นต่อ"
|
||||
override val seeResult = "ดูผลลัพธ์"
|
||||
override val hardDrop = "ปล่อยทันที"
|
||||
override val softDrop = "▼ ปล่อยช้า"
|
||||
override val paused = "หยุดชั่วคราว"
|
||||
override val resume = "เล่นต่อ"
|
||||
|
||||
override val loginPitch = "เข้าสู่ระบบเพื่อเล่นลีก ติดอันดับ และเปลี่ยนชื่อเล่น สถิติผู้เยี่ยมชมของคุณจะถูกย้ายไปยังบัญชี"
|
||||
override val emailSignup = "สมัครสมาชิก"
|
||||
override val login = "เข้าสู่ระบบ"
|
||||
override val email = "อีเมล"
|
||||
override val passwordHint = "รหัสผ่าน (8 ตัวอักษรขึ้นไป)"
|
||||
override val nickOptional = "ชื่อเล่น (ไม่บังคับ, 2–12 ตัวอักษร)"
|
||||
override val processing = "กำลังดำเนินการ…"
|
||||
override val signUp = "สร้างบัญชี"
|
||||
override val noPasswordReset = "ยังไม่รองรับการรีเซ็ตรหัสผ่าน โปรดจำรหัสผ่านของคุณให้ดี"
|
||||
override val nickChangeTitle = "เปลี่ยนชื่อเล่น (30 วันครั้งเดียว)"
|
||||
override val nickChange = "เปลี่ยนชื่อเล่น"
|
||||
override val changed = "เปลี่ยนแล้ว"
|
||||
override val logout = "ออกจากระบบ"
|
||||
override val deleteConfirm = "ยืนยันลบ (ย้อนกลับไม่ได้)"
|
||||
override val deleteAccount = "ลบบัญชี"
|
||||
override val deleteWarning = "บัญชี เรตติ้งลีก สถิติบนเซิร์ฟเวอร์ และประวัติการแข่งแบบกำหนดเองจะถูกลบทั้งหมด แตะอีกครั้งเพื่อดำเนินการต่อ"
|
||||
override val seasonRecord = "สถิติซีซัน"
|
||||
override fun winLoss(wins: Int, losses: Int) = "ชนะ $wins แพ้ $losses"
|
||||
override val recentMatches = "แมตช์ล่าสุด"
|
||||
override val noMatches = "ยังไม่มีแมตช์"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "ลีก · ${if (won) "ชนะ" else "แพ้"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "กำหนดเอง · อันดับ $place จาก $size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "ยังไม่มีผู้เล่นที่เล่นครบ 10 เกมจัดอันดับ"
|
||||
override val lbEmptySolo = "ยังไม่มีสถิติ (แสดงเฉพาะผู้เล่นที่เข้าสู่ระบบ)"
|
||||
|
||||
override val createRoom = "สร้างห้อง"
|
||||
override val createRoomDesc = "คุณจะได้รหัส 6 ตัว แชร์ให้เพื่อนได้เลย ไม่จำกัดจำนวนผู้เล่น"
|
||||
override val creating = "กำลังสร้าง…"
|
||||
override val joinTitle = "เข้าห้อง"
|
||||
override val codeHint = "รหัส 6 ตัว"
|
||||
override val join = "เข้าร่วม"
|
||||
override val noSuchRoom = "ไม่พบห้องที่ใช้รหัสนี้"
|
||||
|
||||
override val matchFound = "พบคู่แข่งแล้ว!"
|
||||
override val searching = "กำลังหาคู่แข่ง"
|
||||
override fun seconds(s: String) = "${s} วิ"
|
||||
override val rankPending = "กำลังคำนวณแรงก์"
|
||||
override val queueLong = "รอนานกว่าปกติ ลองเล่นกับเพื่อนในห้องกำหนดเองดูสิ"
|
||||
override val openCustom = "เปิดห้องกำหนดเอง"
|
||||
override val leagueNeedsLogin = "ต้องเข้าสู่ระบบก่อนจึงจะเล่นลีกได้"
|
||||
override val queueLost = "การเชื่อมต่อคิวขาดหาย"
|
||||
|
||||
override val connectionClosed = "ตัดการเชื่อมต่อ"
|
||||
override val connecting = "กำลังเชื่อมต่อ"
|
||||
override val reconnecting = "กำลังเชื่อมต่อใหม่…"
|
||||
override val customLobby = "ล็อบบี้กำหนดเอง"
|
||||
override val roomCode = "รหัสห้อง"
|
||||
override val inviteHint = "ส่งรหัสหรือลิงก์เชิญให้เพื่อน"
|
||||
override val sendInvite = "ส่งลิงก์เชิญ"
|
||||
override fun playersCount(n: Int) = "ผู้เล่น $n คน"
|
||||
override val rulesHost = "กติกา (โฮสต์)"
|
||||
override val rules = "กติกา"
|
||||
override val garbageMul = "ตัวคูณขยะ"
|
||||
override val targetWins = "ชนะก่อน"
|
||||
override val unlimited = "ไม่จำกัด"
|
||||
override val seed = "ซีด"
|
||||
override val sameBag = "bag เดียวกัน (แฟร์)"
|
||||
override val personalBag = "bag ส่วนตัว"
|
||||
override val overtime = "ตัวคูณต่อเวลา"
|
||||
override val overtimeOn = "เปิด (+25%/30 วิ หลัง 90 วิ)"
|
||||
override val off = "ปิด"
|
||||
override val needTwo = "เริ่มได้เมื่อมี 2 คนขึ้นไป"
|
||||
override val start = "เริ่ม"
|
||||
override val waitingHost = "รอโฮสต์เริ่มเกม…"
|
||||
override val host = "โฮสต์"
|
||||
override val waitingOpponent = "รอคู่แข่งเข้าร่วม…"
|
||||
override val forfeitExit = "ยอมแพ้และออก"
|
||||
override val forfeit = "ยอมแพ้"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "ชนะ $wins · รอด $alive/$total"
|
||||
override val spectating = "กำลังชม"
|
||||
override val joinNextRound = "คุณจะเข้าร่วมตั้งแต่รอบถัดไป"
|
||||
override val nextRoundPrep = "กำลังเตรียมรอบถัดไป…"
|
||||
override val spectatingSub = "กำลังชม · คุณจะได้เล่นอีกครั้งเมื่อจบรอบ"
|
||||
override val leagueResult = "ผลลีก"
|
||||
override val casualResult = "ผลการแข่ง"
|
||||
override fun placementReveal(n: Int) = "จัดอันดับ $n/10 — เปิดเผย TR หลังครบ 10 เกม"
|
||||
override val ratingError = "อัปเดตเรตติ้งไม่สำเร็จ — แมตช์นี้อาจไม่ได้ถูกบันทึก"
|
||||
override val opponent = "คู่แข่ง"
|
||||
override val scoreLabel = "คะแนน"
|
||||
override val standing = "อันดับ"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "รอบที่ชนะ"
|
||||
override val customBrawl = "ศึกชิงเดือดแบบกำหนดเอง"
|
||||
override val requeue = "หาแมตช์ใหม่"
|
||||
override val rematchVote = "โหวตแข่งใหม่"
|
||||
override val rematchCancel = "ยกเลิกโหวตแข่งใหม่"
|
||||
override fun feedForfeit(nick: String) = "$nick ยอมแพ้"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick ตกรอบ"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · เสมอ"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · คุณชนะ!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick ชนะ"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "มาเล่นห้องกำหนดเอง TETRIG ของฉันสิ! รหัส $code\n$url"
|
||||
override val share = "แชร์"
|
||||
override val searchOnPlay = "ค้นหา TETRIG ใน Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "ปิดโฆษณาคั่นเกม · เหลือ $minutes นาที"
|
||||
override val adPlaying = "กำลังเล่นโฆษณา…"
|
||||
override val adFreeOffer = "▶ ดูโฆษณา 1 รายการเพื่อปิดโฆษณาคั่นเกม 30 นาที"
|
||||
override val adFreeNotReady = "ปิดโฆษณาคั่นเกม 30 นาที · โฆษณายังไม่พร้อม"
|
||||
override val adFreeDesc = "ดูจนจบแล้วจะไม่มีโฆษณาคั่นระหว่างเกมเป็นเวลา 30 นาที"
|
||||
override val blockSkins = "สกินบล็อก"
|
||||
override val boardThemes = "ธีมกระดาน"
|
||||
override val unlockFree = "ค่าเริ่มต้น"
|
||||
override val unlockRewarded = "ปลดล็อกด้วยโฆษณา"
|
||||
override fun unlockPass(level: Int) = "ซีซันพาส Lv $level"
|
||||
override val equipped = "ใช้อยู่"
|
||||
override val equip = "ใช้งาน"
|
||||
override val watchToUnlock = "▶ ดูโฆษณาเพื่อปลดล็อก"
|
||||
override val adNotReady = "โฆษณายังไม่พร้อม"
|
||||
override val badges = "เหรียญตรา"
|
||||
override val badgesDesc = "แสดงข้างชื่อเล่นของคุณในล็อบบี้และอันดับ รับได้จากซีซันพาส"
|
||||
override val noBadges = "ยังไม่มีเหรียญตรา"
|
||||
override val equippedUnequip = "ใช้อยู่ · ถอด"
|
||||
override val seasonPass = "ซีซันพาส"
|
||||
override val seasonPassDesc = "เล่นทุกเกมเพื่อสะสม XP และปลดล็อกรางวัลตามเลเวล เดี่ยว +10 · กำหนดเอง +20 (อันดับ 1 +10) · ลีก +25 (ชนะ +15)"
|
||||
override val passComplete = "ครบแล้ว"
|
||||
override val obtained = "ได้รับแล้ว"
|
||||
override val passFooter = "รางวัลที่ได้รับแล้วยังเป็นของคุณต่อไปแม้จบซีซัน"
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "คลาสสิก"; "riso" -> "ริโซ"; "chalk" -> "ชอล์ก"; "outline" -> "เส้นขอบ"
|
||||
"signal" -> "สัญญาณ"; "mono" -> "โมโน"; "supporter" -> "ซัพพอร์เตอร์"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "หมึก"; "graphite" -> "แกรไฟต์"; "oxide" -> "ออกไซด์"; "nogrid" -> "ไม่มีตาราง"; "moss" -> "ตะไคร่"; else -> id
|
||||
}
|
||||
override val itemSkin = "สกินบล็อก"
|
||||
override val itemBoard = "ธีมกระดาน"
|
||||
override val itemBadge = "เหรียญตรา"
|
||||
override fun badgeFinish(season: String) = "S$season FINISH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "ชื่อเล่นต้องยาว 2–12 ตัวอักษร ใช้ได้เฉพาะตัวอักษรเกาหลี (ฮันกึล) ตัวอักษรภาษาอังกฤษ ตัวเลข หรือ _ เท่านั้น (ใช้อักษรไทยไม่ได้)"
|
||||
override val srvNickGuestPattern = "ชื่อนี้คล้ายชื่อผู้เยี่ยมชม จึงใช้ไม่ได้"
|
||||
override val srvNickTaken = "ชื่อเล่นนี้มีคนใช้แล้ว"
|
||||
override val srvEmailInvalid = "รูปแบบอีเมลไม่ถูกต้อง"
|
||||
override val srvPasswordShort = "รหัสผ่านต้องมีอย่างน้อย 8 ตัวอักษร"
|
||||
override val srvEmailTaken = "อีเมลนี้สมัครสมาชิกแล้ว"
|
||||
override val srvWrongLogin = "อีเมลหรือรหัสผ่านไม่ถูกต้อง"
|
||||
override val srvGoogleNotReady = "ยังไม่ได้ตั้งค่าการเข้าสู่ระบบด้วย Google"
|
||||
override val srvGoogleFailed = "เข้าสู่ระบบด้วย Google ไม่สำเร็จ"
|
||||
override val srvLoginRequired = "กรุณาเข้าสู่ระบบ"
|
||||
override val srvGuestNick = "ผู้เยี่ยมชมเปลี่ยนชื่อเล่นไม่ได้ กรุณาเข้าสู่ระบบ"
|
||||
override fun srvNickCooldown(days: Int) = "เปลี่ยนชื่อเล่นได้ 30 วันต่อครั้ง (เหลืออีก $days วัน)"
|
||||
override val srvBadRecord = "สถิติไม่ถูกต้อง"
|
||||
override val srvRoomCreateFailed = "สร้างรหัสห้องไม่สำเร็จ กรุณาลองใหม่อีกครั้ง"
|
||||
override val srvBadCode = "รหัสไม่ถูกต้อง"
|
||||
override val srvNoRoom = "ไม่มีห้องนี้"
|
||||
override val srvServerError = "เซิร์ฟเวอร์ขัดข้อง"
|
||||
override val srvMatchOver = "แมตช์นี้จบไปแล้ว"
|
||||
override val srvNotParticipant = "คุณไม่ได้อยู่ในแมตช์นี้"
|
||||
override val srvNeedTwo = "ต้องมีผู้เล่นอย่างน้อย 2 คนจึงจะเริ่มได้"
|
||||
override val srvBadBadge = "เหรียญตราไม่ถูกต้อง"
|
||||
override val srvNoBadge = "คุณไม่มีเหรียญตรานี้"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Tr : Strings {
|
||||
override val back = "← Geri"
|
||||
override val home = "Ana sayfa"
|
||||
override val exit = "Çık"
|
||||
override val cancel = "İptal"
|
||||
override val loading = "Yükleniyor…"
|
||||
override val guest = "Misafir"
|
||||
override val account = "Hesap"
|
||||
override val offline = "Çevrimdışı"
|
||||
override val comingSoon = "Yakında"
|
||||
override val shareResult = "Sonuç görselini paylaş"
|
||||
override val league = "Lig"
|
||||
override val custom = "Özel"
|
||||
override val win = "Zafer!"
|
||||
override val lose = "Yenilgi"
|
||||
override val ended = "Bitti"
|
||||
override val disconnected = "Koptu"
|
||||
override val meSuffix = " (ben)"
|
||||
override fun wins(n: Int) = "$n galibiyet"
|
||||
override fun placement(n: Int) = "Yerleştirme $n/10"
|
||||
override val score = "Skor"
|
||||
override val lines = "Satır"
|
||||
override val time = "Süre"
|
||||
override val rank = "Rütbe"
|
||||
override val error = "Hata"
|
||||
override fun errorCode(code: Int) = "Hata ($code)"
|
||||
override val cannotConnect = "Sunucuya bağlanılamıyor"
|
||||
override val connectionLost = "Bağlantı koptu"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Lig"
|
||||
override val modeLeagueSub = "Gerçek zamanlı 1v1 dereceli · 10 yerleştirme maçı"
|
||||
override val modeCustomSub = "Kodla oluştur veya katıl · Oyuncu sınırı yok"
|
||||
override val tabHome = "Ana Sayfa"
|
||||
override val tabLeaderboard = "Sıralama"
|
||||
override val tabProfile = "Profil"
|
||||
override val tabShop = "Mağaza"
|
||||
override val tabSettings = "Ayarlar"
|
||||
override val noRecord = "Rekor yok"
|
||||
override val sprintDesc = "40 satırı olabildiğince hızlı temizle"
|
||||
override val timeAttackDesc = "2 dakikalık skor yarışı · Hızlanır"
|
||||
override val endlessDesc = "Sonsuz · TOP OUT sonrası da devam"
|
||||
override val versusDesc = "Düello"
|
||||
|
||||
override val continuedNotRecorded = "Bu oyuna devam ettin, bu yüzden rekorlarına ve sıralamaya yansımaz"
|
||||
override val playAgain = "Tekrar oyna"
|
||||
|
||||
override val ghost = "Hayalet blok"
|
||||
override val ghostSub = "Parçanın ineceği yeri göster"
|
||||
override val lefty = "Solak düzeni"
|
||||
override val leftySub = "Kontrol tuşlarını yansıt"
|
||||
override val bigButtons = "Büyük tuşlar"
|
||||
override val bigButtonsSub = "Tablet ve katlanabilir cihazlarda daha büyük tuşlar"
|
||||
override val adPrivacy = "Reklam gizliliği ayarları"
|
||||
override val adPrivacySub = "Reklam kişiselleştirme iznini değiştir"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Devam"
|
||||
override val continuedBanner = "Devam edildi · Kaydedilmez"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Kalan süre $time · Skor $score"
|
||||
override val continueOffer = "Bir reklamı sonuna kadar izle; skorun ve kalan sürenle boş tahtada devam et (oyun başına bir kez).\nDevam edilen oyunların skoru rekorlarına ve sıralamaya yansımaz."
|
||||
override val loadingAd = "Reklam yükleniyor…"
|
||||
override val watchToContinue = "▶ Reklam izle ve devam et"
|
||||
override val seeResult = "Sonuç"
|
||||
override val hardDrop = "Hızlı düşür"
|
||||
override val softDrop = "▼ Yavaş"
|
||||
override val paused = "Duraklatıldı"
|
||||
override val resume = "Devam"
|
||||
|
||||
override val loginPitch = "Lig oynamak, sıralamada yer almak ve takma adını değiştirmek için giriş yap. Misafir rekorların hesabına taşınır."
|
||||
override val emailSignup = "E-postayla kayıt"
|
||||
override val login = "Giriş yap"
|
||||
override val email = "E-posta"
|
||||
override val passwordHint = "Şifre (en az 8 karakter)"
|
||||
override val nickOptional = "Takma ad (isteğe bağlı, 2–12 karakter)"
|
||||
override val processing = "İşleniyor…"
|
||||
override val signUp = "Hesap oluştur"
|
||||
override val noPasswordReset = "Şifre sıfırlama henüz yok. Lütfen şifreni unutma."
|
||||
override val nickChangeTitle = "Takma ad değiştir (30 günde bir)"
|
||||
override val nickChange = "Takma adı değiştir"
|
||||
override val changed = "Değiştirildi"
|
||||
override val logout = "Çıkış yap"
|
||||
override val deleteConfirm = "Kesinlikle sil (geri alınamaz)"
|
||||
override val deleteAccount = "Hesabı sil"
|
||||
override val deleteWarning = "Hesabın, lig puanın, sunucu rekorların ve özel maç geçmişin tamamen silinecek. Devam etmek için bir kez daha dokun."
|
||||
override val seasonRecord = "Sezon kaydı"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}G ${losses}M"
|
||||
override val recentMatches = "Son maçlar"
|
||||
override val noMatches = "Henüz maç yok"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Lig · ${if (won) "G" else "M"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Özel · $size kişide #$place · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Henüz 10 yerleştirme maçını bitiren oyuncu yok"
|
||||
override val lbEmptySolo = "Henüz kayıt yok (yalnızca giriş yapan oyuncular listelenir)"
|
||||
|
||||
override val createRoom = "Oda kur"
|
||||
override val createRoomDesc = "6 haneli bir kod alırsın. Arkadaşlarınla paylaş. Oyuncu sınırı yok."
|
||||
override val creating = "Kuruluyor…"
|
||||
override val joinTitle = "Odaya katıl"
|
||||
override val codeHint = "6 haneli kod"
|
||||
override val join = "Katıl"
|
||||
override val noSuchRoom = "Bu kodla bir oda yok"
|
||||
|
||||
override val matchFound = "Maç bulundu!"
|
||||
override val searching = "Rakip aranıyor"
|
||||
override fun seconds(s: String) = "$s sn"
|
||||
override val rankPending = "Rütbe belirleniyor"
|
||||
override val queueLong = "Bekleme uzuyor. Özel odada arkadaşlarınla oynamayı dene."
|
||||
override val openCustom = "Özel oda aç"
|
||||
override val leagueNeedsLogin = "Lig oynamak için giriş yap"
|
||||
override val queueLost = "Sıra bağlantısı koptu"
|
||||
|
||||
override val connectionClosed = "Bağlantı kesildi"
|
||||
override val connecting = "Bağlanıyor"
|
||||
override val reconnecting = "Yeniden bağlanılıyor…"
|
||||
override val customLobby = "Özel lobi"
|
||||
override val roomCode = "Oda kodu"
|
||||
override val inviteHint = "Arkadaşlarına kodu veya davet bağlantısını gönder"
|
||||
override val sendInvite = "Davet bağlantısı gönder"
|
||||
override fun playersCount(n: Int) = "$n oyuncu"
|
||||
override val rulesHost = "Kurallar (kurucu)"
|
||||
override val rules = "Kurallar"
|
||||
override val garbageMul = "Çöp çarpanı"
|
||||
override val targetWins = "Hedef galibiyet"
|
||||
override val unlimited = "Sınırsız"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Aynı bag (adil)"
|
||||
override val personalBag = "Kişisel bag"
|
||||
override val overtime = "Uzatma çarpanı"
|
||||
override val overtimeOn = "Açık (90 sn sonra 30 sn'de +%25)"
|
||||
override val off = "Kapalı"
|
||||
override val needTwo = "2+ oyuncu olunca başlar"
|
||||
override val start = "Başla"
|
||||
override val waitingHost = "Kurucunun başlatması bekleniyor…"
|
||||
override val host = "Kurucu"
|
||||
override val waitingOpponent = "Rakip bekleniyor…"
|
||||
override val forfeitExit = "Pes et ve çık"
|
||||
override val forfeit = "Pes et"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Galibiyetim $wins · Hayatta $alive/$total"
|
||||
override val spectating = "İzleyici"
|
||||
override val joinNextRound = "Sonraki turdan itibaren katılırsın"
|
||||
override val nextRoundPrep = "Sonraki tur başlıyor…"
|
||||
override val spectatingSub = "İzliyorsun · Tur bitince tekrar oynarsın"
|
||||
override val leagueResult = "Lig sonucu"
|
||||
override val casualResult = "Maç sonucu"
|
||||
override fun placementReveal(n: Int) = "Yerleştirme $n/10 — TR 10 maçtan sonra açıklanır"
|
||||
override val ratingError = "Puan güncellenemedi — bu maç kaydedilmemiş olabilir"
|
||||
override val opponent = "Rakip"
|
||||
override val scoreLabel = "Skor"
|
||||
override val standing = "Sıra"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Kazanılan tur"
|
||||
override val customBrawl = "Özel kapışma"
|
||||
override val requeue = "Yeni maç bul"
|
||||
override val rematchVote = "Rövanş oyu ver"
|
||||
override val rematchCancel = "Rövanş oyunu geri çek"
|
||||
override fun feedForfeit(nick: String) = "$nick pes etti"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick elendi"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Berabere"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Kazandın!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick kazandı"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "TETRIG özel odama katıl! Kod $code\n$url"
|
||||
override val share = "Paylaş"
|
||||
override val searchOnPlay = "Google Play'de TETRIG'i ara"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Geçiş reklamları kapalı · $minutes dk kaldı"
|
||||
override val adPlaying = "Reklam oynatılıyor…"
|
||||
override val adFreeOffer = "▶ 1 reklam izle, 30 dk geçiş reklamı olmasın"
|
||||
override val adFreeNotReady = "30 dk geçiş reklamı kapat · Reklam hazır değil"
|
||||
override val adFreeDesc = "Sonuna kadar izlersen 30 dakika boyunca oyunlar arasında geçiş reklamı çıkmaz"
|
||||
override val blockSkins = "Blok görünümleri"
|
||||
override val boardThemes = "Tahta temaları"
|
||||
override val unlockFree = "Varsayılan"
|
||||
override val unlockRewarded = "Reklamla aç"
|
||||
override fun unlockPass(level: Int) = "Sezon pası Lv $level"
|
||||
override val equipped = "Kullanılıyor"
|
||||
override val equip = "Kullan"
|
||||
override val watchToUnlock = "▶ Reklam izle ve aç"
|
||||
override val adNotReady = "Reklam hazır değil"
|
||||
override val badges = "Rozetler"
|
||||
override val badgesDesc = "Takma adının yanında lobilerde ve sıralamada görünür. Sezon pasıyla kazanılır."
|
||||
override val noBadges = "Henüz rozetin yok"
|
||||
override val equippedUnequip = "Kullanılıyor · Çıkar"
|
||||
override val seasonPass = "Sezon pası"
|
||||
override val seasonPassDesc = "Her oyunda XP kazan, seviye ödüllerinin kilidini aç. Solo +10 · Özel +20 (1. olursan +10) · Lig +25 (galibiyet +15)"
|
||||
override val passComplete = "Tamam"
|
||||
override val obtained = "Alındı"
|
||||
override val passFooter = "Kazandığın ödüller sezon bittikten sonra da senin kalır."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Klasik"; "riso" -> "Riso"; "chalk" -> "Tebeşir"; "outline" -> "Kontur"
|
||||
"signal" -> "Sinyal"; "mono" -> "Mono"; "supporter" -> "Destekçi"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Mürekkep"; "graphite" -> "Grafit"; "oxide" -> "Oksit"; "nogrid" -> "Izgarasız"; "moss" -> "Yosun"; else -> id
|
||||
}
|
||||
override val itemSkin = "Blok görünümü"
|
||||
override val itemBoard = "Tahta teması"
|
||||
override val itemBadge = "Rozet"
|
||||
override fun badgeFinish(season: String) = "S$season FINISH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Takma ad 2–12 karakter olmalı: yalnızca Korece (Hangul) veya İngilizce harfler, rakamlar ya da _ kullanılabilir (ç, ğ, ı, ö, ş, ü gibi harfler kullanılamaz)"
|
||||
override val srvNickGuestPattern = "Bu takma ad misafir adına benziyor, kullanılamaz"
|
||||
override val srvNickTaken = "Bu takma ad zaten alınmış"
|
||||
override val srvEmailInvalid = "Geçersiz e-posta adresi"
|
||||
override val srvPasswordShort = "Şifre en az 8 karakter olmalı"
|
||||
override val srvEmailTaken = "Bu e-posta zaten kayıtlı"
|
||||
override val srvWrongLogin = "E-posta veya şifre hatalı"
|
||||
override val srvGoogleNotReady = "Google ile giriş henüz ayarlanmadı"
|
||||
override val srvGoogleFailed = "Google ile giriş başarısız"
|
||||
override val srvLoginRequired = "Lütfen giriş yap"
|
||||
override val srvGuestNick = "Misafirler takma adını değiştiremez. Lütfen giriş yap"
|
||||
override fun srvNickCooldown(days: Int) = "Takma adını 30 günde bir değiştirebilirsin ($days gün kaldı)"
|
||||
override val srvBadRecord = "Geçersiz kayıt"
|
||||
override val srvRoomCreateFailed = "Oda kodu oluşturulamadı. Lütfen tekrar dene"
|
||||
override val srvBadCode = "Geçersiz kod"
|
||||
override val srvNoRoom = "Böyle bir oda yok"
|
||||
override val srvServerError = "Sunucu hatası"
|
||||
override val srvMatchOver = "Bu maç zaten bitti"
|
||||
override val srvNotParticipant = "Bu maçta yer almıyorsun"
|
||||
override val srvNeedTwo = "Başlamak için en az 2 oyuncu gerekli"
|
||||
override val srvBadBadge = "Geçersiz rozet"
|
||||
override val srvNoBadge = "Bu rozete sahip değilsin"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object Vi : Strings {
|
||||
override val back = "← Quay lại"
|
||||
override val home = "Trang chủ"
|
||||
override val exit = "Thoát"
|
||||
override val cancel = "Hủy"
|
||||
override val loading = "Đang tải…"
|
||||
override val guest = "Khách"
|
||||
override val account = "Tài khoản"
|
||||
override val offline = "Ngoại tuyến"
|
||||
override val comingSoon = "Sắp ra"
|
||||
override val shareResult = "Chia sẻ ảnh kết quả"
|
||||
override val league = "Liên đấu"
|
||||
override val custom = "Tùy chỉnh"
|
||||
override val win = "Chiến thắng!"
|
||||
override val lose = "Thua"
|
||||
override val ended = "Kết thúc"
|
||||
override val disconnected = "Mất kết nối"
|
||||
override val meSuffix = " (tôi)"
|
||||
override fun wins(n: Int) = "$n thắng"
|
||||
override fun placement(n: Int) = "Xếp hạng $n/10"
|
||||
override val score = "Điểm"
|
||||
override val lines = "Hàng"
|
||||
override val time = "Thời gian"
|
||||
override val rank = "Hạng"
|
||||
override val error = "Lỗi"
|
||||
override fun errorCode(code: Int) = "Lỗi ($code)"
|
||||
override val cannotConnect = "Không thể kết nối tới máy chủ"
|
||||
override val connectionLost = "Mất kết nối"
|
||||
|
||||
override val solo = "Solo"
|
||||
override val modeLeague = "Online · Liên đấu"
|
||||
override val modeLeagueSub = "Xếp hạng 1v1 thời gian thực · 10 trận xếp hạng ban đầu"
|
||||
override val modeCustomSub = "Tạo hoặc vào phòng bằng mã · Không giới hạn người chơi"
|
||||
override val tabHome = "Home"
|
||||
override val tabLeaderboard = "BXH"
|
||||
override val tabProfile = "Hồ sơ"
|
||||
override val tabShop = "Cửa hàng"
|
||||
override val tabSettings = "Cài đặt"
|
||||
override val noRecord = "Chưa có kỷ lục"
|
||||
override val sprintDesc = "Xóa 40 hàng nhanh nhất có thể"
|
||||
override val timeAttackDesc = "Đua điểm 2 phút · Tốc độ tăng dần"
|
||||
override val endlessDesc = "Vô tận · Vẫn chơi tiếp sau TOP OUT"
|
||||
override val versusDesc = "Đối kháng"
|
||||
|
||||
override val continuedNotRecorded = "Ván này đã dùng chơi tiếp nên không được tính vào kỷ lục và bảng xếp hạng"
|
||||
override val playAgain = "Chơi lại"
|
||||
|
||||
override val ghost = "Bóng khối"
|
||||
override val ghostSub = "Xem trước vị trí khối rơi xuống"
|
||||
override val lefty = "Bố cục tay trái"
|
||||
override val leftySub = "Đảo vị trí các nút điều khiển"
|
||||
override val bigButtons = "Nút lớn"
|
||||
override val bigButtonsSub = "Nút to hơn trên máy tính bảng và điện thoại gập"
|
||||
override val adPrivacy = "Quyền riêng tư quảng cáo"
|
||||
override val adPrivacySub = "Thay đổi lựa chọn cá nhân hóa quảng cáo"
|
||||
|
||||
override val topOutContinue = "TOP OUT · Tiếp tục"
|
||||
override val continuedBanner = "Chơi tiếp · Không ghi nhận"
|
||||
override fun timeLeftScore(time: String, score: Int) = "Còn lại $time · Điểm $score"
|
||||
override val continueOffer = "Xem hết quảng cáo để chơi tiếp trên bảng trống, giữ nguyên điểm và thời gian còn lại (1 lần mỗi ván).\nĐiểm của ván chơi tiếp không được tính vào kỷ lục và bảng xếp hạng."
|
||||
override val loadingAd = "Đang tải quảng cáo…"
|
||||
override val watchToContinue = "▶ Xem quảng cáo để chơi tiếp"
|
||||
override val seeResult = "Xem kết quả"
|
||||
override val hardDrop = "Thả nhanh"
|
||||
override val softDrop = "▼ Thả chậm"
|
||||
override val paused = "Tạm dừng"
|
||||
override val resume = "Tiếp tục"
|
||||
|
||||
override val loginPitch = "Đăng nhập để chơi Liên đấu, lên bảng xếp hạng và đổi biệt danh. Kỷ lục khách của bạn sẽ được chuyển sang tài khoản."
|
||||
override val emailSignup = "Đăng ký"
|
||||
override val login = "Đăng nhập"
|
||||
override val email = "Email"
|
||||
override val passwordHint = "Mật khẩu (từ 8 ký tự)"
|
||||
override val nickOptional = "Biệt danh (tùy chọn, 2–12 ký tự)"
|
||||
override val processing = "Đang xử lý…"
|
||||
override val signUp = "Tạo tài khoản"
|
||||
override val noPasswordReset = "Chưa hỗ trợ đặt lại mật khẩu. Hãy nhớ kỹ mật khẩu của bạn."
|
||||
override val nickChangeTitle = "Đổi biệt danh (30 ngày một lần)"
|
||||
override val nickChange = "Đổi biệt danh"
|
||||
override val changed = "Đã thay đổi"
|
||||
override val logout = "Đăng xuất"
|
||||
override val deleteConfirm = "Xác nhận xóa (không thể hoàn tác)"
|
||||
override val deleteAccount = "Xóa tài khoản"
|
||||
override val deleteWarning = "Tài khoản, điểm xếp hạng liên đấu, kỷ lục trên máy chủ và lịch sử trận tùy chỉnh sẽ bị xóa hết. Nhấn thêm lần nữa để tiếp tục."
|
||||
override val seasonRecord = "Thành tích mùa"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}T ${losses}B"
|
||||
override val recentMatches = "Trận gần đây"
|
||||
override val noMatches = "Chưa có trận nào"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "Liên đấu · ${if (won) "Thắng" else "Thua"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "Tùy chỉnh · Hạng $place/$size · ${wins(wins)}"
|
||||
|
||||
override val lbEmptyLeague = "Chưa có người chơi nào hoàn thành 10 trận xếp hạng ban đầu"
|
||||
override val lbEmptySolo = "Chưa có kỷ lục nào (chỉ người chơi đã đăng nhập mới được liệt kê)"
|
||||
|
||||
override val createRoom = "Tạo phòng"
|
||||
override val createRoomDesc = "Bạn sẽ nhận được mã 6 ký tự. Hãy chia sẻ cho bạn bè. Không giới hạn người chơi."
|
||||
override val creating = "Đang tạo…"
|
||||
override val joinTitle = "Vào phòng"
|
||||
override val codeHint = "Mã 6 ký tự"
|
||||
override val join = "Vào"
|
||||
override val noSuchRoom = "Không có phòng nào với mã này"
|
||||
|
||||
override val matchFound = "Đã tìm thấy trận!"
|
||||
override val searching = "Đang tìm đối thủ"
|
||||
override fun seconds(s: String) = "${s} giây"
|
||||
override val rankPending = "Đang xếp hạng"
|
||||
override val queueLong = "Thời gian chờ hơi lâu. Hãy thử chơi cùng bạn bè trong phòng tùy chỉnh."
|
||||
override val openCustom = "Mở phòng tùy chỉnh"
|
||||
override val leagueNeedsLogin = "Đăng nhập để chơi Liên đấu"
|
||||
override val queueLost = "Mất kết nối với hàng chờ"
|
||||
|
||||
override val connectionClosed = "Đã ngắt kết nối"
|
||||
override val connecting = "Đang kết nối"
|
||||
override val reconnecting = "Đang kết nối lại…"
|
||||
override val customLobby = "Sảnh tùy chỉnh"
|
||||
override val roomCode = "Mã phòng"
|
||||
override val inviteHint = "Gửi mã hoặc liên kết mời cho bạn bè"
|
||||
override val sendInvite = "Gửi liên kết mời"
|
||||
override fun playersCount(n: Int) = "$n người chơi"
|
||||
override val rulesHost = "Luật chơi (chủ phòng)"
|
||||
override val rules = "Luật chơi"
|
||||
override val garbageMul = "Hệ số garbage"
|
||||
override val targetWins = "Thắng trước"
|
||||
override val unlimited = "Không giới hạn"
|
||||
override val seed = "Seed"
|
||||
override val sameBag = "Cùng bag (công bằng)"
|
||||
override val personalBag = "Bag riêng"
|
||||
override val overtime = "Hệ số kéo dài"
|
||||
override val overtimeOn = "Bật (+25%/30 giây sau 90 giây)"
|
||||
override val off = "Tắt"
|
||||
override val needTwo = "Bắt đầu khi có từ 2 người"
|
||||
override val start = "Bắt đầu"
|
||||
override val waitingHost = "Đang chờ chủ phòng bắt đầu…"
|
||||
override val host = "Chủ phòng"
|
||||
override val waitingOpponent = "Đang chờ đối thủ…"
|
||||
override val forfeitExit = "Đầu hàng và thoát"
|
||||
override val forfeit = "Đầu hàng"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "Tôi thắng $wins · Còn sống $alive/$total"
|
||||
override val spectating = "Đang xem"
|
||||
override val joinNextRound = "Bạn sẽ vào từ vòng sau"
|
||||
override val nextRoundPrep = "Đang chuẩn bị vòng sau…"
|
||||
override val spectatingSub = "Đang xem · Bạn sẽ chơi lại khi vòng kết thúc"
|
||||
override val leagueResult = "Kết quả Liên đấu"
|
||||
override val casualResult = "Kết quả trận"
|
||||
override fun placementReveal(n: Int) = "Xếp hạng $n/10 — TR hiển thị sau 10 trận"
|
||||
override val ratingError = "Lỗi cập nhật điểm xếp hạng — trận này có thể chưa được lưu"
|
||||
override val opponent = "Đối thủ"
|
||||
override val scoreLabel = "Điểm"
|
||||
override val standing = "Thứ hạng"
|
||||
override fun placeOf(place: Int, total: Int) = "#$place / $total"
|
||||
override val roundWins = "Vòng thắng"
|
||||
override val customBrawl = "Hỗn chiến tùy chỉnh"
|
||||
override val requeue = "Tìm trận khác"
|
||||
override val rematchVote = "Bình chọn tái đấu"
|
||||
override val rematchCancel = "Hủy bình chọn tái đấu"
|
||||
override fun feedForfeit(nick: String) = "$nick đầu hàng"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick bị loại"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · Hòa"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · Bạn thắng!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick thắng"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "Vào phòng tùy chỉnh TETRIG của mình nhé! Mã $code\n$url"
|
||||
override val share = "Chia sẻ"
|
||||
override val searchOnPlay = "Tìm TETRIG trên Google Play"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "Tắt quảng cáo xen kẽ · còn $minutes phút"
|
||||
override val adPlaying = "Đang phát quảng cáo…"
|
||||
override val adFreeOffer = "▶ Xem 1 quảng cáo để tắt quảng cáo xen kẽ 30 phút"
|
||||
override val adFreeNotReady = "Tắt quảng cáo xen kẽ 30 phút · Quảng cáo chưa sẵn sàng"
|
||||
override val adFreeDesc = "Xem hết quảng cáo, và sẽ không có quảng cáo xen kẽ giữa các ván trong 30 phút"
|
||||
override val blockSkins = "Giao diện khối"
|
||||
override val boardThemes = "Chủ đề bảng"
|
||||
override val unlockFree = "Mặc định"
|
||||
override val unlockRewarded = "Mở khóa bằng quảng cáo"
|
||||
override fun unlockPass(level: Int) = "Thẻ mùa Lv $level"
|
||||
override val equipped = "Đang dùng"
|
||||
override val equip = "Dùng"
|
||||
override val watchToUnlock = "▶ Xem QC để mở"
|
||||
override val adNotReady = "Quảng cáo chưa sẵn sàng"
|
||||
override val badges = "Huy hiệu"
|
||||
override val badgesDesc = "Hiển thị cạnh biệt danh của bạn trong sảnh và bảng xếp hạng. Nhận được từ thẻ mùa."
|
||||
override val noBadges = "Chưa có huy hiệu nào"
|
||||
override val equippedUnequip = "Đang dùng · Gỡ"
|
||||
override val seasonPass = "Thẻ mùa"
|
||||
override val seasonPassDesc = "Chơi mỗi ván để nhận XP và mở khóa phần thưởng theo cấp. Solo +10 · Tùy chỉnh +20 (hạng 1 +10) · Liên đấu +25 (thắng +15)"
|
||||
override val passComplete = "Hoàn thành"
|
||||
override val obtained = "Đã nhận"
|
||||
override val passFooter = "Phần thưởng đã nhận vẫn thuộc về bạn sau khi mùa kết thúc."
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "Cổ điển"; "riso" -> "Riso"; "chalk" -> "Phấn"; "outline" -> "Viền"
|
||||
"signal" -> "Tín hiệu"; "mono" -> "Đơn sắc"; "supporter" -> "Ủng hộ"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "Mực"; "graphite" -> "Than chì"; "oxide" -> "Oxit"; "nogrid" -> "Không lưới"; "moss" -> "Rêu"; else -> id
|
||||
}
|
||||
override val itemSkin = "Giao diện khối"
|
||||
override val itemBoard = "Chủ đề bảng"
|
||||
override val itemBadge = "Huy hiệu"
|
||||
override fun badgeFinish(season: String) = "S$season HOÀN THÀNH"
|
||||
override fun badgePass(season: String) = "S$season PASS"
|
||||
override fun badgeElite(season: String) = "S$season ELITE"
|
||||
|
||||
override val srvNickRule = "Biệt danh phải dài 2–12 ký tự, chỉ gồm chữ Hàn (Hangul), chữ cái tiếng Anh (không dấu), chữ số hoặc _"
|
||||
override val srvNickGuestPattern = "Biệt danh này giống tên khách nên không thể dùng"
|
||||
override val srvNickTaken = "Biệt danh này đã có người dùng"
|
||||
override val srvEmailInvalid = "Địa chỉ email không hợp lệ"
|
||||
override val srvPasswordShort = "Mật khẩu phải có ít nhất 8 ký tự"
|
||||
override val srvEmailTaken = "Email này đã được đăng ký"
|
||||
override val srvWrongLogin = "Email hoặc mật khẩu không đúng"
|
||||
override val srvGoogleNotReady = "Đăng nhập Google chưa được thiết lập"
|
||||
override val srvGoogleFailed = "Đăng nhập Google thất bại"
|
||||
override val srvLoginRequired = "Vui lòng đăng nhập"
|
||||
override val srvGuestNick = "Khách không thể đổi biệt danh. Vui lòng đăng nhập"
|
||||
override fun srvNickCooldown(days: Int) = "Biệt danh chỉ đổi được 30 ngày một lần (còn $days ngày)"
|
||||
override val srvBadRecord = "Kỷ lục không hợp lệ"
|
||||
override val srvRoomCreateFailed = "Không thể tạo mã phòng. Vui lòng thử lại"
|
||||
override val srvBadCode = "Mã không hợp lệ"
|
||||
override val srvNoRoom = "Phòng này không tồn tại"
|
||||
override val srvServerError = "Lỗi máy chủ"
|
||||
override val srvMatchOver = "Trận này đã kết thúc"
|
||||
override val srvNotParticipant = "Bạn không tham gia trận này"
|
||||
override val srvNeedTwo = "Cần ít nhất 2 người chơi để bắt đầu"
|
||||
override val srvBadBadge = "Huy hiệu không hợp lệ"
|
||||
override val srvNoBadge = "Bạn không có huy hiệu này"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object ZhHans : Strings {
|
||||
override val back = "← 返回"
|
||||
override val home = "返回首页"
|
||||
override val exit = "退出"
|
||||
override val cancel = "取消"
|
||||
override val loading = "加载中…"
|
||||
override val guest = "游客"
|
||||
override val account = "账号"
|
||||
override val offline = "离线"
|
||||
override val comingSoon = "敬请期待"
|
||||
override val shareResult = "分享战绩图"
|
||||
override val league = "联赛"
|
||||
override val custom = "自定义"
|
||||
override val win = "胜利!"
|
||||
override val lose = "失败"
|
||||
override val ended = "结束"
|
||||
override val disconnected = "断线"
|
||||
override val meSuffix = " (我)"
|
||||
override fun wins(n: Int) = "${n}胜"
|
||||
override fun placement(n: Int) = "定级赛 $n/10"
|
||||
override val score = "分数"
|
||||
override val lines = "行数"
|
||||
override val time = "用时"
|
||||
override val rank = "段位"
|
||||
override val error = "错误"
|
||||
override fun errorCode(code: Int) = "错误 ($code)"
|
||||
override val cannotConnect = "无法连接服务器"
|
||||
override val connectionLost = "连接已断开"
|
||||
|
||||
override val solo = "单人"
|
||||
override val modeLeague = "联机 · 联赛"
|
||||
override val modeLeagueSub = "实时 1v1 排位赛 · 10 场定级赛"
|
||||
override val modeCustomSub = "用房间码创建或加入 · 不限人数"
|
||||
override val tabHome = "首页"
|
||||
override val tabLeaderboard = "排行"
|
||||
override val tabProfile = "我的"
|
||||
override val tabShop = "商店"
|
||||
override val tabSettings = "设置"
|
||||
override val noRecord = "暂无记录"
|
||||
override val sprintDesc = "最快消除 40 行"
|
||||
override val timeAttackDesc = "2 分钟得分挑战 · 速度递增"
|
||||
override val endlessDesc = "无尽模式 · TOP OUT 后继续"
|
||||
override val versusDesc = "对战"
|
||||
|
||||
override val continuedNotRecorded = "本局使用了续玩,成绩不计入个人记录和排行榜"
|
||||
override val playAgain = "再来一局"
|
||||
|
||||
override val ghost = "显示落点"
|
||||
override val ghostSub = "预览方块落地位置"
|
||||
override val lefty = "左手布局"
|
||||
override val leftySub = "左右镜像操作按钮"
|
||||
override val bigButtons = "大按钮"
|
||||
override val bigButtonsSub = "在平板和折叠屏上放大按钮"
|
||||
override val adPrivacy = "广告隐私设置"
|
||||
override val adPrivacySub = "重新选择个性化广告授权"
|
||||
|
||||
override val topOutContinue = "TOP OUT · 继续"
|
||||
override val continuedBanner = "续玩 · 不计成绩"
|
||||
override fun timeLeftScore(time: String, score: Int) = "剩余时间 $time · 分数 $score"
|
||||
override val continueOffer = "完整观看广告后,可在空白棋盘上保留当前分数和剩余时间继续游戏(每局限 1 次)。\n续玩局的分数不会计入个人记录和排行榜。"
|
||||
override val loadingAd = "广告加载中…"
|
||||
override val watchToContinue = "▶ 看广告继续"
|
||||
override val seeResult = "查看结果"
|
||||
override val hardDrop = "硬降"
|
||||
override val softDrop = "▼ 软降"
|
||||
override val paused = "已暂停"
|
||||
override val resume = "继续"
|
||||
|
||||
override val loginPitch = "登录后即可参加联赛、登上排行榜并修改昵称。此前的游客记录会转移到你的账号。"
|
||||
override val emailSignup = "邮箱注册"
|
||||
override val login = "登录"
|
||||
override val email = "邮箱"
|
||||
override val passwordHint = "密码(至少 8 位)"
|
||||
override val nickOptional = "昵称(选填,2–12 个字符)"
|
||||
override val processing = "处理中…"
|
||||
override val signUp = "注册"
|
||||
override val noPasswordReset = "暂不支持重置密码,请务必牢记你的密码。"
|
||||
override val nickChangeTitle = "修改昵称(每 30 天 1 次)"
|
||||
override val nickChange = "修改昵称"
|
||||
override val changed = "已修改"
|
||||
override val logout = "退出登录"
|
||||
override val deleteConfirm = "确认删除(无法撤销)"
|
||||
override val deleteAccount = "删除账号"
|
||||
override val deleteWarning = "账号、联赛积分、服务器记录和自定义对战战绩将全部删除。再点一次即可继续。"
|
||||
override val seasonRecord = "赛季战绩"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}胜 ${losses}负"
|
||||
override val recentMatches = "最近战绩"
|
||||
override val noMatches = "暂无对战记录"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "联赛 · ${if (won) "胜" else "负"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "自定义 · ${size}人中第${place}名 · ${wins}胜"
|
||||
|
||||
override val lbEmptyLeague = "还没有玩家完成 10 场定级赛"
|
||||
override val lbEmptySolo = "暂无记录(仅登录玩家会上榜)"
|
||||
|
||||
override val createRoom = "创建房间"
|
||||
override val createRoomDesc = "将生成 6 位房间码,告诉朋友即可加入。不限人数。"
|
||||
override val creating = "创建中…"
|
||||
override val joinTitle = "加入房间"
|
||||
override val codeHint = "6 位房间码"
|
||||
override val join = "加入"
|
||||
override val noSuchRoom = "房间码不存在"
|
||||
|
||||
override val matchFound = "匹配成功!"
|
||||
override val searching = "正在寻找对手"
|
||||
override fun seconds(s: String) = "${s}秒"
|
||||
override val rankPending = "段位计算中"
|
||||
override val queueLong = "等待时间较长,可以去自定义房间和朋友一起玩。"
|
||||
override val openCustom = "创建自定义房间"
|
||||
override val leagueNeedsLogin = "登录后才能参加联赛"
|
||||
override val queueLost = "匹配队列连接已断开"
|
||||
|
||||
override val connectionClosed = "连接已关闭"
|
||||
override val connecting = "连接中"
|
||||
override val reconnecting = "重新连接中…"
|
||||
override val customLobby = "自定义大厅"
|
||||
override val roomCode = "房间码"
|
||||
override val inviteHint = "把房间码或邀请链接发给朋友"
|
||||
override val sendInvite = "发送邀请链接"
|
||||
override fun playersCount(n: Int) = "${n}名玩家"
|
||||
override val rulesHost = "规则(房主)"
|
||||
override val rules = "规则"
|
||||
override val garbageMul = "垃圾行倍率"
|
||||
override val targetWins = "目标胜场"
|
||||
override val unlimited = "不限"
|
||||
override val seed = "种子"
|
||||
override val sameBag = "相同 bag(公平赛)"
|
||||
override val personalBag = "独立 bag"
|
||||
override val overtime = "加时倍率"
|
||||
override val overtimeOn = "开(90 秒后每 30 秒 +25%)"
|
||||
override val off = "关"
|
||||
override val needTwo = "满 2 人即可开始"
|
||||
override val start = "开始"
|
||||
override val waitingHost = "等待房主开始…"
|
||||
override val host = "房主"
|
||||
override val waitingOpponent = "等待对手连接…"
|
||||
override val forfeitExit = "认输并退出"
|
||||
override val forfeit = "认输"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "我的胜场 $wins · 存活 $alive/$total"
|
||||
override val spectating = "观战中"
|
||||
override val joinNextRound = "下一回合起加入"
|
||||
override val nextRoundPrep = "下一回合准备中…"
|
||||
override val spectatingSub = "观战中 · 本回合结束后重新开始"
|
||||
override val leagueResult = "联赛结果"
|
||||
override val casualResult = "休闲赛结果"
|
||||
override fun placementReveal(n: Int) = "定级赛 $n/10 — 10 场后公布 TR"
|
||||
override val ratingError = "积分更新出错 — 本场战绩可能未保存"
|
||||
override val opponent = "对手"
|
||||
override val scoreLabel = "得分"
|
||||
override val standing = "名次"
|
||||
override fun placeOf(place: Int, total: Int) = "第${place}名 / ${total}人"
|
||||
override val roundWins = "回合胜场"
|
||||
override val customBrawl = "自定义大乱斗"
|
||||
override val requeue = "重新匹配"
|
||||
override val rematchVote = "投票再战"
|
||||
override val rematchCancel = "取消再战投票"
|
||||
override fun feedForfeit(nick: String) = "$nick 认输"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick 淘汰"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · 平局"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · 胜利!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick 获胜"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "来我的 TETRIG 自定义房间一起玩吧!房间码 $code\n$url"
|
||||
override val share = "分享"
|
||||
override val searchOnPlay = "在 Google Play 搜索 TETRIG"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "插屏广告已关闭 · 剩余 ${minutes} 分钟"
|
||||
override val adPlaying = "广告播放中…"
|
||||
override val adFreeOffer = "▶ 看 1 个广告,30 分钟内关闭插屏广告"
|
||||
override val adFreeNotReady = "关闭插屏广告 30 分钟 · 广告准备中"
|
||||
override val adFreeDesc = "完整观看后,30 分钟内局间不再弹出插屏广告"
|
||||
override val blockSkins = "方块皮肤"
|
||||
override val boardThemes = "棋盘主题"
|
||||
override val unlockFree = "默认"
|
||||
override val unlockRewarded = "看广告解锁"
|
||||
override fun unlockPass(level: Int) = "赛季通行证 Lv $level"
|
||||
override val equipped = "已装备"
|
||||
override val equip = "装备"
|
||||
override val watchToUnlock = "▶ 看广告解锁"
|
||||
override val adNotReady = "广告准备中"
|
||||
override val badges = "徽章"
|
||||
override val badgesDesc = "显示在昵称旁,其他玩家可在大厅和排行榜中看到。通过赛季通行证获得。"
|
||||
override val noBadges = "还没有徽章"
|
||||
override val equippedUnequip = "已装备 · 卸下"
|
||||
override val seasonPass = "赛季通行证"
|
||||
override val seasonPassDesc = "每玩一局都会累积 XP,解锁等级奖励。单人每局 +10 · 自定义 +20(第 1 名 +10)· 联赛 +25(胜利 +15)"
|
||||
override val passComplete = "完赛"
|
||||
override val obtained = "已获得"
|
||||
override val passFooter = "已获得的奖励在赛季结束后依然可用。"
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "经典"; "riso" -> "套色印刷"; "chalk" -> "粉笔"; "outline" -> "描边"
|
||||
"signal" -> "信号"; "mono" -> "单色"; "supporter" -> "支持者"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "墨水"; "graphite" -> "石墨"; "oxide" -> "氧化铁"; "nogrid" -> "无网格"; "moss" -> "苔藓"; else -> id
|
||||
}
|
||||
override val itemSkin = "方块皮肤"
|
||||
override val itemBoard = "棋盘主题"
|
||||
override val itemBadge = "徽章"
|
||||
override fun badgeFinish(season: String) = "S$season 完赛"
|
||||
override fun badgePass(season: String) = "S$season 通行证"
|
||||
override fun badgeElite(season: String) = "S$season 精英"
|
||||
|
||||
override val srvNickRule = "昵称须为 2–12 个字符,仅限韩文(谚文)、英文字母、数字或 _"
|
||||
override val srvNickGuestPattern = "不能使用游客名称格式"
|
||||
override val srvNickTaken = "该昵称已被使用"
|
||||
override val srvEmailInvalid = "邮箱格式不正确"
|
||||
override val srvPasswordShort = "密码至少需要 8 位"
|
||||
override val srvEmailTaken = "该邮箱已注册"
|
||||
override val srvWrongLogin = "邮箱或密码错误"
|
||||
override val srvGoogleNotReady = "尚未配置 Google 登录"
|
||||
override val srvGoogleFailed = "Google 验证失败"
|
||||
override val srvLoginRequired = "请先登录"
|
||||
override val srvGuestNick = "游客无法修改昵称,请先登录"
|
||||
override fun srvNickCooldown(days: Int) = "昵称每 30 天可修改一次(还需 ${days} 天)"
|
||||
override val srvBadRecord = "记录无效"
|
||||
override val srvRoomCreateFailed = "无法生成房间码,请重试"
|
||||
override val srvBadCode = "无效的代码"
|
||||
override val srvNoRoom = "房间不存在"
|
||||
override val srvServerError = "服务器错误"
|
||||
override val srvMatchOver = "该对局已结束"
|
||||
override val srvNotParticipant = "你不是该对局的参赛者"
|
||||
override val srvNeedTwo = "至少需要 2 名玩家才能开始"
|
||||
override val srvBadBadge = "无效的徽章"
|
||||
override val srvNoBadge = "你没有这个徽章"
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
object ZhHant : Strings {
|
||||
override val back = "← 返回"
|
||||
override val home = "回到首頁"
|
||||
override val exit = "離開"
|
||||
override val cancel = "取消"
|
||||
override val loading = "載入中…"
|
||||
override val guest = "訪客"
|
||||
override val account = "帳號"
|
||||
override val offline = "離線"
|
||||
override val comingSoon = "敬請期待"
|
||||
override val shareResult = "分享戰績圖"
|
||||
override val league = "聯賽"
|
||||
override val custom = "自訂"
|
||||
override val win = "勝利!"
|
||||
override val lose = "落敗"
|
||||
override val ended = "結束"
|
||||
override val disconnected = "斷線"
|
||||
override val meSuffix = " (我)"
|
||||
override fun wins(n: Int) = "${n}勝"
|
||||
override fun placement(n: Int) = "定位賽 $n/10"
|
||||
override val score = "分數"
|
||||
override val lines = "行數"
|
||||
override val time = "時間"
|
||||
override val rank = "段位"
|
||||
override val error = "錯誤"
|
||||
override fun errorCode(code: Int) = "錯誤 ($code)"
|
||||
override val cannotConnect = "無法連線至伺服器"
|
||||
override val connectionLost = "連線已中斷"
|
||||
|
||||
override val solo = "單人"
|
||||
override val modeLeague = "連線 · 聯賽"
|
||||
override val modeLeagueSub = "即時 1v1 排位賽 · 10 場定位賽"
|
||||
override val modeCustomSub = "用房號建立或加入 · 不限人數"
|
||||
override val tabHome = "首頁"
|
||||
override val tabLeaderboard = "排行"
|
||||
override val tabProfile = "我的"
|
||||
override val tabShop = "商店"
|
||||
override val tabSettings = "設定"
|
||||
override val noRecord = "尚無紀錄"
|
||||
override val sprintDesc = "最快消除 40 行"
|
||||
override val timeAttackDesc = "2 分鐘得分挑戰 · 速度遞增"
|
||||
override val endlessDesc = "無盡模式 · TOP OUT 後繼續"
|
||||
override val versusDesc = "對戰"
|
||||
|
||||
override val continuedNotRecorded = "本局使用了續玩,成績不會計入個人紀錄與排行榜"
|
||||
override val playAgain = "再玩一局"
|
||||
|
||||
override val ghost = "顯示落點"
|
||||
override val ghostSub = "預覽方塊落地位置"
|
||||
override val lefty = "左手配置"
|
||||
override val leftySub = "左右鏡像操作按鈕"
|
||||
override val bigButtons = "大按鈕"
|
||||
override val bigButtonsSub = "在平板與摺疊式裝置上放大按鈕"
|
||||
override val adPrivacy = "廣告隱私設定"
|
||||
override val adPrivacySub = "重新選擇個人化廣告的同意設定"
|
||||
|
||||
override val topOutContinue = "TOP OUT · 繼續"
|
||||
override val continuedBanner = "續玩 · 不計成績"
|
||||
override fun timeLeftScore(time: String, score: Int) = "剩餘時間 $time · 分數 $score"
|
||||
override val continueOffer = "完整觀看廣告後,可在空白棋盤上保留目前分數與剩餘時間繼續遊戲(每局限 1 次)。\n續玩局的分數不會計入個人紀錄與排行榜。"
|
||||
override val loadingAd = "廣告載入中…"
|
||||
override val watchToContinue = "▶ 看廣告繼續"
|
||||
override val seeResult = "查看結果"
|
||||
override val hardDrop = "硬降"
|
||||
override val softDrop = "▼ 軟降"
|
||||
override val paused = "已暫停"
|
||||
override val resume = "繼續"
|
||||
|
||||
override val loginPitch = "登入後即可參加聯賽、登上排行榜並更改暱稱。先前的訪客紀錄會轉移到你的帳號。"
|
||||
override val emailSignup = "以電子郵件註冊"
|
||||
override val login = "登入"
|
||||
override val email = "電子郵件"
|
||||
override val passwordHint = "密碼(至少 8 個字元)"
|
||||
override val nickOptional = "暱稱(選填,2–12 個字元)"
|
||||
override val processing = "處理中…"
|
||||
override val signUp = "註冊"
|
||||
override val noPasswordReset = "目前尚不支援重設密碼,請務必記住你的密碼。"
|
||||
override val nickChangeTitle = "更改暱稱(每 30 天 1 次)"
|
||||
override val nickChange = "更改暱稱"
|
||||
override val changed = "已更改"
|
||||
override val logout = "登出"
|
||||
override val deleteConfirm = "確定刪除(無法復原)"
|
||||
override val deleteAccount = "刪除帳號"
|
||||
override val deleteWarning = "帳號、聯賽積分、伺服器紀錄與自訂對戰戰績將全部刪除。再點一次即可繼續。"
|
||||
override val seasonRecord = "賽季戰績"
|
||||
override fun winLoss(wins: Int, losses: Int) = "${wins}勝 ${losses}敗"
|
||||
override val recentMatches = "近期戰績"
|
||||
override val noMatches = "尚無對戰紀錄"
|
||||
override fun historyLeague(won: Boolean, opponent: String, delta: String) = "聯賽 · ${if (won) "勝" else "敗"} vs $opponent · $delta TR"
|
||||
override fun historyCustom(size: Int, place: Int, wins: Int) = "自訂 · ${size}人中第${place}名 · ${wins}勝"
|
||||
|
||||
override val lbEmptyLeague = "還沒有玩家完成 10 場定位賽"
|
||||
override val lbEmptySolo = "尚無紀錄(僅登入的玩家會上榜)"
|
||||
|
||||
override val createRoom = "建立房間"
|
||||
override val createRoomDesc = "將產生 6 碼房號,告訴朋友即可加入。不限人數。"
|
||||
override val creating = "建立中…"
|
||||
override val joinTitle = "加入房間"
|
||||
override val codeHint = "6 碼房號"
|
||||
override val join = "加入"
|
||||
override val noSuchRoom = "房號不存在"
|
||||
|
||||
override val matchFound = "配對成功!"
|
||||
override val searching = "正在尋找對手"
|
||||
override fun seconds(s: String) = "${s}秒"
|
||||
override val rankPending = "段位計算中"
|
||||
override val queueLong = "等待時間較長,可以到自訂房間和朋友一起玩。"
|
||||
override val openCustom = "開啟自訂房間"
|
||||
override val leagueNeedsLogin = "登入後才能參加聯賽"
|
||||
override val queueLost = "配對佇列連線已中斷"
|
||||
|
||||
override val connectionClosed = "連線已結束"
|
||||
override val connecting = "連線中"
|
||||
override val reconnecting = "重新連線中…"
|
||||
override val customLobby = "自訂大廳"
|
||||
override val roomCode = "房號"
|
||||
override val inviteHint = "把房號或邀請連結傳給朋友"
|
||||
override val sendInvite = "傳送邀請連結"
|
||||
override fun playersCount(n: Int) = "${n}位玩家"
|
||||
override val rulesHost = "規則(房主)"
|
||||
override val rules = "規則"
|
||||
override val garbageMul = "垃圾行倍率"
|
||||
override val targetWins = "目標勝場"
|
||||
override val unlimited = "不限"
|
||||
override val seed = "種子"
|
||||
override val sameBag = "相同 bag(公平賽)"
|
||||
override val personalBag = "獨立 bag"
|
||||
override val overtime = "延長賽倍率"
|
||||
override val overtimeOn = "開(90 秒後每 30 秒 +25%)"
|
||||
override val off = "關"
|
||||
override val needTwo = "滿 2 人即可開始"
|
||||
override val start = "開始"
|
||||
override val waitingHost = "等待房主開始…"
|
||||
override val host = "房主"
|
||||
override val waitingOpponent = "等待對手連線…"
|
||||
override val forfeitExit = "認輸並離開"
|
||||
override val forfeit = "認輸"
|
||||
override fun myWinsAlive(wins: Int, alive: Int, total: Int) = "我的勝場 $wins · 存活 $alive/$total"
|
||||
override val spectating = "觀戰中"
|
||||
override val joinNextRound = "下一回合起加入"
|
||||
override val nextRoundPrep = "下一回合準備中…"
|
||||
override val spectatingSub = "觀戰中 · 本回合結束後重新開始"
|
||||
override val leagueResult = "聯賽結果"
|
||||
override val casualResult = "一般賽結果"
|
||||
override fun placementReveal(n: Int) = "定位賽 $n/10 — 10 場後公布 TR"
|
||||
override val ratingError = "積分更新發生錯誤 — 本場戰績可能未儲存"
|
||||
override val opponent = "對手"
|
||||
override val scoreLabel = "得分"
|
||||
override val standing = "名次"
|
||||
override fun placeOf(place: Int, total: Int) = "第${place}名 / ${total}人"
|
||||
override val roundWins = "回合勝場"
|
||||
override val customBrawl = "自訂大亂鬥"
|
||||
override val requeue = "重新配對"
|
||||
override val rematchVote = "投票再戰"
|
||||
override val rematchCancel = "取消再戰投票"
|
||||
override fun feedForfeit(nick: String) = "$nick 認輸"
|
||||
override fun feedKo(by: String, who: String) = "$by → $who KO!"
|
||||
override fun feedOut(nick: String) = "$nick 淘汰"
|
||||
override fun roundDraw(n: Int) = "ROUND $n · 平手"
|
||||
override fun roundWinMe(n: Int) = "ROUND $n · 勝利!"
|
||||
override fun roundWinOther(n: Int, nick: String) = "ROUND $n · $nick 獲勝"
|
||||
|
||||
override fun inviteText(code: String, url: String) = "來我的 TETRIG 自訂房間一起玩吧!房號 $code\n$url"
|
||||
override val share = "分享"
|
||||
override val searchOnPlay = "在 Google Play 搜尋 TETRIG"
|
||||
|
||||
override fun adFreeOn(minutes: Long) = "插頁廣告已關閉 · 剩餘 ${minutes} 分鐘"
|
||||
override val adPlaying = "廣告播放中…"
|
||||
override val adFreeOffer = "▶ 看 1 則廣告,30 分鐘內關閉插頁廣告"
|
||||
override val adFreeNotReady = "關閉插頁廣告 30 分鐘 · 廣告準備中"
|
||||
override val adFreeDesc = "完整觀看後,30 分鐘內局與局之間不會再出現插頁廣告"
|
||||
override val blockSkins = "方塊外觀"
|
||||
override val boardThemes = "棋盤主題"
|
||||
override val unlockFree = "預設"
|
||||
override val unlockRewarded = "看廣告解鎖"
|
||||
override fun unlockPass(level: Int) = "賽季通行證 Lv $level"
|
||||
override val equipped = "已裝備"
|
||||
override val equip = "裝備"
|
||||
override val watchToUnlock = "▶ 看廣告解鎖"
|
||||
override val adNotReady = "廣告準備中"
|
||||
override val badges = "徽章"
|
||||
override val badgesDesc = "顯示在暱稱旁,其他玩家可在大廳與排行榜看到。透過賽季通行證取得。"
|
||||
override val noBadges = "還沒有徽章"
|
||||
override val equippedUnequip = "已裝備 · 卸下"
|
||||
override val seasonPass = "賽季通行證"
|
||||
override val seasonPassDesc = "每玩一局都會累積 XP,解鎖等級獎勵。單人每局 +10 · 自訂 +20(第 1 名 +10)· 聯賽 +25(勝利 +15)"
|
||||
override val passComplete = "完賽"
|
||||
override val obtained = "已取得"
|
||||
override val passFooter = "已取得的獎勵在賽季結束後依然可以使用。"
|
||||
override fun skinName(id: String) = when (id) {
|
||||
"classic" -> "經典"; "riso" -> "孔版印刷"; "chalk" -> "粉筆"; "outline" -> "描邊"
|
||||
"signal" -> "信號"; "mono" -> "單色"; "supporter" -> "支持者"; else -> id
|
||||
}
|
||||
override fun boardName(id: String) = when (id) {
|
||||
"ink" -> "墨水"; "graphite" -> "石墨"; "oxide" -> "氧化鐵"; "nogrid" -> "無格線"; "moss" -> "青苔"; else -> id
|
||||
}
|
||||
override val itemSkin = "方塊外觀"
|
||||
override val itemBoard = "棋盤主題"
|
||||
override val itemBadge = "徽章"
|
||||
override fun badgeFinish(season: String) = "S$season 完賽"
|
||||
override fun badgePass(season: String) = "S$season 通行證"
|
||||
override fun badgeElite(season: String) = "S$season 菁英"
|
||||
|
||||
override val srvNickRule = "暱稱須為 2–12 個字元,僅限韓文(諺文)、英文字母、數字或 _"
|
||||
override val srvNickGuestPattern = "不能使用訪客名稱格式"
|
||||
override val srvNickTaken = "此暱稱已被使用"
|
||||
override val srvEmailInvalid = "電子郵件格式不正確"
|
||||
override val srvPasswordShort = "密碼至少需要 8 個字元"
|
||||
override val srvEmailTaken = "此電子郵件已註冊"
|
||||
override val srvWrongLogin = "電子郵件或密碼錯誤"
|
||||
override val srvGoogleNotReady = "尚未設定 Google 登入"
|
||||
override val srvGoogleFailed = "Google 驗證失敗"
|
||||
override val srvLoginRequired = "請先登入"
|
||||
override val srvGuestNick = "訪客無法更改暱稱,請先登入"
|
||||
override fun srvNickCooldown(days: Int) = "暱稱每 30 天可更改一次(還需 ${days} 天)"
|
||||
override val srvBadRecord = "紀錄無效"
|
||||
override val srvRoomCreateFailed = "無法產生房號,請再試一次"
|
||||
override val srvBadCode = "無效的代碼"
|
||||
override val srvNoRoom = "房間不存在"
|
||||
override val srvServerError = "伺服器錯誤"
|
||||
override val srvMatchOver = "此對局已結束"
|
||||
override val srvNotParticipant = "你不是此對局的參賽者"
|
||||
override val srvNeedTwo = "至少需要 2 位玩家才能開始"
|
||||
override val srvBadBadge = "無效的徽章"
|
||||
override val srvNoBadge = "你沒有這個徽章"
|
||||
}
|
||||
@@ -0,0 +1,241 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
/**
|
||||
* 화면에 보이는 모든 문구. 언어마다 이 인터페이스를 하나씩 구현한다(파일 Lang*.kt).
|
||||
* 한 언어라도 문구가 빠지면 컴파일이 안 되므로 번역 누락이 생기지 않는다.
|
||||
* SPRINT·QUAD·TR·KO 같은 게임 용어와 브랜드는 모든 언어에서 영어 그대로 둔다.
|
||||
*/
|
||||
interface Strings {
|
||||
// ── 공통 ──
|
||||
val back: String
|
||||
val home: String
|
||||
val exit: String
|
||||
val cancel: String
|
||||
val loading: String
|
||||
val guest: String
|
||||
val account: String
|
||||
val offline: String
|
||||
val comingSoon: String
|
||||
val shareResult: String
|
||||
val league: String
|
||||
val custom: String
|
||||
val win: String
|
||||
val lose: String
|
||||
val ended: String
|
||||
val disconnected: String
|
||||
val meSuffix: String
|
||||
fun wins(n: Int): String
|
||||
fun placement(n: Int): String
|
||||
val score: String
|
||||
val lines: String
|
||||
val time: String
|
||||
val rank: String
|
||||
val error: String
|
||||
fun errorCode(code: Int): String
|
||||
val cannotConnect: String
|
||||
val connectionLost: String
|
||||
|
||||
// ── 홈 ──
|
||||
val solo: String
|
||||
val modeLeague: String
|
||||
val modeLeagueSub: String
|
||||
val modeCustomSub: String
|
||||
val tabHome: String
|
||||
val tabLeaderboard: String
|
||||
val tabProfile: String
|
||||
val tabShop: String
|
||||
val tabSettings: String
|
||||
val noRecord: String
|
||||
val sprintDesc: String
|
||||
val timeAttackDesc: String
|
||||
val endlessDesc: String
|
||||
val versusDesc: String
|
||||
|
||||
// ── 솔로 결과 ──
|
||||
val continuedNotRecorded: String
|
||||
val playAgain: String
|
||||
|
||||
// ── 설정 ──
|
||||
val ghost: String
|
||||
val ghostSub: String
|
||||
val lefty: String
|
||||
val leftySub: String
|
||||
val bigButtons: String
|
||||
val bigButtonsSub: String
|
||||
val adPrivacy: String
|
||||
val adPrivacySub: String
|
||||
|
||||
// ── 게임 ──
|
||||
val topOutContinue: String
|
||||
val continuedBanner: String
|
||||
fun timeLeftScore(time: String, score: Int): String
|
||||
val continueOffer: String
|
||||
val loadingAd: String
|
||||
val watchToContinue: String
|
||||
val seeResult: String
|
||||
val hardDrop: String
|
||||
val softDrop: String
|
||||
val paused: String
|
||||
val resume: String
|
||||
|
||||
// ── 프로필 ──
|
||||
val loginPitch: String
|
||||
val emailSignup: String
|
||||
val login: String
|
||||
val email: String
|
||||
val passwordHint: String
|
||||
val nickOptional: String
|
||||
val processing: String
|
||||
val signUp: String
|
||||
val noPasswordReset: String
|
||||
val nickChangeTitle: String
|
||||
val nickChange: String
|
||||
val changed: String
|
||||
val logout: String
|
||||
val deleteConfirm: String
|
||||
val deleteAccount: String
|
||||
val deleteWarning: String
|
||||
val seasonRecord: String
|
||||
fun winLoss(wins: Int, losses: Int): String
|
||||
val recentMatches: String
|
||||
val noMatches: String
|
||||
fun historyLeague(won: Boolean, opponent: String, delta: String): String
|
||||
fun historyCustom(size: Int, place: Int, wins: Int): String
|
||||
|
||||
// ── 리더보드 ──
|
||||
val lbEmptyLeague: String
|
||||
val lbEmptySolo: String
|
||||
|
||||
// ── 커스텀 입장 ──
|
||||
val createRoom: String
|
||||
val createRoomDesc: String
|
||||
val creating: String
|
||||
val joinTitle: String
|
||||
val codeHint: String
|
||||
val join: String
|
||||
val noSuchRoom: String
|
||||
|
||||
// ── 리그 대기열 ──
|
||||
val matchFound: String
|
||||
val searching: String
|
||||
fun seconds(s: String): String
|
||||
val rankPending: String
|
||||
val queueLong: String
|
||||
val openCustom: String
|
||||
val leagueNeedsLogin: String
|
||||
val queueLost: String
|
||||
|
||||
// ── 방 ──
|
||||
val connectionClosed: String
|
||||
val connecting: String
|
||||
val reconnecting: String
|
||||
val customLobby: String
|
||||
val roomCode: String
|
||||
val inviteHint: String
|
||||
val sendInvite: String
|
||||
fun playersCount(n: Int): String
|
||||
val rulesHost: String
|
||||
val rules: String
|
||||
val garbageMul: String
|
||||
val targetWins: String
|
||||
val unlimited: String
|
||||
val seed: String
|
||||
val sameBag: String
|
||||
val personalBag: String
|
||||
val overtime: String
|
||||
val overtimeOn: String
|
||||
val off: String
|
||||
val needTwo: String
|
||||
val start: String
|
||||
val waitingHost: String
|
||||
val host: String
|
||||
val waitingOpponent: String
|
||||
val forfeitExit: String
|
||||
val forfeit: String
|
||||
fun myWinsAlive(wins: Int, alive: Int, total: Int): String
|
||||
val spectating: String
|
||||
val joinNextRound: String
|
||||
val nextRoundPrep: String
|
||||
val spectatingSub: String
|
||||
val leagueResult: String
|
||||
val casualResult: String
|
||||
fun placementReveal(n: Int): String
|
||||
val ratingError: String
|
||||
val opponent: String
|
||||
val scoreLabel: String
|
||||
val standing: String
|
||||
fun placeOf(place: Int, total: Int): String
|
||||
val roundWins: String
|
||||
val customBrawl: String
|
||||
val requeue: String
|
||||
val rematchVote: String
|
||||
val rematchCancel: String
|
||||
fun feedForfeit(nick: String): String
|
||||
fun feedKo(by: String, who: String): String
|
||||
fun feedOut(nick: String): String
|
||||
fun roundDraw(n: Int): String
|
||||
fun roundWinMe(n: Int): String
|
||||
fun roundWinOther(n: Int, nick: String): String
|
||||
|
||||
// ── 공유 ──
|
||||
fun inviteText(code: String, url: String): String
|
||||
val share: String
|
||||
val searchOnPlay: String
|
||||
|
||||
// ── 상점 ──
|
||||
fun adFreeOn(minutes: Long): String
|
||||
val adPlaying: String
|
||||
val adFreeOffer: String
|
||||
val adFreeNotReady: String
|
||||
val adFreeDesc: String
|
||||
val blockSkins: String
|
||||
val boardThemes: String
|
||||
val unlockFree: String
|
||||
val unlockRewarded: String
|
||||
fun unlockPass(level: Int): String
|
||||
val equipped: String
|
||||
val equip: String
|
||||
val watchToUnlock: String
|
||||
val adNotReady: String
|
||||
val badges: String
|
||||
val badgesDesc: String
|
||||
val noBadges: String
|
||||
val equippedUnequip: String
|
||||
val seasonPass: String
|
||||
val seasonPassDesc: String
|
||||
val passComplete: String
|
||||
val obtained: String
|
||||
val passFooter: String
|
||||
fun skinName(id: String): String
|
||||
fun boardName(id: String): String
|
||||
val itemSkin: String
|
||||
val itemBoard: String
|
||||
val itemBadge: String
|
||||
fun badgeFinish(season: String): String
|
||||
fun badgePass(season: String): String
|
||||
fun badgeElite(season: String): String
|
||||
|
||||
// ── 서버가 보내는 오류 (서버는 한국어로 보낸다. I18n.server 가 이 문구로 바꾼다) ──
|
||||
val srvNickRule: String
|
||||
val srvNickGuestPattern: String
|
||||
val srvNickTaken: String
|
||||
val srvEmailInvalid: String
|
||||
val srvPasswordShort: String
|
||||
val srvEmailTaken: String
|
||||
val srvWrongLogin: String
|
||||
val srvGoogleNotReady: String
|
||||
val srvGoogleFailed: String
|
||||
val srvLoginRequired: String
|
||||
val srvGuestNick: String
|
||||
fun srvNickCooldown(days: Int): String
|
||||
val srvBadRecord: String
|
||||
val srvRoomCreateFailed: String
|
||||
val srvBadCode: String
|
||||
val srvNoRoom: String
|
||||
val srvServerError: String
|
||||
val srvMatchOver: String
|
||||
val srvNotParticipant: String
|
||||
val srvNeedTwo: String
|
||||
val srvBadBadge: String
|
||||
val srvNoBadge: String
|
||||
}
|
||||
@@ -0,0 +1,212 @@
|
||||
package kr.tkrmagid.tetrig.net
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.I18n
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.json.JsonArray
|
||||
import kotlinx.serialization.json.JsonElement
|
||||
import kotlinx.serialization.json.JsonNull
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import kotlinx.serialization.json.JsonPrimitive
|
||||
import kotlinx.serialization.json.booleanOrNull
|
||||
import kotlinx.serialization.json.buildJsonObject
|
||||
import kotlinx.serialization.json.doubleOrNull
|
||||
import kotlinx.serialization.json.intOrNull
|
||||
import kotlinx.serialization.json.jsonObject
|
||||
import kotlinx.serialization.json.longOrNull
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.shop.Loadout
|
||||
|
||||
/** 화면 수명과 무관하게 끝까지 돌아야 하는 작업용 (기록 업로드 등). */
|
||||
val AppScope = kotlinx.coroutines.CoroutineScope(kotlinx.coroutines.SupervisorJob() + kotlinx.coroutines.Dispatchers.Main)
|
||||
|
||||
const val SERVER = "https://tetrig.tkrmagid.workers.dev"
|
||||
val WS_SERVER = SERVER.replaceFirst("https://", "wss://")
|
||||
|
||||
val JsonCodec = Json { ignoreUnknownKeys = true }
|
||||
|
||||
// ── JsonObject 편의 접근자 ──
|
||||
fun JsonObject.str(k: String): String? = (this[k] as? JsonPrimitive)?.takeIf { it.isString }?.content
|
||||
fun JsonObject.int(k: String): Int? = (this[k] as? JsonPrimitive)?.intOrNull
|
||||
fun JsonObject.long(k: String): Long? = (this[k] as? JsonPrimitive)?.longOrNull
|
||||
fun JsonObject.dbl(k: String): Double? = (this[k] as? JsonPrimitive)?.doubleOrNull
|
||||
fun JsonObject.bool(k: String): Boolean? = (this[k] as? JsonPrimitive)?.booleanOrNull
|
||||
fun JsonObject.obj(k: String): JsonObject? = this[k] as? JsonObject
|
||||
fun JsonObject.arr(k: String): List<JsonObject> = (this[k] as? JsonArray)?.mapNotNull { it as? JsonObject } ?: emptyList()
|
||||
|
||||
fun jsonOf(vararg pairs: Pair<String, Any?>): JsonObject = buildJsonObject {
|
||||
for ((k, v) in pairs) put(k, toJson(v))
|
||||
}
|
||||
|
||||
private fun toJson(v: Any?): JsonElement = when (v) {
|
||||
null -> JsonNull
|
||||
is JsonElement -> v
|
||||
is String -> JsonPrimitive(v)
|
||||
is Number -> JsonPrimitive(v)
|
||||
is Boolean -> JsonPrimitive(v)
|
||||
is Map<*, *> -> buildJsonObject { for ((k, x) in v) put(k.toString(), toJson(x)) }
|
||||
is List<*> -> JsonArray(v.map { toJson(it) })
|
||||
else -> JsonPrimitive(v.toString())
|
||||
}
|
||||
|
||||
class ApiResult(val code: Int, val data: JsonObject) {
|
||||
val ok get() = code in 200..299
|
||||
val error: String get() = data.str("error")?.let { I18n.server(it, code) } ?: if (code == 0) S.cannotConnect else S.errorCode(code)
|
||||
}
|
||||
|
||||
data class User(val id: String, val nickname: String, val guest: Boolean, val email: String?, val badge: String? = null)
|
||||
|
||||
data class League(
|
||||
val placed: Boolean, val placement: Int, val tr: Int?, val rank: String?, val games: Int, val wins: Int,
|
||||
)
|
||||
|
||||
/** 로그인 상태. 앱 전역에서 관찰한다. */
|
||||
object Session {
|
||||
var user by mutableStateOf<User?>(null)
|
||||
private set
|
||||
var league by mutableStateOf<League?>(null)
|
||||
private set
|
||||
var seasonN by mutableStateOf(1)
|
||||
private set
|
||||
var seasonEndsAt by mutableStateOf(0L)
|
||||
private set
|
||||
var offline by mutableStateOf(false)
|
||||
private set
|
||||
|
||||
val token: String? get() = Prefs.str("auth.token").ifBlank { null }
|
||||
|
||||
suspend fun call(method: String, path: String, body: JsonObject? = null, withToken: Boolean = true): ApiResult {
|
||||
val r = httpRequest(method, SERVER + path, body?.toString(), if (withToken) token else null)
|
||||
val data = runCatching { JsonCodec.parseToJsonElement(r.body).jsonObject }.getOrElse { JsonObject(emptyMap()) }
|
||||
return ApiResult(r.code, data)
|
||||
}
|
||||
|
||||
private fun adopt(r: ApiResult) {
|
||||
r.data.str("token")?.let { Prefs.setStr("auth.token", it) }
|
||||
r.data.obj("user")?.let { user = parseUser(it) }
|
||||
}
|
||||
|
||||
private fun parseUser(u: JsonObject) =
|
||||
User(u.str("id") ?: "", u.str("nickname") ?: "?", u.bool("guest") ?: true, u.str("email"), u.str("badge"))
|
||||
|
||||
/** 앱 시작 시: 토큰이 없거나 만료면 게스트 발급, 그다음 프로필 갱신. */
|
||||
suspend fun ensure(): Boolean {
|
||||
if (token == null && !newGuest()) return false
|
||||
val me = refresh()
|
||||
if (me?.code == 401) {
|
||||
if (!newGuest()) return false
|
||||
refresh()
|
||||
}
|
||||
return user != null
|
||||
}
|
||||
|
||||
private suspend fun newGuest(): Boolean {
|
||||
var dev = Prefs.str("device.id")
|
||||
if (dev.isBlank()) {
|
||||
dev = newDeviceId()
|
||||
Prefs.setStr("device.id", dev)
|
||||
}
|
||||
val r = call("POST", "/api/guest", jsonOf("deviceId" to dev), withToken = false)
|
||||
offline = r.code == 0
|
||||
if (!r.ok) return false
|
||||
adopt(r)
|
||||
return true
|
||||
}
|
||||
|
||||
/** /api/me 응답 전체 (프로필 화면용). */
|
||||
var profile by mutableStateOf<JsonObject?>(null)
|
||||
private set
|
||||
|
||||
suspend fun refresh(): ApiResult? {
|
||||
if (token == null) return null
|
||||
val r = call("GET", "/api/me")
|
||||
offline = r.code == 0
|
||||
if (!r.ok) return r
|
||||
profile = r.data
|
||||
r.data.obj("user")?.let { user = parseUser(it) }
|
||||
r.data.obj("league")?.let { l ->
|
||||
league = League(
|
||||
l.bool("placed") ?: false, l.int("placement") ?: 0, l.int("tr"), l.str("rank"),
|
||||
l.int("games") ?: 0, l.int("wins") ?: 0,
|
||||
)
|
||||
}
|
||||
(r.data["items"] as? JsonArray)?.let { a ->
|
||||
Loadout.adoptServer(a.mapNotNull { (it as? JsonPrimitive)?.takeIf { p -> p.isString }?.content })
|
||||
}
|
||||
r.data.obj("season")?.let { s ->
|
||||
seasonN = s.int("n") ?: 1
|
||||
seasonEndsAt = s.long("endsAt") ?: 0L
|
||||
}
|
||||
// 서버 베스트가 더 좋으면 로컬 기록에도 반영 (다른 기기·병합된 기록)
|
||||
r.data.obj("solo")?.let { solo ->
|
||||
solo.long("sprint")?.let { Prefs.submitSprint(it) }
|
||||
solo.int("time")?.let { Prefs.submitScore("time", it) }
|
||||
solo.int("endless")?.let { Prefs.submitScore("endless", it) }
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
suspend fun register(email: String, password: String, nickname: String?): String? {
|
||||
val r = call("POST", "/api/register", jsonOf("email" to email, "password" to password, "nickname" to nickname?.ifBlank { null }))
|
||||
if (!r.ok) return r.error
|
||||
adopt(r)
|
||||
refresh()
|
||||
return null
|
||||
}
|
||||
|
||||
suspend fun login(email: String, password: String): String? {
|
||||
val r = call("POST", "/api/login", jsonOf("email" to email, "password" to password))
|
||||
if (!r.ok) return r.error
|
||||
adopt(r)
|
||||
refresh()
|
||||
return null
|
||||
}
|
||||
|
||||
suspend fun logout() {
|
||||
Prefs.setStr("auth.token", "")
|
||||
user = null
|
||||
league = null
|
||||
profile = null
|
||||
Loadout.adoptServer(emptyList())
|
||||
ensure()
|
||||
}
|
||||
|
||||
/** 계정과 서버 기록을 지우고 새 게스트로 돌아간다. */
|
||||
suspend fun deleteAccount(): String? {
|
||||
val r = call("POST", "/api/me/delete")
|
||||
if (!r.ok) return r.error
|
||||
logout()
|
||||
return null
|
||||
}
|
||||
|
||||
suspend fun changeNickname(n: String): String? {
|
||||
val r = call("POST", "/api/nickname", jsonOf("nickname" to n))
|
||||
if (!r.ok) return r.error
|
||||
adopt(r)
|
||||
refresh()
|
||||
return null
|
||||
}
|
||||
|
||||
/** 솔로 기록 업로드 (실패해도 로컬 기록은 이미 저장됨). */
|
||||
suspend fun submitSolo(mode: String, value: Long) {
|
||||
if (token == null || value <= 0) return
|
||||
call("POST", "/api/solo", jsonOf("mode" to mode, "value" to value))
|
||||
}
|
||||
|
||||
/** 기록에는 안 남기고 시즌 패스 XP 만 받는다 (이어하기를 쓴 판). */
|
||||
suspend fun submitXpOnly(mode: String) {
|
||||
if (token == null) return
|
||||
call("POST", "/api/solo", jsonOf("mode" to mode, "xpOnly" to true))
|
||||
}
|
||||
|
||||
/** 배지 장착 (null = 해제). */
|
||||
suspend fun equipBadge(id: String?): String? {
|
||||
val r = call("POST", "/api/badge", jsonOf("badge" to id))
|
||||
if (!r.ok) return r.error
|
||||
adopt(r)
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package kr.tkrmagid.tetrig.net
|
||||
|
||||
/** 플랫폼 HTTP / WebSocket. Android 는 OkHttp. */
|
||||
class HttpResult(val code: Int, val body: String)
|
||||
|
||||
expect suspend fun httpRequest(method: String, url: String, body: String?, token: String?): HttpResult
|
||||
|
||||
interface SocketListener {
|
||||
fun onOpen()
|
||||
fun onMessage(text: String)
|
||||
/** 정상/비정상 종료 모두. code 0 = 연결 실패. */
|
||||
fun onClosed(code: Int, reason: String)
|
||||
}
|
||||
|
||||
interface PlatformSocket {
|
||||
fun send(text: String): Boolean
|
||||
fun close()
|
||||
}
|
||||
|
||||
expect fun openSocket(url: String, listener: SocketListener): PlatformSocket
|
||||
|
||||
/** 현재 시각(ms). */
|
||||
expect fun nowMs(): Long
|
||||
|
||||
/** 기기 고유 ID 대용 — 처음 실행 때 만든 무작위 값. */
|
||||
fun newDeviceId(): String {
|
||||
val chars = "abcdefghijklmnopqrstuvwxyz0123456789"
|
||||
return (1..24).map { chars[kotlin.random.Random.nextInt(chars.length)] }.joinToString("")
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package kr.tkrmagid.tetrig.share
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
|
||||
/** 결과 공유 이미지에 들어갈 내용. 플랫폼이 NEOBRUTAL 카드 한 장(PNG)으로 그린다. */
|
||||
data class ShareCard(
|
||||
/** 예: "SPRINT", "리그전" */
|
||||
val mode: String,
|
||||
/** 큰 글씨 한 줄. 예: "1:02.34", "승리!" */
|
||||
val headline: String,
|
||||
val rows: List<Pair<String, String>>,
|
||||
val nickname: String?,
|
||||
)
|
||||
|
||||
/** 초대 링크 (앱 링크: 앱이 있으면 바로 그 방으로, 없으면 안내 페이지 → Play 스토어). */
|
||||
fun roomInviteUrl(code: String) = "https://tetrig.pages.dev/r/$code"
|
||||
|
||||
fun roomInviteText(code: String) =
|
||||
S.inviteText(code, roomInviteUrl(code))
|
||||
|
||||
const val PLAY_URL = "https://play.google.com/store/apps/details?id=kr.tkrmagid.tetrig"
|
||||
|
||||
/** 시스템 공유 창으로 텍스트를 보낸다. */
|
||||
expect fun shareText(text: String)
|
||||
|
||||
/** 결과 카드를 PNG 로 그려 시스템 공유 창으로 보낸다. */
|
||||
expect fun shareCard(card: ShareCard)
|
||||
|
||||
/** 앱 링크(https://tetrig.pages.dev/r/CODE)로 들어온 방 코드. App 이 보고 방으로 보낸다. */
|
||||
object DeepLink {
|
||||
var pendingRoom: String? by mutableStateOf(null)
|
||||
|
||||
private val re = Regex("^/r/([A-Za-z0-9]{6})/?$")
|
||||
|
||||
/** URL 경로에서 방 코드를 꺼낸다. 형식이 틀리면 null. */
|
||||
fun roomFromPath(path: String?): String? = path?.let { re.find(it)?.groupValues?.get(1)?.uppercase() }
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package kr.tkrmagid.tetrig.shop
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import kr.tkrmagid.tetrig.ui.Palette
|
||||
import kr.tkrmagid.tetrig.ui.pieceColor
|
||||
|
||||
/**
|
||||
* 꾸미기 아이템 목록. 아이템 ID 는 "종류:이름" (서버 user_items.item 과 같은 형식).
|
||||
* 색은 명세서 §13 NEOBRUTAL 규칙을 지킨다: 플랫 컬러만, 그라디언트·네온·블러 없음,
|
||||
* 다크 네이비 배경 금지.
|
||||
*/
|
||||
enum class BlockStyle { Solid, Inset, Outline, Chamfer, Plate }
|
||||
|
||||
data class BlockSkin(
|
||||
val id: String,
|
||||
val colors: Map<Char, Color>,
|
||||
val style: BlockStyle,
|
||||
val unlock: Unlock,
|
||||
) {
|
||||
val name get() = S.skinName(id)
|
||||
val item get() = "skin:$id"
|
||||
fun color(type: Char): Color = colors[type] ?: Color(0xFF46464F)
|
||||
}
|
||||
|
||||
data class BoardTheme(
|
||||
val id: String,
|
||||
val bg: Color,
|
||||
val grid: Color?,
|
||||
val panel: Color,
|
||||
val unlock: Unlock,
|
||||
) {
|
||||
val name get() = S.boardName(id)
|
||||
val item get() = "board:$id"
|
||||
}
|
||||
|
||||
/** 아이템을 얻는 방법 (상점 화면 안내용). */
|
||||
sealed interface Unlock {
|
||||
data object Free : Unlock
|
||||
/** 보상형 광고 1회 시청으로 영구 해금. */
|
||||
data object Rewarded : Unlock
|
||||
/** 시즌 패스 무료 트랙 레벨 보상. */
|
||||
data class Pass(val level: Int) : Unlock
|
||||
}
|
||||
|
||||
private fun palette(i: Long, o: Long, t: Long, s: Long, z: Long, j: Long, l: Long) = mapOf(
|
||||
'I' to Color(i), 'O' to Color(o), 'T' to Color(t), 'S' to Color(s), 'Z' to Color(z), 'J' to Color(j), 'L' to Color(l),
|
||||
'G' to Color(0xFF46464F),
|
||||
)
|
||||
|
||||
private val classicColors = "IOTSZJLG".associateWith { pieceColor(it) }
|
||||
|
||||
object Catalog {
|
||||
val skins = listOf(
|
||||
BlockSkin("classic", classicColors, BlockStyle.Solid, Unlock.Free),
|
||||
BlockSkin(
|
||||
"riso",
|
||||
palette(0xFF5EC8E5, 0xFFFFE800, 0xFF765BA7, 0xFF00A95C, 0xFFFF665E, 0xFF0078BF, 0xFFFF6C2F),
|
||||
BlockStyle.Solid, Unlock.Rewarded,
|
||||
),
|
||||
BlockSkin(
|
||||
"chalk",
|
||||
palette(0xFF9ED9D3, 0xFFF2DC8D, 0xFFC9B0F0, 0xFFB5DB97, 0xFFF0A49B, 0xFF9FB5EE, 0xFFF2BE8F),
|
||||
BlockStyle.Inset, Unlock.Pass(5),
|
||||
),
|
||||
BlockSkin("outline", classicColors, BlockStyle.Outline, Unlock.Rewarded),
|
||||
BlockSkin(
|
||||
"signal",
|
||||
palette(0xFF3E8BF2, 0xFFF5C531, 0xFFFF4E11, 0xFFEDE7DA, 0xFFD93A6A, 0xFF2B3FE0, 0xFFF2A03D),
|
||||
BlockStyle.Chamfer, Unlock.Rewarded,
|
||||
),
|
||||
BlockSkin(
|
||||
"mono",
|
||||
palette(0xFFEDE7DA, 0xFFD4CDBF, 0xFFFF4E11, 0xFFB8B1A3, 0xFF9C9588, 0xFF807A6E, 0xFFE1D9C7),
|
||||
BlockStyle.Inset, Unlock.Pass(20),
|
||||
),
|
||||
BlockSkin("supporter", classicColors, BlockStyle.Plate, Unlock.Rewarded),
|
||||
)
|
||||
|
||||
val boards = listOf(
|
||||
BoardTheme("ink", Palette.Dwell, Palette.DGrid, Palette.DPanel, Unlock.Free),
|
||||
BoardTheme("graphite", Color(0xFF1B1A18), Color(0xFF2C2A27), Color(0xFF262420), Unlock.Rewarded),
|
||||
BoardTheme("oxide", Color(0xFF1A1210), Color(0xFF33241F), Color(0xFF2A1D19), Unlock.Rewarded),
|
||||
BoardTheme("nogrid", Palette.Dwell, null, Palette.DPanel, Unlock.Pass(12)),
|
||||
BoardTheme("moss", Color(0xFF12150F), Color(0xFF242A1E), Color(0xFF1E2219), Unlock.Rewarded),
|
||||
)
|
||||
|
||||
val defaultSkin get() = skins.first()
|
||||
val defaultBoard get() = boards.first()
|
||||
|
||||
fun skin(id: String): BlockSkin? = skins.firstOrNull { it.id == id }
|
||||
fun board(id: String): BoardTheme? = boards.firstOrNull { it.id == id }
|
||||
|
||||
/** 서버/클라이언트 공용 아이템 ID → 화면 이름. */
|
||||
fun itemName(item: String): String {
|
||||
val (kind, id) = item.split(':', limit = 2).let { it[0] to it.getOrElse(1) { "" } }
|
||||
return when (kind) {
|
||||
"skin" -> S.itemSkin + " · " + (skin(id)?.name ?: id)
|
||||
"board" -> S.itemBoard + " · " + (board(id)?.name ?: id)
|
||||
"badge" -> S.itemBadge + " · " + badgeName(id)
|
||||
else -> item
|
||||
}
|
||||
}
|
||||
|
||||
/** 배지 표시 이름. 시즌 배지는 s{n}_finish / s{n}_pass / s{n}_elite. */
|
||||
fun badgeName(id: String): String {
|
||||
if (id == "supporter") return "SUPPORTER"
|
||||
val m = Regex("^s(\\d+)_(finish|pass|elite)$").find(id) ?: return id.uppercase()
|
||||
val n = m.groupValues[1]
|
||||
return when (m.groupValues[2]) {
|
||||
"finish" -> S.badgeFinish(n)
|
||||
"pass" -> S.badgePass(n)
|
||||
else -> S.badgeElite(n)
|
||||
}
|
||||
}
|
||||
|
||||
fun badgeColor(id: String): Color = when {
|
||||
id == "supporter" -> Palette.Amber
|
||||
id.endsWith("_elite") -> Palette.Safety
|
||||
id.endsWith("_pass") -> Palette.Violet
|
||||
else -> Palette.Cobalt
|
||||
}
|
||||
|
||||
fun badgeText(id: String): Color = if (id == "supporter") Palette.Ink else Palette.Bone
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package kr.tkrmagid.tetrig.shop
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.arr
|
||||
import kr.tkrmagid.tetrig.net.int
|
||||
import kr.tkrmagid.tetrig.net.long
|
||||
import kr.tkrmagid.tetrig.net.str
|
||||
|
||||
/** 시즌 패스 칸. 앱은 광고만으로 운영하므로 서버의 프리미엄(유료) 트랙은 받지 않는다. */
|
||||
data class PassTier(val level: Int, val free: String)
|
||||
|
||||
data class PassState(
|
||||
val season: Int,
|
||||
val endsAt: Long,
|
||||
val xp: Int,
|
||||
val level: Int,
|
||||
val maxLevel: Int,
|
||||
val xpPerLevel: Int,
|
||||
val tiers: List<PassTier>,
|
||||
) {
|
||||
/** 현재 레벨 안에서 모은 XP (0 until xpPerLevel). 만렙이면 xpPerLevel. */
|
||||
val xpInLevel: Int get() = if (level >= maxLevel) xpPerLevel else xp - (level - 1) * xpPerLevel
|
||||
}
|
||||
|
||||
/** 시즌 패스 (서버가 정본). 리그 시즌과 같은 주기(2개월)로 돈다. */
|
||||
object SeasonPass {
|
||||
var state by mutableStateOf<PassState?>(null)
|
||||
private set
|
||||
var error by mutableStateOf<String?>(null)
|
||||
private set
|
||||
|
||||
suspend fun load() {
|
||||
val r = Session.call("GET", "/api/pass")
|
||||
if (!r.ok) {
|
||||
error = r.error
|
||||
return
|
||||
}
|
||||
error = null
|
||||
val d = r.data
|
||||
state = PassState(
|
||||
season = d.int("season") ?: 1,
|
||||
endsAt = d.long("endsAt") ?: 0L,
|
||||
xp = d.int("xp") ?: 0,
|
||||
level = d.int("level") ?: 1,
|
||||
maxLevel = d.int("maxLevel") ?: 30,
|
||||
xpPerLevel = d.int("xpPerLevel") ?: 100,
|
||||
tiers = d.arr("tiers").mapNotNull { t -> t.str("free")?.let { PassTier(t.int("level") ?: 0, it) } },
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package kr.tkrmagid.tetrig.shop
|
||||
|
||||
import androidx.compose.runtime.mutableStateMapOf
|
||||
import kr.tkrmagid.tetrig.ads.AdPolicy
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
|
||||
/** 기기에 저장되는 권한(보상형 광고 보상). 서버 없이도 동작해야 하는 것만 여기 둔다. */
|
||||
object Entitlements {
|
||||
val adFreeUntil: Long get() = Prefs.str("ads.freeUntil", "0").toLongOrNull() ?: 0L
|
||||
|
||||
fun adFreeActive(now: Long = nowMs()): Boolean = adFreeUntil > now
|
||||
|
||||
/** 보상형 광고 보상: 지금부터 30분간 전면 광고 끄기 (이미 켜져 있으면 연장하지 않고 새로 30분). */
|
||||
fun grantAdFree(now: Long = nowMs()) = Prefs.setStr("ads.freeUntil", (now + AdPolicy.AD_FREE_MS).toString())
|
||||
|
||||
/** 기기에서 해금한 꾸미기 아이템 (보상형 광고). */
|
||||
fun hasLocalItem(item: String): Boolean = Prefs.flag("item.$item", false)
|
||||
|
||||
fun grantLocalItem(item: String) = Prefs.setFlag("item.$item", true)
|
||||
}
|
||||
|
||||
/** 장착 상태 + 보유 판정. */
|
||||
object Loadout {
|
||||
/** 서버가 알려준 보유 아이템 (시즌 패스 보상). */
|
||||
val serverItems = mutableStateMapOf<String, Boolean>()
|
||||
|
||||
fun owns(item: String): Boolean {
|
||||
val (kind, id) = item.split(':', limit = 2).let { it[0] to it.getOrElse(1) { "" } }
|
||||
val unlock = when (kind) {
|
||||
"skin" -> Catalog.skin(id)?.unlock
|
||||
"board" -> Catalog.board(id)?.unlock
|
||||
else -> null
|
||||
}
|
||||
if (unlock == Unlock.Free) return true
|
||||
return Entitlements.hasLocalItem(item) || serverItems[item] == true
|
||||
}
|
||||
|
||||
val skin: BlockSkin
|
||||
get() = Catalog.skin(Prefs.str("equip.skin", "classic"))?.takeIf { owns(it.item) } ?: Catalog.defaultSkin
|
||||
|
||||
val board: BoardTheme
|
||||
get() = Catalog.board(Prefs.str("equip.board", "ink"))?.takeIf { owns(it.item) } ?: Catalog.defaultBoard
|
||||
|
||||
fun equipSkin(id: String) = Prefs.setStr("equip.skin", id)
|
||||
fun equipBoard(id: String) = Prefs.setStr("equip.board", id)
|
||||
|
||||
fun adoptServer(items: List<String>) {
|
||||
serverItems.clear()
|
||||
items.forEach { serverItems[it] = true }
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.safeDrawingPadding
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
@@ -14,25 +15,65 @@ import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.Modifier
|
||||
import kr.tkrmagid.tetrig.game.Mode
|
||||
import kr.tkrmagid.tetrig.game.RoomClient
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.bool
|
||||
import kr.tkrmagid.tetrig.share.DeepLink
|
||||
|
||||
val LocalLayout = staticCompositionLocalOf { layoutFor(androidx.compose.ui.unit.Dp(390f), androidx.compose.ui.unit.Dp(844f)) }
|
||||
|
||||
sealed interface Screen {
|
||||
data object Main : Screen
|
||||
data object Settings : Screen
|
||||
data class Soon(val title: String) : Screen
|
||||
data object Profile : Screen
|
||||
data object Leaderboard : Screen
|
||||
data object Shop : Screen
|
||||
data object CustomEntry : Screen
|
||||
data object Queue : Screen
|
||||
data class Room(val client: RoomClient) : Screen
|
||||
data class Game(val mode: Mode, val seed: Int) : Screen
|
||||
data class Result(val mode: Mode, val score: Int, val lines: Int, val timeMs: Long, val pps: Double) : Screen
|
||||
data class Result(val mode: Mode, val score: Int, val lines: Int, val timeMs: Long, val pps: Double, val continued: Boolean = false) : Screen
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun App() {
|
||||
var screen by remember { mutableStateOf<Screen>(Screen.Main) }
|
||||
|
||||
// 첫 실행: 게스트 자동 발급 (가입 없이 즉시 플레이). 실패해도 솔로는 오프라인으로 된다.
|
||||
LaunchedEffect(Unit) {
|
||||
Session.ensure()
|
||||
}
|
||||
|
||||
// 초대 링크(https://tetrig.pages.dev/r/CODE)로 들어오면 방이 있는지 보고 바로 들어간다.
|
||||
// 게임 중에 링크를 눌렀으면 그 판을 끊지 않고, 홈/메뉴 화면으로 돌아왔을 때 처리한다.
|
||||
val pendingRoom = DeepLink.pendingRoom
|
||||
val idle = screen !is Screen.Game && screen !is Screen.Room && screen !is Screen.Queue
|
||||
LaunchedEffect(pendingRoom, idle) {
|
||||
val code = pendingRoom ?: return@LaunchedEffect
|
||||
if (!idle) return@LaunchedEffect
|
||||
if (Session.token == null) Session.ensure()
|
||||
val r = Session.call("GET", "/api/rooms/$code", withToken = false)
|
||||
screen = if (r.ok && r.data.bool("exists") == true) Screen.Room(RoomClient("custom", code)) else Screen.CustomEntry
|
||||
// 키가 바뀌면 이 코루틴이 취소되므로 링크 소비는 맨 마지막에 한다.
|
||||
DeepLink.pendingRoom = null
|
||||
}
|
||||
|
||||
val onTab: (Int) -> Unit = { i ->
|
||||
screen = when (i) {
|
||||
1 -> Screen.Leaderboard
|
||||
2 -> Screen.Profile
|
||||
3 -> Screen.Shop
|
||||
4 -> Screen.Settings
|
||||
else -> Screen.Main
|
||||
}
|
||||
}
|
||||
|
||||
val dark = screen is Screen.Game || (screen as? Screen.Room)?.client?.let { it.phase != "lobby" && it.phase != "match_end" } == true
|
||||
|
||||
BoxWithConstraints(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(if (screen is Screen.Game) Palette.Ink else Palette.Bone)
|
||||
.background(if (dark) Palette.Ink else Palette.Bone)
|
||||
) {
|
||||
val layout = remember(maxWidth, maxHeight) { layoutFor(maxWidth, maxHeight) }
|
||||
CompositionLocalProvider(LocalLayout provides layout) {
|
||||
@@ -40,20 +81,42 @@ fun App() {
|
||||
when (val s = screen) {
|
||||
is Screen.Main -> MainScreen(
|
||||
onMode = { screen = Screen.Game(it, randomSeed()) },
|
||||
onSettings = { screen = Screen.Settings },
|
||||
onSoon = { screen = Screen.Soon(it) },
|
||||
onTab = onTab,
|
||||
onLeague = {
|
||||
// 게스트는 리그전 불가 (§9) → 프로필에서 로그인 유도
|
||||
screen = if (Session.user?.guest == false) Screen.Queue else Screen.Profile
|
||||
},
|
||||
onCustom = { screen = Screen.CustomEntry },
|
||||
)
|
||||
|
||||
is Screen.Settings -> SettingsScreen(onBack = { screen = Screen.Main })
|
||||
is Screen.Settings -> SettingsScreen(onBack = { screen = Screen.Main }, onTab = onTab)
|
||||
is Screen.Profile -> ProfileScreen(onTab = onTab)
|
||||
is Screen.Leaderboard -> LeaderboardScreen(onTab = onTab)
|
||||
is Screen.Shop -> ShopScreen(onTab = onTab)
|
||||
|
||||
is Screen.Soon -> SoonScreen(s.title, onBack = { screen = Screen.Main })
|
||||
is Screen.CustomEntry -> CustomEntryScreen(
|
||||
onJoin = { code -> screen = Screen.Room(RoomClient("custom", code)) },
|
||||
onBack = { screen = Screen.Main },
|
||||
)
|
||||
|
||||
is Screen.Queue -> QueueScreen(
|
||||
onMatched = { room -> screen = Screen.Room(RoomClient("league", room)) },
|
||||
onBack = { screen = Screen.Main },
|
||||
onCustom = { screen = Screen.CustomEntry },
|
||||
)
|
||||
|
||||
is Screen.Room -> RoomScreen(
|
||||
client = s.client,
|
||||
onExit = { screen = Screen.Main },
|
||||
onRequeue = { screen = Screen.Queue },
|
||||
)
|
||||
|
||||
is Screen.Game -> GameScreen(
|
||||
mode = s.mode,
|
||||
seed = s.seed,
|
||||
onExit = { screen = Screen.Main },
|
||||
onFinish = { score, lines, timeMs, pps ->
|
||||
screen = Screen.Result(s.mode, score, lines, timeMs, pps)
|
||||
onFinish = { score, lines, timeMs, pps, continued ->
|
||||
screen = Screen.Result(s.mode, score, lines, timeMs, pps, continued)
|
||||
},
|
||||
)
|
||||
|
||||
@@ -63,6 +126,7 @@ fun App() {
|
||||
lines = s.lines,
|
||||
timeMs = s.timeMs,
|
||||
pps = s.pps,
|
||||
continued = s.continued,
|
||||
onRetry = { screen = Screen.Game(s.mode, randomSeed()) },
|
||||
onHome = { screen = Screen.Main },
|
||||
)
|
||||
|
||||
@@ -7,7 +7,8 @@ import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.BoxScope
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.GenericShape
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.foundation.text.BasicText
|
||||
import androidx.compose.foundation.text.TextAutoSize
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
@@ -22,6 +23,7 @@ import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontStyle
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.dp
|
||||
@@ -90,18 +92,22 @@ fun Mono(
|
||||
align: TextAlign = TextAlign.Start,
|
||||
maxLines: Int = 1,
|
||||
) {
|
||||
Text(
|
||||
// 번역 문구는 한국어보다 길 수 있다(독일어·러시아어 등). 칸을 넘으면 글자를 70%까지 줄이고,
|
||||
// 그래도 넘치면 말줄임표로 끝낸다.
|
||||
BasicText(
|
||||
text = text,
|
||||
modifier = modifier,
|
||||
color = color,
|
||||
style = TextStyle(
|
||||
color = color,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
fontSize = size,
|
||||
fontWeight = weight,
|
||||
fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal,
|
||||
textAlign = align,
|
||||
),
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
maxLines = maxLines,
|
||||
autoSize = TextAutoSize.StepBased(minFontSize = size * 0.7f, maxFontSize = size, stepSize = 0.5.sp),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@@ -18,7 +19,9 @@ import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.withFrameNanos
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
@@ -32,7 +35,15 @@ import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kotlinx.coroutines.launch
|
||||
import kr.tkrmagid.tetrig.ads.AdPolicy
|
||||
import kr.tkrmagid.tetrig.ads.rewardedAvailable
|
||||
import kr.tkrmagid.tetrig.ads.showRewarded
|
||||
import kr.tkrmagid.tetrig.shop.BlockSkin
|
||||
import kr.tkrmagid.tetrig.shop.Loadout
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.net.AppScope
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.engine.Config
|
||||
import kr.tkrmagid.tetrig.game.GameState
|
||||
import kr.tkrmagid.tetrig.game.Mode
|
||||
@@ -43,9 +54,9 @@ fun GameScreen(
|
||||
mode: Mode,
|
||||
seed: Int,
|
||||
onExit: () -> Unit,
|
||||
onFinish: (score: Int, lines: Int, timeMs: Long, pps: Double) -> Unit,
|
||||
onFinish: (score: Int, lines: Int, timeMs: Long, pps: Double, continued: Boolean) -> Unit,
|
||||
) {
|
||||
val state = remember(mode, seed) { GameState(mode, seed) }
|
||||
val state = remember(mode, seed) { GameState(mode, seed).also { it.canOfferContinue = { rewardedAvailable() } } }
|
||||
val l = LocalLayout.current
|
||||
val ghostOn = remember { Prefs.flag("ghost", true) }
|
||||
val lefty = remember { Prefs.flag("lefty", false) }
|
||||
@@ -66,13 +77,28 @@ fun GameScreen(
|
||||
}
|
||||
}
|
||||
|
||||
// 광고를 보는 동안 앱이 백그라운드로 가도 프레임 루프는 awaitingContinue 로 멈춰 있다.
|
||||
|
||||
|
||||
LaunchedEffect(state.finished) {
|
||||
if (state.finished) {
|
||||
when (mode) {
|
||||
Mode.Sprint -> if (state.lines >= SPRINT_GOAL_LINES) Prefs.submitSprint(state.elapsedMs)
|
||||
else -> Prefs.submitScore(mode.id, state.score)
|
||||
if (state.continued) {
|
||||
// 이어하기를 쓴 판은 기록·리더보드에 넣지 않고 시즌 패스 XP 만 받는다.
|
||||
AppScope.launch { Session.submitXpOnly(mode.id) }
|
||||
} else when (mode) {
|
||||
Mode.Sprint -> if (state.lines >= SPRINT_GOAL_LINES) {
|
||||
Prefs.submitSprint(state.elapsedMs)
|
||||
val ms = state.elapsedMs
|
||||
AppScope.launch { Session.submitSolo("sprint", ms) }
|
||||
}
|
||||
else -> {
|
||||
Prefs.submitScore(mode.id, state.score)
|
||||
val sc = state.score.toLong()
|
||||
AppScope.launch { Session.submitSolo(mode.id, sc) }
|
||||
}
|
||||
}
|
||||
onFinish(state.score, state.lines, state.elapsedMs, state.pps)
|
||||
AdPolicy.onGameFinished()
|
||||
onFinish(state.score, state.lines, state.elapsedMs, state.pps, state.continued)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,6 +130,47 @@ fun GameScreen(
|
||||
if (state.paused) {
|
||||
PauseOverlay(onResume = { state.paused = false }, onExit = onExit)
|
||||
}
|
||||
if (state.awaitingContinue) {
|
||||
ContinueOverlay(state)
|
||||
}
|
||||
}
|
||||
|
||||
/** TIME ATTACK 톱아웃: 보상형 광고로 1회 이어하기. 조건과 보상을 시청 전에 알린다 (AdMob 정책). */
|
||||
@Composable
|
||||
private fun ContinueOverlay(state: GameState) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
var watching by remember { mutableStateOf(false) }
|
||||
Box(
|
||||
Modifier.fillMaxSize().background(Color(0xCC17161B)),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
Column(Modifier.padding((24 * s).dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp("TOP OUT", color = Palette.Safety, size = (30 * s).sp)
|
||||
Spacer(Modifier.height((10 * s).dp))
|
||||
Mono(S.timeLeftScore(formatMs(state.remainingMs), state.score), color = Palette.Bone, size = (14 * s).sp)
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
Mono(
|
||||
S.continueOffer,
|
||||
color = Palette.DSub, size = (12 * s).sp, align = TextAlign.Center, maxLines = 5,
|
||||
)
|
||||
Spacer(Modifier.height((20 * s).dp))
|
||||
NeoPanel(background = Palette.Safety, onClick = {
|
||||
if (watching) return@NeoPanel
|
||||
watching = true
|
||||
showRewarded { earned -> if (earned) state.acceptContinue() else state.declineContinue() }
|
||||
}) {
|
||||
Mono(
|
||||
if (watching) S.loadingAd else S.watchToContinue,
|
||||
Modifier.padding(horizontal = (26 * s).dp, vertical = (13 * s).dp),
|
||||
size = (14 * s).sp, weight = FontWeight.Bold,
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.height((12 * s).dp))
|
||||
NeoPanel(onClick = { if (!watching) state.declineContinue() }) {
|
||||
Mono(S.seeResult, Modifier.padding(horizontal = (26 * s).dp, vertical = (13 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── HUD ──────────────────────────────────────────────────────────
|
||||
@@ -128,13 +195,13 @@ private fun Hud(state: GameState, onPause: () -> Unit, onExit: () -> Unit) {
|
||||
val headline = when (state.mode) {
|
||||
Mode.Sprint -> formatMs(state.elapsedMs)
|
||||
Mode.TimeAttack -> formatMs(state.remainingMs)
|
||||
Mode.Endless -> state.score.toString()
|
||||
Mode.Endless, Mode.Versus -> state.score.toString()
|
||||
}
|
||||
Disp(headline, color = Palette.Bone, size = (30 * s).sp)
|
||||
val sub = when (state.mode) {
|
||||
Mode.Sprint -> "LINES ${state.lines}/$SPRINT_GOAL_LINES · PPS ${fmt2(state.pps)}"
|
||||
Mode.TimeAttack -> "SCORE ${state.score} · LV ${state.level}"
|
||||
Mode.Endless -> "LINES ${state.lines} · LV ${state.level}"
|
||||
Mode.Endless, Mode.Versus -> "LINES ${state.lines} · LV ${state.level}"
|
||||
}
|
||||
Mono(sub, color = Palette.DSub, size = (12 * s).sp)
|
||||
}
|
||||
@@ -145,7 +212,7 @@ private fun Hud(state: GameState, onPause: () -> Unit, onExit: () -> Unit) {
|
||||
borderColor = Palette.Bone,
|
||||
onTap = onExit,
|
||||
) {
|
||||
Mono("나가기", color = Palette.Bone, size = (10 * s).sp)
|
||||
Mono(S.exit, color = Palette.Bone, size = (10 * s).sp)
|
||||
}
|
||||
}
|
||||
state.lastEvent?.let {
|
||||
@@ -162,11 +229,12 @@ private fun Hud(state: GameState, onPause: () -> Unit, onExit: () -> Unit) {
|
||||
|
||||
// ── 보드 + HOLD/NEXT ──────────────────────────────────────────────
|
||||
@Composable
|
||||
private fun BoardWithPanels(state: GameState, ghostOn: Boolean, l: Layout, stacked: Boolean) {
|
||||
internal fun BoardWithPanels(state: GameState, ghostOn: Boolean, l: Layout, stacked: Boolean, gauge: (() -> Int)? = null) {
|
||||
val s = l.uiScale
|
||||
BoxWithConstraints(Modifier.fillMaxSize().padding(horizontal = (10 * s).dp)) {
|
||||
val panelW: Dp = if (l.isTiny) (46 * s).dp else (68 * s).dp
|
||||
val availW = maxWidth - panelW - (10 * s).dp
|
||||
val gaugeW: Dp = if (gauge != null) (8 * s).dp else 0.dp
|
||||
val availW = maxWidth - panelW - gaugeW - ((if (gauge != null) 16 else 10) * s).dp
|
||||
val availH = maxHeight
|
||||
val cell = minOf(availW.value / Config.BOARD_W, availH.value / Config.VISIBLE_H)
|
||||
val boardW = (cell * Config.BOARD_W).dp
|
||||
@@ -175,8 +243,9 @@ private fun BoardWithPanels(state: GameState, ghostOn: Boolean, l: Layout, stack
|
||||
Row(
|
||||
Modifier.align(Alignment.Center),
|
||||
verticalAlignment = Alignment.Top,
|
||||
horizontalArrangement = Arrangement.spacedBy((10 * s).dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(((if (gauge != null) 6 else 10) * s).dp),
|
||||
) {
|
||||
if (gauge != null) GarbageGauge(gauge, Modifier.size(gaugeW, boardH))
|
||||
Box(Modifier.size(boardW, boardH)) {
|
||||
BoardCanvas(state, ghostOn)
|
||||
}
|
||||
@@ -187,6 +256,16 @@ private fun BoardWithPanels(state: GameState, ghostOn: Boolean, l: Layout, stack
|
||||
}
|
||||
}
|
||||
|
||||
/** 받을 가비지 게이지 (보드 왼쪽 세로 막대, 20줄 = 꽉 참). */
|
||||
@Composable
|
||||
private fun GarbageGauge(gauge: () -> Int, modifier: Modifier) {
|
||||
Canvas(modifier.background(Palette.DPanel)) {
|
||||
val n = gauge().coerceIn(0, Config.VISIBLE_H)
|
||||
val h = size.height * n / Config.VISIBLE_H
|
||||
drawRect(Palette.Safety, topLeft = Offset(0f, size.height - h), size = Size(size.width, h))
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* HOLD / NEXT 패널.
|
||||
*
|
||||
@@ -213,17 +292,21 @@ private fun BoardCanvas(state: GameState, ghostOn: Boolean) {
|
||||
@Suppress("UNUSED_EXPRESSION")
|
||||
state.version // 엔진 변경 시 재그리기
|
||||
val game = state.game
|
||||
val skin = remember { Loadout.skin }
|
||||
val theme = remember { Loadout.board }
|
||||
Canvas(Modifier.fillMaxSize()) {
|
||||
val cw = size.width / Config.BOARD_W
|
||||
val ch = size.height / Config.VISIBLE_H
|
||||
drawRect(Palette.Dwell)
|
||||
drawRect(theme.bg)
|
||||
|
||||
// 격자
|
||||
for (x in 0..Config.BOARD_W) {
|
||||
drawLine(Palette.DGrid, Offset(x * cw, 0f), Offset(x * cw, size.height), 1f)
|
||||
}
|
||||
for (y in 0..Config.VISIBLE_H) {
|
||||
drawLine(Palette.DGrid, Offset(0f, y * ch), Offset(size.width, y * ch), 1f)
|
||||
theme.grid?.let { grid ->
|
||||
for (x in 0..Config.BOARD_W) {
|
||||
drawLine(grid, Offset(x * cw, 0f), Offset(x * cw, size.height), 1f)
|
||||
}
|
||||
for (y in 0..Config.VISIBLE_H) {
|
||||
drawLine(grid, Offset(0f, y * ch), Offset(size.width, y * ch), 1f)
|
||||
}
|
||||
}
|
||||
|
||||
fun cellRect(bx: Int, by: Int): Pair<Offset, Size>? {
|
||||
@@ -233,15 +316,15 @@ private fun BoardCanvas(state: GameState, ghostOn: Boolean) {
|
||||
return Offset(left + 1f, top + 1f) to Size(cw - 2f, ch - 2f)
|
||||
}
|
||||
|
||||
fun block(bx: Int, by: Int, color: Color) {
|
||||
fun block(bx: Int, by: Int, type: Char) {
|
||||
val r = cellRect(bx, by) ?: return
|
||||
drawRect(color, topLeft = r.first, size = r.second)
|
||||
skinBlock(skin, type, r.first, r.second, theme.bg)
|
||||
}
|
||||
|
||||
// 쌓인 블록
|
||||
for (y in 0 until Config.VISIBLE_H) {
|
||||
for (x in 0 until Config.BOARD_W) {
|
||||
game.board[y][x]?.let { block(x, y, pieceColor(it)) }
|
||||
game.board[y][x]?.let { block(x, y, it) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -261,7 +344,7 @@ private fun BoardCanvas(state: GameState, ghostOn: Boolean) {
|
||||
// 현재 피스
|
||||
if (!game.over) {
|
||||
val t = game.active.type
|
||||
for (c in game.cells()) block(c[0], c[1], pieceColor(t))
|
||||
for (c in game.cells()) block(c[0], c[1], t)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -275,7 +358,7 @@ private fun SidePanel(label: String, pieces: List<Char>, s: Float, slots: Int, t
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.height(((if (tiny) 34 else 44) * s * slots).dp)
|
||||
.background(Palette.DPanel),
|
||||
.background(remember { Loadout.board.panel }),
|
||||
) {
|
||||
Column(Modifier.fillMaxSize().padding(4.dp)) {
|
||||
repeat(slots) { i ->
|
||||
@@ -290,7 +373,15 @@ private fun SidePanel(label: String, pieces: List<Char>, s: Float, slots: Int, t
|
||||
|
||||
@Composable
|
||||
private fun MiniPiece(type: Char) {
|
||||
Canvas(Modifier.fillMaxSize()) {
|
||||
val skin = remember { Loadout.skin }
|
||||
val panel = remember { Loadout.board.panel }
|
||||
MiniPieceCanvas(type, skin, panel)
|
||||
}
|
||||
|
||||
/** 피스 하나를 칸 안에 가운데 맞춰 그린다 (HOLD/NEXT, 상점 미리보기 공용). */
|
||||
@Composable
|
||||
internal fun MiniPieceCanvas(type: Char, skin: BlockSkin, bg: Color, modifier: Modifier = Modifier.fillMaxSize()) {
|
||||
Canvas(modifier) {
|
||||
val cells = kr.tkrmagid.tetrig.engine.STATES.getValue(type)[0]
|
||||
val xs = cells.map { it[0] }
|
||||
val ys = cells.map { it[1] }
|
||||
@@ -301,71 +392,77 @@ private fun MiniPiece(type: Char) {
|
||||
val c = minOf(size.width / (w + 0.6f), size.height / (h + 0.6f))
|
||||
val ox = (size.width - c * w) / 2f
|
||||
val oy = (size.height - c * h) / 2f
|
||||
val color = pieceColor(type)
|
||||
for (cell in cells) {
|
||||
val gx = cell[0] - minX
|
||||
val gy = maxY - cell[1]
|
||||
drawRect(
|
||||
color,
|
||||
topLeft = Offset(ox + gx * c + 1f, oy + gy * c + 1f),
|
||||
size = Size(c - 2f, c - 2f),
|
||||
)
|
||||
skinBlock(skin, type, Offset(ox + gx * c + 1f, oy + gy * c + 1f), Size(c - 2f, c - 2f), bg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── 조작 ──────────────────────────────────────────────────────────
|
||||
@Composable
|
||||
private fun ControlPad(state: GameState, lefty: Boolean, scale: Float, compactHeight: Boolean) {
|
||||
internal fun ControlPad(state: GameState, lefty: Boolean, scale: Float, compactHeight: Boolean) {
|
||||
val h = ((if (compactHeight) 130 else 168) * scale).dp
|
||||
Row(
|
||||
val gap = (8 * scale).dp
|
||||
// 아랫줄 3개(하드 드롭·홀드·소프트 드롭)를 정확히 1/3 씩 주려면 그 줄이
|
||||
// 화면 전체 폭을 차지해야 한다. 그래서 좌/우 컬럼으로 쪼개지 않고
|
||||
// 바깥을 Column 으로 두어 윗줄·아랫줄을 각각 통짜 Row 로 깐다.
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.height(h)
|
||||
.padding(horizontal = (10 * scale).dp, vertical = (6 * scale).dp),
|
||||
horizontalArrangement = Arrangement.spacedBy((8 * scale).dp),
|
||||
verticalArrangement = Arrangement.spacedBy(gap),
|
||||
) {
|
||||
val actions: @Composable (Modifier) -> Unit = { m ->
|
||||
// 회전은 위쪽 한 줄, 아래는 하드 드롭 + 홀드를 반씩 나눈다.
|
||||
// 두 컬럼의 행 높이 비율(1.4 : 1)을 맞춰야 좌우가 나란히 떨어진다.
|
||||
Column(m.fillMaxHeight(), verticalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
Row(Modifier.weight(1.4f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
// HOLD 가 아랫줄로 내려가며 빈 한 칸을 회전 두 개가 나눠 갖는다.
|
||||
// 180° 는 폭을 유지해야 하므로 4등분 중 1칸(weight 1)을 그대로
|
||||
// 두고, ↺·↻ 가 1.5 씩 받아 3/8 폭이 된다.
|
||||
// ── 윗줄: 회전 | 좌우 이동 ──
|
||||
Row(Modifier.weight(1.4f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(gap)) {
|
||||
val rotates: @Composable (Modifier) -> Unit = { m ->
|
||||
Row(m.fillMaxHeight(), horizontalArrangement = Arrangement.spacedBy(gap)) {
|
||||
// 180° 는 폭을 유지해야 해서 4등분 중 1칸을 그대로 두고,
|
||||
// ↺·↻ 가 1.5 씩 받아 3/8 폭이 된다.
|
||||
CtrlButton("↺", Modifier.weight(1.5f).fillMaxHeight(), scale) { state.rotate("ccw") }
|
||||
CtrlButton("↻", Modifier.weight(1.5f).fillMaxHeight(), scale) { state.rotate("cw") }
|
||||
CtrlButton("180°", Modifier.weight(1f).fillMaxHeight(), scale) { state.rotate("180") }
|
||||
}
|
||||
Row(Modifier.weight(1f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
CtrlButton("하드 드롭", Modifier.weight(1f).fillMaxHeight(), scale, accent = true) { state.hardDrop() }
|
||||
CtrlButton("HOLD", Modifier.weight(1f).fillMaxHeight(), scale) { state.hold() }
|
||||
}
|
||||
}
|
||||
}
|
||||
val moves: @Composable (Modifier) -> Unit = { m ->
|
||||
Column(m.fillMaxHeight(), verticalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
Row(Modifier.weight(1.4f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
val moves: @Composable (Modifier) -> Unit = { m ->
|
||||
Row(m.fillMaxHeight(), horizontalArrangement = Arrangement.spacedBy(gap)) {
|
||||
HoldCtrl("◀", Modifier.weight(1f).fillMaxHeight(), scale, { state.press(-1) }, { state.release(-1) })
|
||||
HoldCtrl("▶", Modifier.weight(1f).fillMaxHeight(), scale, { state.press(1) }, { state.release(1) })
|
||||
}
|
||||
HoldCtrl("▼ 소프트", Modifier.weight(1f).fillMaxWidth(), scale, { state.setSoft(true) }, { state.setSoft(false) })
|
||||
}
|
||||
if (lefty) {
|
||||
moves(Modifier.weight(1f))
|
||||
rotates(Modifier.weight(1.35f))
|
||||
} else {
|
||||
rotates(Modifier.weight(1.35f))
|
||||
moves(Modifier.weight(1f))
|
||||
}
|
||||
}
|
||||
// 액션쪽이 한 줄에 버튼 4개라 폭을 더 준다. 1.1 이면 버튼이 세로로 길쭉해져
|
||||
// 엄지로 누르기 불편했다.
|
||||
if (lefty) {
|
||||
moves(Modifier.weight(1f))
|
||||
actions(Modifier.weight(1.35f))
|
||||
} else {
|
||||
actions(Modifier.weight(1.35f))
|
||||
moves(Modifier.weight(1f))
|
||||
|
||||
// ── 아랫줄: 하드 드롭 · 홀드 · 소프트 드롭 3등분 ──
|
||||
Row(Modifier.weight(1f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(gap)) {
|
||||
val third = Modifier.weight(1f).fillMaxHeight()
|
||||
val hardDrop: @Composable (Modifier) -> Unit = { m ->
|
||||
CtrlButton(S.hardDrop, m, scale, accent = true) { state.hardDrop() }
|
||||
}
|
||||
val hold: @Composable (Modifier) -> Unit = { m -> CtrlButton("HOLD", m, scale) { state.hold() } }
|
||||
val soft: @Composable (Modifier) -> Unit = { m ->
|
||||
HoldCtrl(S.softDrop, m, scale, { state.setSoft(true) }, { state.setSoft(false) })
|
||||
}
|
||||
// 왼손 배치에서는 좌우를 뒤집는다 (소프트가 왼쪽 엄지 쪽으로).
|
||||
if (lefty) {
|
||||
soft(third); hold(third); hardDrop(third)
|
||||
} else {
|
||||
hardDrop(third); hold(third); soft(third)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ControlColumn(state: GameState, left: Boolean, scale: Float, modifier: Modifier) {
|
||||
internal fun ControlColumn(state: GameState, left: Boolean, scale: Float, modifier: Modifier) {
|
||||
Column(
|
||||
modifier.padding((8 * scale).dp),
|
||||
verticalArrangement = Arrangement.spacedBy((8 * scale).dp),
|
||||
@@ -373,7 +470,7 @@ private fun ControlColumn(state: GameState, left: Boolean, scale: Float, modifie
|
||||
if (left) {
|
||||
HoldCtrl("◀", Modifier.weight(1f).fillMaxWidth(), scale, { state.press(-1) }, { state.release(-1) })
|
||||
HoldCtrl("▶", Modifier.weight(1f).fillMaxWidth(), scale, { state.press(1) }, { state.release(1) })
|
||||
HoldCtrl("▼ 소프트", Modifier.weight(1f).fillMaxWidth(), scale, { state.setSoft(true) }, { state.setSoft(false) })
|
||||
HoldCtrl(S.softDrop, Modifier.weight(1f).fillMaxWidth(), scale, { state.setSoft(true) }, { state.setSoft(false) })
|
||||
} else {
|
||||
Row(Modifier.weight(1f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy((8 * scale).dp)) {
|
||||
CtrlButton("↺", Modifier.weight(1f).fillMaxHeight(), scale) { state.rotate("ccw") }
|
||||
@@ -383,7 +480,7 @@ private fun ControlColumn(state: GameState, left: Boolean, scale: Float, modifie
|
||||
CtrlButton("HOLD", Modifier.weight(1f).fillMaxHeight(), scale) { state.hold() }
|
||||
CtrlButton("180°", Modifier.weight(1f).fillMaxHeight(), scale) { state.rotate("180") }
|
||||
}
|
||||
CtrlButton("하드 드롭", Modifier.weight(1f).fillMaxWidth(), scale, accent = true) { state.hardDrop() }
|
||||
CtrlButton(S.hardDrop, Modifier.weight(1f).fillMaxWidth(), scale, accent = true) { state.hardDrop() }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -440,14 +537,14 @@ private fun PauseOverlay(onResume: () -> Unit, onExit: () -> Unit) {
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp("일시정지", color = Palette.Bone, size = (26 * s).sp)
|
||||
Disp(S.paused, color = Palette.Bone, size = (26 * s).sp)
|
||||
Spacer(Modifier.height((20 * s).dp))
|
||||
NeoPanel(background = Palette.Safety, onClick = onResume) {
|
||||
Mono("계속하기", Modifier.padding(horizontal = (30 * s).dp, vertical = (13 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Mono(S.resume, Modifier.padding(horizontal = (30 * s).dp, vertical = (13 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
Spacer(Modifier.height((12 * s).dp))
|
||||
NeoPanel(onClick = onExit) {
|
||||
Mono("나가기", Modifier.padding(horizontal = (30 * s).dp, vertical = (13 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Mono(S.exit, Modifier.padding(horizontal = (30 * s).dp, vertical = (13 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.gestures.detectTapGestures
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@@ -30,14 +31,24 @@ import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kr.tkrmagid.tetrig.ads.AdBanner
|
||||
import kr.tkrmagid.tetrig.ads.AdCard
|
||||
import kr.tkrmagid.tetrig.ads.maybeInterstitial
|
||||
import kr.tkrmagid.tetrig.ads.privacyOptionsRequired
|
||||
import kr.tkrmagid.tetrig.ads.showPrivacyOptions
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
import kr.tkrmagid.tetrig.game.Mode
|
||||
import kr.tkrmagid.tetrig.share.ShareCard
|
||||
import kr.tkrmagid.tetrig.share.shareCard
|
||||
|
||||
@Composable
|
||||
fun MainScreen(
|
||||
onMode: (Mode) -> Unit,
|
||||
onSettings: () -> Unit,
|
||||
onSoon: (String) -> Unit,
|
||||
onTab: (Int) -> Unit,
|
||||
onLeague: () -> Unit,
|
||||
onCustom: () -> Unit,
|
||||
) {
|
||||
val l = LocalLayout.current
|
||||
val s = l.uiScale
|
||||
@@ -61,37 +72,28 @@ fun MainScreen(
|
||||
// 태블릿·폴드 가로: 카드 3개를 한 줄에
|
||||
Row(horizontalArrangement = Arrangement.spacedBy((14 * s).dp)) {
|
||||
Box(Modifier.weight(1f)) {
|
||||
ModeCard("솔로", "SPRINT · TIME ATTACK · ENDLESS", Palette.Cobalt, s) { showModes = true }
|
||||
ModeCard(S.solo, "SPRINT · TIME ATTACK · ENDLESS", Palette.Cobalt, s) { showModes = true }
|
||||
}
|
||||
Box(Modifier.weight(1f)) {
|
||||
ModeCard("멀티 · 리그전", "실시간 1:1 랭크 매치 · 배치 10경기", Palette.Safety, s, soon = true) { onSoon("멀티 · 리그전") }
|
||||
ModeCard(S.modeLeague, S.modeLeagueSub, Palette.Safety, s) { onLeague() }
|
||||
}
|
||||
Box(Modifier.weight(1f)) {
|
||||
ModeCard("커스텀", "코드로 만들고 참가 · 인원 제한 없음", null, s, soon = true) { onSoon("커스텀") }
|
||||
ModeCard(S.custom, S.modeCustomSub, null, s) { onCustom() }
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Box(Modifier.widthIn(max = 720.dp).align(Alignment.CenterHorizontally)) {
|
||||
Column {
|
||||
ModeCard("솔로", "SPRINT · TIME ATTACK · ENDLESS", Palette.Cobalt, s) { showModes = true }
|
||||
ModeCard("멀티 · 리그전", "실시간 1:1 랭크 매치 · 배치 10경기", Palette.Safety, s, soon = true) { onSoon("멀티 · 리그전") }
|
||||
ModeCard("커스텀", "코드로 만들고 참가 · 인원 제한 없음", null, s, soon = true) { onSoon("커스텀") }
|
||||
ModeCard(S.solo, "SPRINT · TIME ATTACK · ENDLESS", Palette.Cobalt, s) { showModes = true }
|
||||
ModeCard(S.modeLeague, S.modeLeagueSub, Palette.Safety, s) { onLeague() }
|
||||
ModeCard(S.custom, S.modeCustomSub, null, s) { onCustom() }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TabBar(
|
||||
selected = 0,
|
||||
scale = s,
|
||||
onSelect = { i ->
|
||||
when (i) {
|
||||
1 -> onSoon("리더보드")
|
||||
2 -> onSoon("프로필")
|
||||
3 -> onSettings()
|
||||
}
|
||||
},
|
||||
)
|
||||
AdBanner()
|
||||
TabBar(selected = 0, scale = s, onSelect = onTab)
|
||||
}
|
||||
|
||||
if (showModes) {
|
||||
@@ -115,11 +117,19 @@ private fun Header(s: Float) {
|
||||
Box(Modifier.width((120 * s).dp).height((8 * s).dp).background(Palette.Ink))
|
||||
}
|
||||
Spacer(Modifier.weight(1f))
|
||||
NeoPanel(shadow = false, modifier = Modifier.padding(end = 6.dp)) {
|
||||
Mono("게스트", Modifier.padding(horizontal = 8.dp, vertical = 3.dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
NeoPanel(background = Palette.Safety, shadow = false) {
|
||||
Mono("—", Modifier.padding(horizontal = 10.dp, vertical = 3.dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
val user = Session.user
|
||||
val league = Session.league
|
||||
Column(horizontalAlignment = Alignment.End) {
|
||||
Row {
|
||||
NeoPanel(shadow = false, modifier = Modifier.padding(end = 6.dp)) {
|
||||
Mono(if (user == null || user.guest) S.guest else S.account, Modifier.padding(horizontal = 8.dp, vertical = 3.dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
NeoPanel(background = Palette.Safety, shadow = false) {
|
||||
Mono(league?.rank ?: league?.tr?.toString() ?: "—", Modifier.padding(horizontal = 10.dp, vertical = 3.dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Mono(user?.nickname ?: if (Session.offline) S.offline else "", color = Palette.Sub, size = (11 * s).sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,9 +141,15 @@ private fun SeasonBar(s: Float) {
|
||||
Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = (9 * s).dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Mono("SEASON 1 · D-42", size = (14 * s).sp)
|
||||
val ends = Session.seasonEndsAt
|
||||
val days = if (ends > 0) ((ends - nowMs()) / 86_400_000L).coerceAtLeast(0) else null
|
||||
Mono("SEASON ${Session.seasonN}" + (days?.let { " · D-$it" } ?: ""), size = (14 * s).sp)
|
||||
Spacer(Modifier.weight(1f))
|
||||
Mono("배치 0/10", color = Palette.Cobalt, size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
val l = Session.league
|
||||
Mono(
|
||||
if (l == null) S.placement(0) else if (!l.placed) S.placement(l.placement) else "${l.tr} TR",
|
||||
color = Palette.Cobalt, size = (14 * s).sp, weight = FontWeight.Bold,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -171,12 +187,12 @@ private fun ModeCard(
|
||||
.background(Palette.Sub)
|
||||
.padding(horizontal = (7 * scale).dp, vertical = (2 * scale).dp),
|
||||
) {
|
||||
Mono("준비 중", color = Palette.Bone, size = (11 * scale).sp, weight = FontWeight.Bold)
|
||||
Mono(S.comingSoon, color = Palette.Bone, size = (11 * scale).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(sub, color = Palette.Sub, size = (12 * scale).sp)
|
||||
Mono(sub, color = Palette.Sub, size = (12 * scale).sp, maxLines = 2)
|
||||
}
|
||||
Mono(
|
||||
"›",
|
||||
@@ -200,7 +216,7 @@ private fun HazardBar(scale: Float) {
|
||||
|
||||
@Composable
|
||||
fun TabBar(selected: Int, scale: Float, onSelect: (Int) -> Unit) {
|
||||
val items = listOf("홈", "리더보드", "프로필", "설정")
|
||||
val items = listOf(S.tabHome, S.tabLeaderboard, S.tabProfile, S.tabShop, S.tabSettings)
|
||||
Row(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
@@ -262,9 +278,9 @@ fun SoloSheet(scale: Float, onDismiss: () -> Unit, onPick: (Mode) -> Unit) {
|
||||
.background(Palette.Sub)
|
||||
)
|
||||
Spacer(Modifier.height((14 * scale).dp))
|
||||
Disp("솔로", size = (24 * scale).sp)
|
||||
Disp(S.solo, size = (24 * scale).sp)
|
||||
Spacer(Modifier.height((12 * scale).dp))
|
||||
Mode.entries.forEach { m -> SoloRow(m, scale) { onPick(m) } }
|
||||
Mode.solo.forEach { m -> SoloRow(m, scale) { onPick(m) } }
|
||||
Spacer(Modifier.height((6 * scale).dp))
|
||||
}
|
||||
}
|
||||
@@ -274,13 +290,14 @@ fun SoloSheet(scale: Float, onDismiss: () -> Unit, onPick: (Mode) -> Unit) {
|
||||
@Composable
|
||||
private fun SoloRow(mode: Mode, scale: Float, onClick: () -> Unit) {
|
||||
val best = when (mode) {
|
||||
Mode.Sprint -> Prefs.bestSprintMs().let { if (it == 0L) "기록 없음" else formatMs(it) }
|
||||
else -> Prefs.bestScore(mode.id).let { if (it == 0) "기록 없음" else "$it" }
|
||||
Mode.Sprint -> Prefs.bestSprintMs().let { if (it == 0L) S.noRecord else formatMs(it) }
|
||||
else -> Prefs.bestScore(mode.id).let { if (it == 0) S.noRecord else "$it" }
|
||||
}
|
||||
val bar = when (mode) {
|
||||
Mode.Sprint -> Palette.Mint
|
||||
Mode.TimeAttack -> Palette.Amber
|
||||
Mode.Endless -> Palette.Violet
|
||||
Mode.Versus -> Palette.Safety
|
||||
}
|
||||
Box(Modifier.fillMaxWidth().padding(bottom = (12 * scale).dp)) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth(), onClick = onClick) {
|
||||
@@ -302,28 +319,6 @@ private fun SoloRow(mode: Mode, scale: Float, onClick: () -> Unit) {
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun SoonScreen(title: String, onBack: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
Column(Modifier.fillMaxSize().padding((20 * s).dp)) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Disp("준비 중", size = (24 * s).sp)
|
||||
Spacer(Modifier.weight(1f))
|
||||
NeoPanel(shadow = false, onClick = onBack) {
|
||||
Mono("← 뒤로", Modifier.padding(horizontal = 12.dp, vertical = 6.dp), size = (13 * s).sp)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((24 * s).dp))
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding((20 * s).dp)) {
|
||||
Disp(title, size = (20 * s).sp)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
Mono("아직 구현되지 않았습니다. 다음 업데이트에서 열립니다.", color = Palette.Sub, size = (12 * s).sp, maxLines = 3)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ResultScreen(
|
||||
mode: Mode,
|
||||
@@ -331,12 +326,14 @@ fun ResultScreen(
|
||||
lines: Int,
|
||||
timeMs: Long,
|
||||
pps: Double,
|
||||
continued: Boolean = false,
|
||||
onRetry: () -> Unit,
|
||||
onHome: () -> Unit,
|
||||
) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val headline = if (mode == Mode.Sprint) formatMs(timeMs) else "$score"
|
||||
Column(
|
||||
Modifier.fillMaxSize().padding((20 * s).dp),
|
||||
Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding((20 * s).dp),
|
||||
verticalArrangement = Arrangement.Center,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
@@ -346,26 +343,45 @@ fun ResultScreen(
|
||||
Spacer(Modifier.height((18 * s).dp))
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().widthIn(max = 560.dp)) {
|
||||
Column(Modifier.padding((18 * s).dp)) {
|
||||
StatRow("점수", "$score", s)
|
||||
StatRow("라인", "$lines", s)
|
||||
StatRow("시간", formatMs(timeMs), s)
|
||||
StatRow(S.score, "$score", s)
|
||||
StatRow(S.lines, "$lines", s)
|
||||
StatRow(S.time, formatMs(timeMs), s)
|
||||
StatRow("PPS", ((pps * 100).toInt() / 100.0).toString(), s)
|
||||
if (continued) {
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(S.continuedNotRecorded, color = Palette.Safety, size = (11 * s).sp, maxLines = 2)
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((18 * s).dp))
|
||||
Spacer(Modifier.height((10 * s).dp))
|
||||
NeoButton(S.shareResult, s, Modifier.widthIn(max = 560.dp).fillMaxWidth()) {
|
||||
shareCard(
|
||||
ShareCard(
|
||||
mode = mode.title,
|
||||
headline = headline,
|
||||
rows = listOf(S.score to "$score", S.lines to "$lines", S.time to formatMs(timeMs), "PPS" to ((pps * 100).toInt() / 100.0).toString()),
|
||||
nickname = Session.user?.nickname,
|
||||
),
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
// 앱 버튼은 광고 카드에 붙이지 않는다 (실수 클릭 방지 정책): 30분 끄기는 광고 위에 둔다.
|
||||
AdFreeOffer(s, Modifier.widthIn(max = 560.dp).fillMaxWidth().padding(bottom = (14 * s).dp))
|
||||
AdCard()
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
Row(Modifier.widthIn(max = 560.dp).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) {
|
||||
NeoPanel(background = Palette.Safety, modifier = Modifier.weight(1f), onClick = onRetry) {
|
||||
NeoPanel(background = Palette.Safety, modifier = Modifier.weight(1f), onClick = { maybeInterstitial(onRetry) }) {
|
||||
Mono(
|
||||
"다시 하기",
|
||||
S.playAgain,
|
||||
Modifier.fillMaxWidth().padding(vertical = (14 * s).dp),
|
||||
size = (14 * s).sp,
|
||||
weight = FontWeight.Bold,
|
||||
align = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
NeoPanel(modifier = Modifier.weight(1f), onClick = onHome) {
|
||||
NeoPanel(modifier = Modifier.weight(1f), onClick = { maybeInterstitial(onHome) }) {
|
||||
Mono(
|
||||
"홈으로",
|
||||
S.home,
|
||||
Modifier.fillMaxWidth().padding(vertical = (14 * s).dp),
|
||||
size = (14 * s).sp,
|
||||
weight = FontWeight.Bold,
|
||||
@@ -386,7 +402,7 @@ private fun StatRow(label: String, value: String, s: Float) {
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun SettingsScreen(onBack: () -> Unit) {
|
||||
fun SettingsScreen(onBack: () -> Unit, onTab: (Int) -> Unit = { if (it == 0) onBack() }) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
var ghost by remember { mutableStateOf(Prefs.flag("ghost", true)) }
|
||||
var lefty by remember { mutableStateOf(Prefs.flag("lefty", false)) }
|
||||
@@ -395,28 +411,37 @@ fun SettingsScreen(onBack: () -> Unit) {
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Column(Modifier.weight(1f).verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Disp("설정", size = (24 * s).sp)
|
||||
Disp(S.tabSettings, size = (24 * s).sp)
|
||||
Spacer(Modifier.weight(1f))
|
||||
NeoPanel(shadow = false, onClick = onBack) {
|
||||
Mono("← 뒤로", Modifier.padding(horizontal = 12.dp, vertical = 6.dp), size = (13 * s).sp)
|
||||
Mono(S.back, Modifier.padding(horizontal = 12.dp, vertical = 6.dp), size = (13 * s).sp)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((18 * s).dp))
|
||||
Box(Modifier.widthIn(max = 720.dp)) {
|
||||
Column {
|
||||
Toggle("고스트 표시", "착지 위치 미리보기", ghost, s) {
|
||||
Toggle(S.ghost, S.ghostSub, ghost, s) {
|
||||
ghost = it; Prefs.setFlag("ghost", it)
|
||||
}
|
||||
Toggle("왼손 배치", "조작 버튼 좌우 반전", lefty, s) {
|
||||
Toggle(S.lefty, S.leftySub, lefty, s) {
|
||||
lefty = it; Prefs.setFlag("lefty", it)
|
||||
}
|
||||
Toggle("큰 버튼", "태블릿·폴드에서 버튼 확대", bigButtons, s) {
|
||||
Toggle(S.bigButtons, S.bigButtonsSub, bigButtons, s) {
|
||||
bigButtons = it; Prefs.setFlag("bigButtons", it)
|
||||
}
|
||||
if (privacyOptionsRequired()) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth(), onClick = { showPrivacyOptions() }) {
|
||||
Column(Modifier.fillMaxWidth().padding((16 * s).dp)) {
|
||||
Mono(S.adPrivacy, size = (15 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Mono(S.adPrivacySub, color = Palette.Sub, size = (11 * s).sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
TabBar(selected = 3, scale = s, onSelect = { if (it == 0) onBack() })
|
||||
TabBar(selected = 4, scale = s, onSelect = onTab)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,442 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.text.BasicTextField
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.KeyboardCapitalization
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.json.JsonObject
|
||||
import kr.tkrmagid.tetrig.game.QueueClient
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.arr
|
||||
import kr.tkrmagid.tetrig.net.bool
|
||||
import kr.tkrmagid.tetrig.net.int
|
||||
import kr.tkrmagid.tetrig.net.jsonOf
|
||||
import kr.tkrmagid.tetrig.net.long
|
||||
import kr.tkrmagid.tetrig.net.obj
|
||||
import kr.tkrmagid.tetrig.net.str
|
||||
|
||||
// ── 공통 ─────────────────────────────────────────────────────────
|
||||
@Composable
|
||||
fun TopBar(title: String, s: Float, onBack: (() -> Unit)?) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Disp(title, size = (24 * s).sp)
|
||||
Spacer(Modifier.weight(1f))
|
||||
if (onBack != null) {
|
||||
NeoPanel(shadow = false, onClick = onBack) {
|
||||
Mono(S.back, Modifier.padding(horizontal = 12.dp, vertical = 6.dp), size = (13 * s).sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun NeoButton(label: String, s: Float, modifier: Modifier = Modifier, accent: Boolean = false, enabled: Boolean = true, onClick: () -> Unit) {
|
||||
NeoPanel(
|
||||
modifier = modifier,
|
||||
background = if (!enabled) Palette.Paper else if (accent) Palette.Safety else Palette.Bone,
|
||||
onClick = if (enabled) onClick else null,
|
||||
) {
|
||||
Mono(
|
||||
label,
|
||||
Modifier.fillMaxWidth().padding(vertical = (13 * s).dp, horizontal = 8.dp),
|
||||
color = if (enabled) Palette.Ink else Palette.Sub,
|
||||
size = (14 * s).sp, weight = FontWeight.Bold, align = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun NeoField(
|
||||
value: String,
|
||||
onChange: (String) -> Unit,
|
||||
placeholder: String,
|
||||
s: Float,
|
||||
password: Boolean = false,
|
||||
keyboard: KeyboardType = KeyboardType.Text,
|
||||
caps: Boolean = false,
|
||||
big: Boolean = false,
|
||||
) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth(), shadow = false) {
|
||||
Box(Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = (12 * s).dp)) {
|
||||
val style = TextStyle(
|
||||
fontFamily = FontFamily.Monospace, fontSize = ((if (big) 26 else 15) * s).sp,
|
||||
fontWeight = if (big) FontWeight.Black else FontWeight.Normal, color = Palette.Ink,
|
||||
textAlign = if (big) TextAlign.Center else TextAlign.Start,
|
||||
)
|
||||
if (value.isEmpty()) Mono(placeholder, Modifier.fillMaxWidth(), color = Palette.Sub, size = ((if (big) 26 else 15) * s).sp, align = if (big) TextAlign.Center else TextAlign.Start)
|
||||
BasicTextField(
|
||||
value = value,
|
||||
onValueChange = onChange,
|
||||
singleLine = true,
|
||||
textStyle = style,
|
||||
visualTransformation = if (password) PasswordVisualTransformation() else VisualTransformation.None,
|
||||
keyboardOptions = KeyboardOptions(
|
||||
keyboardType = if (password) KeyboardType.Password else keyboard,
|
||||
capitalization = if (caps) KeyboardCapitalization.Characters else KeyboardCapitalization.None,
|
||||
autoCorrectEnabled = false,
|
||||
),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ErrorLine(msg: String?, s: Float) {
|
||||
if (msg != null) {
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Mono(msg, color = Palette.Safety, size = (12 * s).sp, weight = FontWeight.Bold, maxLines = 3)
|
||||
}
|
||||
}
|
||||
|
||||
// ── 프로필 (⑦) ───────────────────────────────────────────────────
|
||||
@Composable
|
||||
fun ProfileScreen(onTab: (Int) -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val scope = rememberCoroutineScope()
|
||||
val user = Session.user
|
||||
var busy by remember { mutableStateOf(false) }
|
||||
var msg by remember { mutableStateOf<String?>(null) }
|
||||
var registerMode by remember { mutableStateOf(true) }
|
||||
var email by remember { mutableStateOf("") }
|
||||
var pw by remember { mutableStateOf("") }
|
||||
var nick by remember { mutableStateOf("") }
|
||||
var newNick by remember { mutableStateOf("") }
|
||||
var confirmDelete by remember { mutableStateOf(false) }
|
||||
|
||||
LaunchedEffect(Unit) { Session.refresh() }
|
||||
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Column(Modifier.weight(1f).verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
TopBar(S.tabProfile, s, null)
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
Box(Modifier.widthIn(max = 720.dp)) {
|
||||
Column {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding((16 * s).dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Disp(user?.nickname ?: (if (Session.offline) S.offline else "…"), size = (22 * s).sp)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
if (user?.guest != false) Badge(S.guest, Palette.Sub, s) else Badge(S.account, Palette.Cobalt, s)
|
||||
user?.badge?.let { Spacer(Modifier.width(6.dp)); UserBadge(it, s) }
|
||||
}
|
||||
user?.email?.let { Spacer(Modifier.height(4.dp)); Mono(it, color = Palette.Sub, size = (12 * s).sp) }
|
||||
Spacer(Modifier.height(12.dp))
|
||||
LeagueSummary(s)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
|
||||
if (user == null || user.guest) {
|
||||
Mono(
|
||||
S.loginPitch,
|
||||
color = Palette.Sub, size = (12 * s).sp, maxLines = 4,
|
||||
)
|
||||
Spacer(Modifier.height(12.dp))
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
NeoButton(S.emailSignup, s, Modifier.weight(1f), accent = registerMode) { registerMode = true; msg = null }
|
||||
NeoButton(S.login, s, Modifier.weight(1f), accent = !registerMode) { registerMode = false; msg = null }
|
||||
}
|
||||
Spacer(Modifier.height(12.dp))
|
||||
NeoField(email, { email = it.trim() }, S.email, s, keyboard = KeyboardType.Email)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
NeoField(pw, { pw = it }, S.passwordHint, s, password = true)
|
||||
if (registerMode) {
|
||||
Spacer(Modifier.height(8.dp))
|
||||
NeoField(nick, { nick = it.take(12) }, S.nickOptional, s)
|
||||
}
|
||||
ErrorLine(msg, s)
|
||||
Spacer(Modifier.height(12.dp))
|
||||
NeoButton(if (busy) S.processing else if (registerMode) S.signUp else S.login, s, Modifier.fillMaxWidth(), accent = true, enabled = !busy) {
|
||||
busy = true
|
||||
msg = null
|
||||
scope.launch {
|
||||
msg = if (registerMode) Session.register(email, pw, nick) else Session.login(email, pw)
|
||||
if (msg == null) pw = ""
|
||||
busy = false
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Mono(S.noPasswordReset, color = Palette.Sub, size = (11 * s).sp, maxLines = 3)
|
||||
} else {
|
||||
Mono(S.nickChangeTitle, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
NeoField(newNick, { newNick = it.take(12) }, user.nickname, s)
|
||||
ErrorLine(msg, s)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
NeoButton(S.nickChange, s, Modifier.fillMaxWidth(), enabled = !busy && newNick.length >= 2) {
|
||||
busy = true
|
||||
scope.launch {
|
||||
msg = Session.changeNickname(newNick) ?: S.changed
|
||||
busy = false
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(12.dp))
|
||||
NeoButton(S.logout, s, Modifier.fillMaxWidth()) {
|
||||
scope.launch { Session.logout() }
|
||||
}
|
||||
Spacer(Modifier.height(12.dp))
|
||||
NeoButton(
|
||||
if (confirmDelete) S.deleteConfirm else S.deleteAccount,
|
||||
s, Modifier.fillMaxWidth(), enabled = !busy,
|
||||
) {
|
||||
if (!confirmDelete) {
|
||||
confirmDelete = true
|
||||
} else {
|
||||
busy = true
|
||||
scope.launch {
|
||||
msg = Session.deleteAccount()
|
||||
confirmDelete = false
|
||||
busy = false
|
||||
}
|
||||
}
|
||||
}
|
||||
if (confirmDelete) {
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(S.deleteWarning, color = Palette.Safety, size = (11 * s).sp, maxLines = 3)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(Modifier.height((20 * s).dp))
|
||||
RecentMatches(Session.profile, s)
|
||||
}
|
||||
}
|
||||
}
|
||||
TabBar(selected = 2, scale = s, onSelect = onTab)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun Badge(text: String, color: androidx.compose.ui.graphics.Color, s: Float) {
|
||||
Box(Modifier.background(color).padding(horizontal = (7 * s).dp, vertical = (2 * s).dp)) {
|
||||
Mono(text, color = Palette.Bone, size = (11 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun LeagueSummary(s: Float) {
|
||||
val l = Session.league
|
||||
Row(Modifier.fillMaxWidth()) {
|
||||
Stat("TR", if (l?.placed == true) "${l.tr}" else S.placement(l?.placement ?: 0), s, Modifier.weight(1f))
|
||||
Stat(S.rank, l?.rank ?: "—", s, Modifier.weight(1f))
|
||||
Stat(S.seasonRecord, S.winLoss(l?.wins ?: 0, (l?.games ?: 0) - (l?.wins ?: 0)), s, Modifier.weight(1f))
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Stat(label: String, value: String, s: Float, modifier: Modifier) {
|
||||
Column(modifier) {
|
||||
Mono(label, color = Palette.Sub, size = (11 * s).sp)
|
||||
Mono(value, size = (16 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun RecentMatches(profile: JsonObject?, s: Float) {
|
||||
val recent = profile?.arr("recent") ?: emptyList()
|
||||
Mono(S.recentMatches, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
if (recent.isEmpty()) {
|
||||
Mono(S.noMatches, color = Palette.Sub, size = (12 * s).sp)
|
||||
return
|
||||
}
|
||||
for (m in recent.take(10)) {
|
||||
val line = if (m.str("mode") == "league") {
|
||||
val won = m.bool("won") == true
|
||||
val d = m.int("trDelta") ?: 0
|
||||
S.historyLeague(won, m.str("opponent") ?: "", if (d >= 0) "+$d" else "$d")
|
||||
} else {
|
||||
S.historyCustom(m.int("size") ?: 0, m.int("place") ?: 0, m.int("wins") ?: 0)
|
||||
}
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), shadow = false) {
|
||||
Mono(line, Modifier.padding(horizontal = 12.dp, vertical = 9.dp), size = (12 * s).sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── 리더보드 ─────────────────────────────────────────────────────
|
||||
@Composable
|
||||
fun LeaderboardScreen(onTab: (Int) -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val boards = listOf("league" to S.league, "sprint" to "SPRINT", "time" to "TIME ATK", "endless" to "ENDLESS")
|
||||
var board by remember { mutableStateOf("league") }
|
||||
var rows by remember { mutableStateOf<List<JsonObject>?>(null) }
|
||||
var err by remember { mutableStateOf<String?>(null) }
|
||||
|
||||
LaunchedEffect(board) {
|
||||
rows = null
|
||||
err = null
|
||||
val r = Session.call("GET", "/api/leaderboard?board=$board", withToken = false)
|
||||
if (r.ok) rows = r.data.arr("rows") else err = r.error
|
||||
}
|
||||
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Column(Modifier.weight(1f).verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
TopBar(S.tabLeaderboard, s, null)
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
for ((id, label) in boards) {
|
||||
NeoPanel(
|
||||
modifier = Modifier.weight(1f),
|
||||
background = if (id == board) Palette.Safety else Palette.Bone,
|
||||
shadow = false,
|
||||
onClick = { board = id },
|
||||
) {
|
||||
Mono(label, Modifier.fillMaxWidth().padding(vertical = 8.dp), size = (11 * s).sp, weight = FontWeight.Bold, align = TextAlign.Center)
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
when {
|
||||
err != null -> Mono(err!!, color = Palette.Safety, size = (13 * s).sp)
|
||||
rows == null -> Mono(S.loading, color = Palette.Sub, size = (13 * s).sp)
|
||||
rows!!.isEmpty() -> Mono(
|
||||
if (board == "league") S.lbEmptyLeague else S.lbEmptySolo,
|
||||
color = Palette.Sub, size = (12 * s).sp, maxLines = 3,
|
||||
)
|
||||
else -> for (r in rows!!) {
|
||||
val mine = r.str("id") == Session.user?.id
|
||||
val value = when (board) {
|
||||
"league" -> "${r.int("tr") ?: "-"} TR · ${r.str("rank") ?: "?"}"
|
||||
"sprint" -> formatMs(r.long("best") ?: 0)
|
||||
else -> "${r.int("best") ?: 0}"
|
||||
}
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), background = if (mine) Palette.Paper else Palette.Bone, shadow = false) {
|
||||
Row(Modifier.padding(horizontal = 12.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Mono("${r.int("pos")}", Modifier.width((34 * s).dp), size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
Mono(r.str("nickname") ?: "?", Modifier.weight(1f, fill = false), size = (13 * s).sp)
|
||||
r.str("badge")?.let { Spacer(Modifier.width(6.dp)); UserBadge(it, s) }
|
||||
Spacer(Modifier.weight(1f))
|
||||
Mono(value, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
TabBar(selected = 1, scale = s, onSelect = onTab)
|
||||
}
|
||||
}
|
||||
|
||||
// ── 커스텀: 만들기 / 참가 ────────────────────────────────────────
|
||||
@Composable
|
||||
fun CustomEntryScreen(onJoin: (code: String) -> Unit, onBack: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val scope = rememberCoroutineScope()
|
||||
var code by remember { mutableStateOf("") }
|
||||
var busy by remember { mutableStateOf(false) }
|
||||
var msg by remember { mutableStateOf<String?>(null) }
|
||||
Column(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
TopBar(S.custom, s, onBack)
|
||||
Spacer(Modifier.height((20 * s).dp))
|
||||
Box(Modifier.widthIn(max = 560.dp).align(Alignment.CenterHorizontally)) {
|
||||
Column {
|
||||
Mono(S.createRoom, size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(S.createRoomDesc, color = Palette.Sub, size = (12 * s).sp, maxLines = 3)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
NeoButton(if (busy) S.creating else S.createRoom, s, Modifier.fillMaxWidth(), accent = true, enabled = !busy) {
|
||||
busy = true
|
||||
msg = null
|
||||
scope.launch {
|
||||
val r = Session.call("POST", "/api/rooms", jsonOf("rules" to emptyMap<String, Any>()))
|
||||
busy = false
|
||||
val c = r.data.str("code")
|
||||
if (r.ok && c != null) onJoin(c) else msg = r.error
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((28 * s).dp))
|
||||
Mono(S.joinTitle, size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
NeoField(code, { v -> code = v.uppercase().filter { it in "ABCDEFGHJKLMNPQRSTUVWXYZ23456789" }.take(6) }, S.codeHint, s, caps = true, big = true)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
NeoButton(S.join, s, Modifier.fillMaxWidth(), enabled = !busy && code.length == 6) {
|
||||
busy = true
|
||||
msg = null
|
||||
scope.launch {
|
||||
val r = Session.call("GET", "/api/rooms/$code", withToken = false)
|
||||
busy = false
|
||||
if (r.ok && r.data.bool("exists") == true) onJoin(code) else msg = if (r.code == 0) r.error else S.noSuchRoom
|
||||
}
|
||||
}
|
||||
ErrorLine(msg, s)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── 리그 대기열 ──────────────────────────────────────────────────
|
||||
@Composable
|
||||
fun QueueScreen(onMatched: (room: String) -> Unit, onBack: () -> Unit, onCustom: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
var opponent by remember { mutableStateOf<String?>(null) }
|
||||
val q = remember {
|
||||
QueueClient { room, opp ->
|
||||
opponent = opp
|
||||
onMatched(room)
|
||||
}
|
||||
}
|
||||
DisposableEffect(q) {
|
||||
q.connect()
|
||||
onDispose { q.cancel() }
|
||||
}
|
||||
Column(
|
||||
Modifier.fillMaxSize().padding((20 * s).dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
TopBar(S.league, s, onBack)
|
||||
Spacer(Modifier.weight(1f))
|
||||
Disp(if (opponent != null) S.matchFound else S.searching, size = (28 * s).sp)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
Mono(S.seconds(formatMs(q.waitMs).substringBefore('.')), size = (18 * s).sp)
|
||||
Spacer(Modifier.height(12.dp))
|
||||
Session.league?.let { l ->
|
||||
Mono(if (l.placed) "${l.tr} TR · ${l.rank ?: S.rankPending}" else S.placement(l.placement), color = Palette.Sub, size = (13 * s).sp)
|
||||
}
|
||||
q.error?.let {
|
||||
Spacer(Modifier.height(12.dp))
|
||||
Mono(it, color = Palette.Safety, size = (13 * s).sp, weight = FontWeight.Bold, maxLines = 3, align = TextAlign.Center)
|
||||
}
|
||||
if (q.hint) {
|
||||
Spacer(Modifier.height(20.dp))
|
||||
Mono(S.queueLong, color = Palette.Sub, size = (12 * s).sp, maxLines = 3, align = TextAlign.Center)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
NeoButton(S.openCustom, s, Modifier.widthIn(max = 320.dp).fillMaxWidth(), onClick = onCustom)
|
||||
}
|
||||
Spacer(Modifier.weight(1f))
|
||||
NeoButton(S.cancel, s, Modifier.widthIn(max = 320.dp).fillMaxWidth(), onClick = onBack)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,484 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.gestures.detectTapGestures
|
||||
import androidx.compose.ui.input.pointer.pointerInput
|
||||
import androidx.compose.foundation.horizontalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableLongStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.withFrameNanos
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.geometry.Size
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kr.tkrmagid.tetrig.ads.AdBanner
|
||||
import kr.tkrmagid.tetrig.ads.AdCard
|
||||
import kr.tkrmagid.tetrig.ads.AdPolicy
|
||||
import kr.tkrmagid.tetrig.ads.maybeInterstitial
|
||||
import kr.tkrmagid.tetrig.share.ShareCard
|
||||
import kr.tkrmagid.tetrig.share.shareCard
|
||||
import kr.tkrmagid.tetrig.share.roomInviteText
|
||||
import kr.tkrmagid.tetrig.share.shareText
|
||||
import kr.tkrmagid.tetrig.data.Prefs
|
||||
import kr.tkrmagid.tetrig.engine.Config
|
||||
import kr.tkrmagid.tetrig.game.Conn
|
||||
import kr.tkrmagid.tetrig.game.GameState
|
||||
import kr.tkrmagid.tetrig.game.RoomClient
|
||||
import kr.tkrmagid.tetrig.game.RoomPlayer
|
||||
import kr.tkrmagid.tetrig.game.RoomRules
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
|
||||
/**
|
||||
* 경기방 화면 하나로 로비 → 라운드 → 결과를 오간다 (⑤ 로비, ③ 리그 1:1, ④ 커스텀 FFA, ⑥/⑨ 결과).
|
||||
*/
|
||||
@Composable
|
||||
fun RoomScreen(client: RoomClient, onExit: () -> Unit, onRequeue: () -> Unit) {
|
||||
DisposableEffect(client) {
|
||||
client.connect()
|
||||
onDispose { client.leave() }
|
||||
}
|
||||
LaunchedEffect(client.matchEnd) {
|
||||
if (client.matchEnd != null) {
|
||||
AdPolicy.onGameFinished()
|
||||
if (client.kind == "league") Session.refresh()
|
||||
}
|
||||
}
|
||||
|
||||
val fatal = client.fatal
|
||||
val phase = client.phase
|
||||
val inMatch = phase == "countdown" || phase == "playing" || phase == "between"
|
||||
when {
|
||||
fatal != null -> FatalView(fatal, onExit)
|
||||
client.matchEnd != null && phase == "match_end" -> MatchResultView(client, onExit, onRequeue)
|
||||
inMatch || (client.game != null && phase != "lobby") -> VersusView(client, onExit)
|
||||
client.kind == "league" -> LeagueWaitView(client, onExit)
|
||||
else -> LobbyView(client, onExit)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun FatalView(msg: String, onExit: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
Column(Modifier.fillMaxSize().padding((20 * s).dp), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp(S.connectionClosed, size = (24 * s).sp)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
Mono(msg, color = Palette.Sub, size = (13 * s).sp, maxLines = 3, align = TextAlign.Center)
|
||||
Spacer(Modifier.height(20.dp))
|
||||
NeoButton(S.home, s, Modifier.widthIn(max = 320.dp).fillMaxWidth(), accent = true, onClick = onExit)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ConnBadge(client: RoomClient, s: Float) {
|
||||
when (client.conn) {
|
||||
Conn.Open -> Unit
|
||||
Conn.Connecting -> Badge(S.connecting, Palette.Sub, s)
|
||||
Conn.Reconnecting -> Badge(S.reconnecting, Palette.Safety, s)
|
||||
Conn.Closed -> Badge(S.disconnected, Palette.Safety, s)
|
||||
}
|
||||
}
|
||||
|
||||
// ── 로비 (⑤) ─────────────────────────────────────────────────────
|
||||
@Composable
|
||||
private fun LobbyView(client: RoomClient, onExit: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val host = client.isHost
|
||||
val r = client.rules
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Column(Modifier.weight(1f).verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Disp(S.customLobby, size = (22 * s).sp)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
ConnBadge(client, s)
|
||||
Spacer(Modifier.weight(1f))
|
||||
NeoPanel(shadow = false, onClick = onExit) {
|
||||
Mono(S.exit, Modifier.padding(horizontal = 12.dp, vertical = 6.dp), size = (13 * s).sp)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth(), background = Palette.Ink) {
|
||||
Column(Modifier.fillMaxWidth().padding((14 * s).dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Mono(S.roomCode, color = Palette.DSub, size = (12 * s).sp)
|
||||
Disp(client.code ?: "------", color = Palette.Safety, size = (38 * s).sp)
|
||||
Mono(S.inviteHint, color = Palette.DSub, size = (11 * s).sp)
|
||||
}
|
||||
}
|
||||
client.code?.let { code ->
|
||||
Spacer(Modifier.height((10 * s).dp))
|
||||
NeoButton(S.sendInvite, s, Modifier.fillMaxWidth()) { shareText(roomInviteText(code)) }
|
||||
}
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
Mono(S.playersCount(client.players.size), size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
for (p in client.players) PlayerRow(p, p.id == client.host, p.id == client.me, s)
|
||||
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
Mono(if (host) S.rulesHost else S.rules, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
RuleRow(S.garbageMul, "${r.garbageMul}×", host, s) {
|
||||
val steps = listOf(0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0)
|
||||
val i = steps.indexOfFirst { it >= r.garbageMul - 1e-6 }.coerceAtLeast(0)
|
||||
client.updateRules(r.copy(garbageMul = steps[(i + 1) % steps.size]))
|
||||
}
|
||||
RuleRow(S.targetWins, if (r.ft == 0) S.unlimited else "FT${r.ft}", host, s) {
|
||||
val order = listOf(0, 1, 3, 5)
|
||||
client.updateRules(r.copy(ft = order[(order.indexOf(r.ft) + 1) % order.size]))
|
||||
}
|
||||
RuleRow(S.seed, if (r.sameBag) S.sameBag else S.personalBag, host, s) {
|
||||
client.updateRules(r.copy(sameBag = !r.sameBag))
|
||||
}
|
||||
RuleRow(S.overtime, if (r.overtime) S.overtimeOn else S.off, host, s) {
|
||||
client.updateRules(r.copy(overtime = !r.overtime))
|
||||
}
|
||||
client.toast?.let {
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Mono(it, color = Palette.Safety, size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
if (host) {
|
||||
NeoButton(
|
||||
if (client.players.count { it.connected } < 2) S.needTwo else S.start,
|
||||
s, Modifier.fillMaxWidth(), accent = true, enabled = client.players.count { it.connected } >= 2,
|
||||
) { client.toast = null; client.start() }
|
||||
} else {
|
||||
Mono(S.waitingHost, color = Palette.Sub, size = (13 * s).sp)
|
||||
}
|
||||
}
|
||||
AdBanner()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PlayerRow(p: RoomPlayer, isHost: Boolean, isMe: Boolean, s: Float) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), background = if (isMe) Palette.Paper else Palette.Bone, shadow = false) {
|
||||
Row(Modifier.padding(horizontal = 12.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Mono(p.nick + if (isMe) S.meSuffix else "", Modifier.weight(1f), size = (13 * s).sp, weight = if (isMe) FontWeight.Bold else FontWeight.Normal)
|
||||
p.badge?.let { UserBadge(it, s); Spacer(Modifier.width(4.dp)) }
|
||||
if (p.guest) { Badge(S.guest, Palette.Sub, s); Spacer(Modifier.width(4.dp)) }
|
||||
if (isHost) { Badge(S.host, Palette.Safety, s); Spacer(Modifier.width(4.dp)) }
|
||||
if (!p.connected) Badge(S.disconnected, Palette.Sub, s)
|
||||
if (p.wins > 0) Mono(" " + S.wins(p.wins), size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun RuleRow(label: String, value: String, editable: Boolean, s: Float, onTap: () -> Unit) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), shadow = false, onClick = if (editable) onTap else null) {
|
||||
Row(Modifier.padding(horizontal = 12.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Mono(label, Modifier.weight(1f), color = Palette.Sub, size = (12 * s).sp)
|
||||
Mono(value, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
if (editable) Mono(" ›", color = Palette.Sub, size = (14 * s).sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun LeagueWaitView(client: RoomClient, onExit: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
Column(Modifier.fillMaxSize().padding((20 * s).dp), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp(S.league, size = (26 * s).sp)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
val opp = client.players.firstOrNull { it.id != client.me }
|
||||
Mono(if (opp == null) S.waitingOpponent else "vs ${opp.nick}", size = (15 * s).sp)
|
||||
Spacer(Modifier.height(6.dp))
|
||||
ConnBadge(client, s)
|
||||
Spacer(Modifier.height(24.dp))
|
||||
NeoButton(S.forfeitExit, s, Modifier.widthIn(max = 320.dp).fillMaxWidth(), onClick = onExit)
|
||||
}
|
||||
}
|
||||
|
||||
// ── 대전 (③ 1:1 / ④ FFA) ─────────────────────────────────────────
|
||||
@Composable
|
||||
private fun VersusView(client: RoomClient, onExit: () -> Unit) {
|
||||
val l = LocalLayout.current
|
||||
val s = l.uiScale
|
||||
val game = client.game
|
||||
val ghostOn = remember { Prefs.flag("ghost", true) }
|
||||
val lefty = remember { Prefs.flag("lefty", false) }
|
||||
val bigButtons = remember { Prefs.flag("bigButtons", false) }
|
||||
var now by remember { mutableLongStateOf(nowMs()) }
|
||||
|
||||
// 프레임 루프: 카운트다운이 끝나야 내 게임이 움직인다. 보드 스냅샷은 0.3초마다.
|
||||
LaunchedEffect(game) {
|
||||
var last = 0L
|
||||
var lastPush = 0L
|
||||
while (true) {
|
||||
withFrameNanos { t ->
|
||||
now = nowMs()
|
||||
val g = game
|
||||
if (g != null && now >= client.roundStartsAt && !g.finished) {
|
||||
if (last != 0L) g.tick(((t - last) / 1_000_000L).coerceAtMost(100L))
|
||||
last = t
|
||||
if (now - lastPush >= 300) {
|
||||
lastPush = now
|
||||
client.pushBoard()
|
||||
}
|
||||
} else {
|
||||
last = 0L
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column(Modifier.fillMaxSize().background(Palette.Ink)) {
|
||||
// 상단: 라운드·스코어·나가기
|
||||
Row(Modifier.fillMaxWidth().padding(horizontal = (12 * s).dp, vertical = (6 * s).dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Column(Modifier.weight(1f)) {
|
||||
Mono(
|
||||
(if (client.kind == "league") S.league else S.custom) + " · ROUND ${client.round}" +
|
||||
(if (client.rules.ft > 0) " · FT${client.rules.ft}" else ""),
|
||||
color = Palette.DSub, size = (11 * s).sp,
|
||||
)
|
||||
val myWins = client.players.firstOrNull { it.id == client.me }?.wins ?: 0
|
||||
Mono(S.myWinsAlive(myWins, client.players.count { it.inRound && it.alive }, client.players.count { it.inRound }), color = Palette.Bone, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
ConnBadge(client, s)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
HoldButton(
|
||||
modifier = Modifier.size(width = (54 * s).dp, height = (34 * s).dp),
|
||||
background = Palette.DPanel, borderColor = Palette.Bone, onTap = onExit,
|
||||
) { Mono(if (client.kind == "league") S.forfeit else S.exit, color = Palette.Bone, size = (10 * s).sp) }
|
||||
}
|
||||
|
||||
OpponentStrip(client, s, if (client.opponents.size <= 1) (if (game == null) 260 else 110) else 92)
|
||||
|
||||
// 피드
|
||||
Box(Modifier.fillMaxWidth().height((18 * s).dp)) {
|
||||
client.koFeed.firstOrNull()?.let {
|
||||
Mono(it, Modifier.fillMaxWidth(), color = Palette.Safety, size = (12 * s).sp, weight = FontWeight.Bold, align = TextAlign.Center)
|
||||
}
|
||||
}
|
||||
|
||||
if (game != null) {
|
||||
Box(Modifier.weight(1f).fillMaxWidth()) {
|
||||
if (l.isLandscape) {
|
||||
Row(Modifier.fillMaxSize()) {
|
||||
ControlColumn(game, left = !lefty, scale = s * if (bigButtons) 1.2f else 1f, modifier = Modifier.weight(1f).fillMaxHeight())
|
||||
Box(Modifier.weight(1.6f).fillMaxHeight(), contentAlignment = Alignment.Center) {
|
||||
BoardWithPanels(game, ghostOn, l, stacked = false, gauge = { client.pending })
|
||||
}
|
||||
ControlColumn(game, left = lefty, scale = s * if (bigButtons) 1.2f else 1f, modifier = Modifier.weight(1f).fillMaxHeight())
|
||||
}
|
||||
} else {
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
|
||||
BoardWithPanels(game, ghostOn, l, stacked = true, gauge = { client.pending })
|
||||
}
|
||||
ControlPad(game, lefty = lefty, scale = s * if (bigButtons) 1.15f else 1f, compactHeight = true)
|
||||
}
|
||||
}
|
||||
Overlays(client, game, now, s)
|
||||
}
|
||||
} else {
|
||||
Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp(S.spectating, color = Palette.Bone, size = (22 * s).sp)
|
||||
Mono(S.joinNextRound, color = Palette.DSub, size = (12 * s).sp)
|
||||
client.roundBanner?.let { Spacer(Modifier.height(8.dp)); Mono(it, color = Palette.Safety, size = (14 * s).sp, weight = FontWeight.Bold) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Overlays(client: RoomClient, game: GameState, now: Long, s: Float) {
|
||||
val text: String?
|
||||
val sub: String?
|
||||
when {
|
||||
now < client.roundStartsAt -> {
|
||||
text = "${((client.roundStartsAt - now) / 1000 + 1)}"
|
||||
sub = "ROUND ${client.round}"
|
||||
}
|
||||
client.roundBanner != null -> {
|
||||
text = client.roundBanner
|
||||
sub = S.nextRoundPrep
|
||||
}
|
||||
game.finished -> {
|
||||
text = "KO"
|
||||
sub = S.spectatingSub
|
||||
}
|
||||
else -> {
|
||||
text = null
|
||||
sub = null
|
||||
}
|
||||
}
|
||||
if (text != null) {
|
||||
Box(Modifier.fillMaxSize().background(Color(0x9917161B)), contentAlignment = Alignment.Center) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Disp(text, color = Palette.Safety, size = ((if (text.length <= 2) 64 else 26) * s).sp)
|
||||
sub?.let { Mono(it, color = Palette.Bone, size = (12 * s).sp, align = TextAlign.Center, maxLines = 2) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 상대 보드들. 1:1 은 크게 하나, FFA 는 가로 스크롤 미니보드 — 탭하면 타겟 지정. */
|
||||
@Composable
|
||||
private fun OpponentStrip(client: RoomClient, s: Float, heightDp: Int) {
|
||||
val opps = client.players.filter { it.id != client.me && (it.inRound || client.game == null) }
|
||||
if (opps.isEmpty()) return
|
||||
val h = (heightDp * s).dp
|
||||
Row(
|
||||
Modifier.fillMaxWidth().height(h + (16 * s).dp).horizontalScroll(rememberScrollState()).padding(horizontal = (10 * s).dp),
|
||||
horizontalArrangement = Arrangement.spacedBy((8 * s).dp, Alignment.CenterHorizontally),
|
||||
) {
|
||||
for (p in opps) {
|
||||
val targeted = client.targeting == p.id
|
||||
Column(
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
modifier = if (opps.size > 1 && p.alive) Modifier.then(
|
||||
Modifier.androidxClick { client.target(p.id) }
|
||||
) else Modifier,
|
||||
) {
|
||||
MiniBoard(client.boards[p.id], h / 2.1f * 1f, h, dead = p.inRound && !p.alive, targeted = targeted && opps.size > 1)
|
||||
Mono(
|
||||
(if (targeted && opps.size > 1) "▶ " else "") + p.nick.take(8) + if (p.wins > 0) " ${p.wins}" else "",
|
||||
color = if (targeted) Palette.Safety else Palette.DSub, size = (10 * s).sp,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun Modifier.androidxClick(onTap: () -> Unit): Modifier =
|
||||
this.pointerInput(onTap) { detectTapGestures { onTap() } }
|
||||
|
||||
@Composable
|
||||
private fun MiniBoard(grid: String?, w: Dp, h: Dp, dead: Boolean, targeted: Boolean) {
|
||||
Canvas(
|
||||
Modifier.size(w, h).background(Palette.Dwell)
|
||||
.border(if (targeted) 2.dp else 1.dp, if (targeted) Palette.Safety else Palette.DGrid),
|
||||
) {
|
||||
val cw = size.width / Config.BOARD_W
|
||||
val ch = size.height / Config.VISIBLE_H
|
||||
if (grid != null) {
|
||||
for (r in 0 until Config.VISIBLE_H) for (c in 0 until Config.BOARD_W) {
|
||||
val v = grid.getOrNull(r * Config.BOARD_W + c) ?: '.'
|
||||
if (v != '.') drawRect(pieceColor(v), topLeft = Offset(c * cw, r * ch), size = Size(cw - 0.5f, ch - 0.5f))
|
||||
}
|
||||
}
|
||||
if (dead) drawRect(Color(0xAA17161B))
|
||||
}
|
||||
}
|
||||
|
||||
// ── 결과 (⑥ 리그 / ⑨ 일반전) ────────────────────────────────────
|
||||
@Composable
|
||||
private fun MatchResultView(client: RoomClient, onExit: () -> Unit, onRequeue: () -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
val m = client.matchEnd ?: return
|
||||
val won = m.winner == client.me
|
||||
Column(
|
||||
Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding((20 * s).dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
Mono(if (client.kind == "league") S.leagueResult else S.casualResult, color = Palette.Sub, size = (13 * s).sp)
|
||||
Disp(if (won) S.win else if (m.winner == null) S.ended else S.lose, color = if (won) Palette.Safety else Palette.Ink, size = (36 * s).sp)
|
||||
Spacer(Modifier.height(10.dp))
|
||||
Box(Modifier.widthIn(max = 560.dp).fillMaxWidth()) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding((16 * s).dp)) {
|
||||
if (client.kind == "league") {
|
||||
val opp = m.score.keys.firstOrNull { it != client.me }
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Mono("vs ${client.nick(opp)}", Modifier.weight(1f), size = (14 * s).sp)
|
||||
Disp("${m.score[client.me] ?: 0} : ${m.score[opp] ?: 0}", size = (24 * s).sp)
|
||||
}
|
||||
Spacer(Modifier.height(8.dp))
|
||||
val d = m.trDelta
|
||||
if (m.placementAfter != null && m.trAfter == null) {
|
||||
Mono(S.placementReveal(m.placementAfter), size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
} else if (d != null) {
|
||||
Mono("TR ${m.trAfter} (${if (d >= 0) "+$d" else "$d"})" + (m.rankAfter?.let { " · $it" } ?: ""), size = (15 * s).sp, weight = FontWeight.Bold)
|
||||
} else {
|
||||
Mono(S.ratingError, color = Palette.Safety, size = (12 * s).sp, maxLines = 2)
|
||||
}
|
||||
} else {
|
||||
for (st in m.standings) {
|
||||
Row(Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
|
||||
Mono("${st.rank}", Modifier.width((28 * s).dp), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Mono(st.nick + if (st.id == client.me) S.meSuffix else "", Modifier.weight(1f), size = (14 * s).sp)
|
||||
Mono(S.wins(st.wins), size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((10 * s).dp))
|
||||
NeoButton(S.shareResult, s, Modifier.widthIn(max = 560.dp).fillMaxWidth()) {
|
||||
val rows = if (client.kind == "league") {
|
||||
val opp = m.score.keys.firstOrNull { it != client.me }
|
||||
listOfNotNull(
|
||||
S.opponent to client.nick(opp),
|
||||
S.scoreLabel to "${m.score[client.me] ?: 0} : ${m.score[opp] ?: 0}",
|
||||
m.trAfter?.let { tr -> "TR" to "$tr" + (m.trDelta?.let { d -> if (d >= 0) " (+$d)" else " ($d)" } ?: "") },
|
||||
m.rankAfter?.let { S.rank to it },
|
||||
)
|
||||
} else {
|
||||
val mine = m.standings.firstOrNull { it.id == client.me }
|
||||
listOfNotNull(
|
||||
S.standing to (mine?.let { S.placeOf(it.rank, m.standings.size) } ?: "-"),
|
||||
S.roundWins to S.wins(mine?.wins ?: 0),
|
||||
)
|
||||
}
|
||||
shareCard(
|
||||
ShareCard(
|
||||
mode = if (client.kind == "league") S.league else S.customBrawl,
|
||||
headline = if (won) S.win else if (m.winner == null) S.ended else S.lose,
|
||||
rows = rows,
|
||||
nickname = Session.user?.nickname,
|
||||
),
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
// 앱 버튼은 광고 카드에 붙이지 않는다 (실수 클릭 방지 정책): 30분 끄기는 광고 위에 둔다.
|
||||
AdFreeOffer(s, Modifier.widthIn(max = 560.dp).fillMaxWidth().padding(bottom = (14 * s).dp))
|
||||
AdCard()
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
Column(Modifier.widthIn(max = 560.dp).fillMaxWidth()) {
|
||||
if (client.kind == "league") {
|
||||
NeoButton(S.requeue, s, Modifier.fillMaxWidth(), accent = true) { maybeInterstitial(onRequeue) }
|
||||
} else {
|
||||
val voted = client.rematchVotes.contains(client.me)
|
||||
NeoButton(
|
||||
(if (voted) S.rematchCancel else S.rematchVote) + " (${client.rematchVotes.size}/${client.rematchNeeded})",
|
||||
s, Modifier.fillMaxWidth(), accent = !voted,
|
||||
) { client.rematch(!voted) }
|
||||
}
|
||||
Spacer(Modifier.height(10.dp))
|
||||
NeoButton(S.home, s, Modifier.fillMaxWidth()) { maybeInterstitial(onExit) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,279 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import kr.tkrmagid.tetrig.i18n.S
|
||||
import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.produceState
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.geometry.Size
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import kr.tkrmagid.tetrig.ads.rewardedAvailable
|
||||
import kr.tkrmagid.tetrig.ads.showRewarded
|
||||
import kr.tkrmagid.tetrig.net.Session
|
||||
import kr.tkrmagid.tetrig.net.nowMs
|
||||
import kr.tkrmagid.tetrig.shop.BlockSkin
|
||||
import kr.tkrmagid.tetrig.shop.BoardTheme
|
||||
import kr.tkrmagid.tetrig.shop.Catalog
|
||||
import kr.tkrmagid.tetrig.shop.Entitlements
|
||||
import kr.tkrmagid.tetrig.shop.Loadout
|
||||
import kr.tkrmagid.tetrig.shop.SeasonPass
|
||||
import kr.tkrmagid.tetrig.shop.Unlock
|
||||
|
||||
/** 배지 한 개 (프로필·로비·리더보드 공용). */
|
||||
@Composable
|
||||
fun UserBadge(id: String, s: Float) {
|
||||
Box(Modifier.background(Catalog.badgeColor(id)).padding(horizontal = (6 * s).dp, vertical = (2 * s).dp)) {
|
||||
Mono(Catalog.badgeName(id), color = Catalog.badgeText(id), size = (10 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* "광고 보고 30분간 전면 광고 끄기". 시청 조건과 보상을 버튼에 먼저 적어 두고(AdMob 정책),
|
||||
* 끝까지 봤을 때(onUserEarnedReward)만 적용한다.
|
||||
*/
|
||||
@Composable
|
||||
fun AdFreeOffer(s: Float, modifier: Modifier = Modifier) {
|
||||
val now by produceState(nowMs()) {
|
||||
while (true) {
|
||||
delay(15_000)
|
||||
value = nowMs()
|
||||
}
|
||||
}
|
||||
val until = Entitlements.adFreeUntil
|
||||
if (until > now) {
|
||||
val min = ((until - now + 59_999) / 60_000).coerceAtLeast(1)
|
||||
NeoPanel(modifier = modifier, background = Palette.Paper, shadow = false) {
|
||||
Mono(S.adFreeOn(min), Modifier.padding(horizontal = 12.dp, vertical = (10 * s).dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
return
|
||||
}
|
||||
val ready = rewardedAvailable()
|
||||
var watching by remember { mutableStateOf(false) }
|
||||
NeoPanel(modifier = modifier, shadow = false, onClick = if (ready && !watching) ({
|
||||
watching = true
|
||||
showRewarded { earned ->
|
||||
watching = false
|
||||
if (earned) Entitlements.grantAdFree()
|
||||
}
|
||||
}) else null) {
|
||||
Column(Modifier.padding(horizontal = 12.dp, vertical = (10 * s).dp)) {
|
||||
Mono(
|
||||
if (watching) S.adPlaying else if (ready) S.adFreeOffer else S.adFreeNotReady,
|
||||
size = (12 * s).sp, weight = FontWeight.Bold, color = if (ready) Palette.Ink else Palette.Sub,
|
||||
)
|
||||
Mono(S.adFreeDesc, color = Palette.Sub, size = (10 * s).sp, maxLines = 2)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ShopScreen(onTab: (Int) -> Unit) {
|
||||
val s = LocalLayout.current.uiScale
|
||||
LaunchedEffect(Unit) {
|
||||
Session.refresh()
|
||||
SeasonPass.load()
|
||||
}
|
||||
Column(Modifier.fillMaxSize()) {
|
||||
Column(Modifier.weight(1f).verticalScroll(rememberScrollState()).padding((20 * s).dp)) {
|
||||
TopBar(S.tabShop, s, null)
|
||||
Spacer(Modifier.height((14 * s).dp))
|
||||
Box(Modifier.widthIn(max = 720.dp)) {
|
||||
Column {
|
||||
PassSection(s)
|
||||
Spacer(Modifier.height((22 * s).dp))
|
||||
Section(S.blockSkins, s)
|
||||
Catalog.skins.chunked(2).forEach { row ->
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(bottom = 10.dp)) {
|
||||
row.forEach { SkinCard(it, s, Modifier.weight(1f)) }
|
||||
if (row.size == 1) Spacer(Modifier.weight(1f))
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((12 * s).dp))
|
||||
Section(S.boardThemes, s)
|
||||
Catalog.boards.chunked(2).forEach { row ->
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(bottom = 10.dp)) {
|
||||
row.forEach { BoardCard(it, s, Modifier.weight(1f)) }
|
||||
if (row.size == 1) Spacer(Modifier.weight(1f))
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height((12 * s).dp))
|
||||
BadgeSection(s)
|
||||
Spacer(Modifier.height((16 * s).dp))
|
||||
AdFreeOffer(s, Modifier.fillMaxWidth())
|
||||
}
|
||||
}
|
||||
}
|
||||
TabBar(selected = 3, scale = s, onSelect = onTab)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Section(title: String, s: Float, sub: String? = null) {
|
||||
Disp(title, size = (18 * s).sp)
|
||||
if (sub != null) Mono(sub, color = Palette.Sub, size = (11 * s).sp, maxLines = 3)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
}
|
||||
|
||||
private fun unlockLabel(u: Unlock): String = when (u) {
|
||||
Unlock.Free -> S.unlockFree
|
||||
Unlock.Rewarded -> S.unlockRewarded
|
||||
is Unlock.Pass -> S.unlockPass(u.level)
|
||||
}
|
||||
|
||||
/** 아이템 카드 아래 버튼: 장착 / 장착 중 / 해금 방법. */
|
||||
@Composable
|
||||
private fun ItemAction(item: String, unlock: Unlock, equipped: Boolean, s: Float, onEquip: () -> Unit) {
|
||||
val owned = Loadout.owns(item)
|
||||
when {
|
||||
equipped -> Mono(S.equipped, Modifier.fillMaxWidth().padding(vertical = 6.dp), color = Palette.Safety, size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
owned -> NeoButton(S.equip, s, Modifier.fillMaxWidth(), onClick = onEquip)
|
||||
unlock == Unlock.Rewarded -> {
|
||||
val ready = rewardedAvailable()
|
||||
NeoButton(if (ready) S.watchToUnlock else S.adNotReady, s, Modifier.fillMaxWidth(), enabled = ready) {
|
||||
showRewarded { earned -> if (earned) { Entitlements.grantLocalItem(item); onEquip() } }
|
||||
}
|
||||
}
|
||||
else -> Mono(unlockLabel(unlock), Modifier.fillMaxWidth().padding(vertical = 6.dp), color = Palette.Sub, size = (11 * s).sp, maxLines = 2)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SkinCard(skin: BlockSkin, s: Float, modifier: Modifier) {
|
||||
val equipped = Loadout.skin.id == skin.id
|
||||
NeoPanel(modifier = modifier, shadow = equipped) {
|
||||
Column(Modifier.padding((10 * s).dp)) {
|
||||
val bg = Loadout.board.bg
|
||||
Row(
|
||||
Modifier.fillMaxWidth().height((44 * s).dp).background(bg).padding(4.dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(2.dp),
|
||||
) {
|
||||
for (t in listOf('T', 'I', 'S', 'L')) {
|
||||
Box(Modifier.weight(1f).fillMaxHeight()) { MiniPieceCanvas(t, skin, bg) }
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(skin.name, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
ItemAction(skin.item, skin.unlock, equipped, s) { Loadout.equipSkin(skin.id) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun BoardCard(theme: BoardTheme, s: Float, modifier: Modifier) {
|
||||
val equipped = Loadout.board.id == theme.id
|
||||
NeoPanel(modifier = modifier, shadow = equipped) {
|
||||
Column(Modifier.padding((10 * s).dp)) {
|
||||
val skin = Loadout.skin
|
||||
Canvas(Modifier.fillMaxWidth().height((44 * s).dp)) {
|
||||
drawRect(theme.bg)
|
||||
val c = size.height / 4
|
||||
theme.grid?.let { g ->
|
||||
var x = 0f
|
||||
while (x <= size.width) { drawLine(g, Offset(x, 0f), Offset(x, size.height), 1f); x += c }
|
||||
for (i in 0..4) drawLine(g, Offset(0f, i * c), Offset(size.width, i * c), 1f)
|
||||
}
|
||||
val cells = listOf(0 to 3, 1 to 3, 2 to 3, 1 to 2, 5 to 3, 6 to 3, 6 to 2, 6 to 1)
|
||||
cells.forEachIndexed { i, (x, y) ->
|
||||
skinBlock(skin, if (i < 4) 'T' else 'L', Offset(x * c + 1f, y * c + 1f), Size(c - 2f, c - 2f), theme.bg)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Mono(theme.name, size = (13 * s).sp, weight = FontWeight.Bold)
|
||||
ItemAction(theme.item, theme.unlock, equipped, s) { Loadout.equipBoard(theme.id) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun BadgeSection(s: Float) {
|
||||
val scope = rememberCoroutineScope()
|
||||
var msg by remember { mutableStateOf<String?>(null) }
|
||||
val owned = Loadout.serverItems.keys.filter { it.startsWith("badge:") }.map { it.removePrefix("badge:") }.sorted()
|
||||
val current = Session.user?.badge
|
||||
Section(S.badges, s, S.badgesDesc)
|
||||
if (owned.isEmpty()) {
|
||||
Mono(S.noBadges, color = Palette.Sub, size = (12 * s).sp)
|
||||
}
|
||||
for (id in owned) {
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), shadow = false) {
|
||||
Row(Modifier.padding(horizontal = 12.dp, vertical = 8.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
UserBadge(id, s)
|
||||
Spacer(Modifier.weight(1f))
|
||||
val on = current == id
|
||||
NeoPanel(shadow = false, background = if (on) Palette.Safety else Palette.Bone, onClick = {
|
||||
scope.launch { msg = Session.equipBadge(if (on) null else id) }
|
||||
}) {
|
||||
Mono(if (on) S.equippedUnequip else S.equip, Modifier.padding(horizontal = 10.dp, vertical = 5.dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
msg?.let { Mono(it, color = Palette.Safety, size = (12 * s).sp, maxLines = 2) }
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PassSection(s: Float) {
|
||||
val p = SeasonPass.state
|
||||
Section(S.seasonPass, s, S.seasonPassDesc)
|
||||
if (p == null) {
|
||||
Mono(SeasonPass.error ?: S.loading, color = Palette.Sub, size = (12 * s).sp, maxLines = 2)
|
||||
return
|
||||
}
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(Modifier.padding((14 * s).dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
val days = if (p.endsAt > 0) ((p.endsAt - nowMs()) / 86_400_000L).coerceAtLeast(0) else null
|
||||
Disp("SEASON ${p.season}", size = (18 * s).sp)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
days?.let { Mono("D-$it", color = Palette.Sub, size = (12 * s).sp) }
|
||||
}
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Mono("Lv ${p.level} / ${p.maxLevel}" + if (p.level < p.maxLevel) " · ${p.xpInLevel}/${p.xpPerLevel} XP" else " · " + S.passComplete, size = (14 * s).sp, weight = FontWeight.Bold)
|
||||
Spacer(Modifier.height(6.dp))
|
||||
val frac = (p.xpInLevel.toFloat() / p.xpPerLevel).coerceIn(0f, 1f)
|
||||
Box(Modifier.fillMaxWidth().height((10 * s).dp).background(Palette.Paper)) {
|
||||
Box(Modifier.fillMaxWidth(frac).fillMaxHeight().background(Palette.Cobalt))
|
||||
}
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(10.dp))
|
||||
for (t in p.tiers) {
|
||||
val reached = p.level >= t.level
|
||||
NeoPanel(modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), background = if (reached) Palette.Paper else Palette.Bone, shadow = false) {
|
||||
Row(Modifier.padding(horizontal = 10.dp, vertical = 8.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Mono("Lv ${t.level}", Modifier.width((50 * s).dp), size = (12 * s).sp, weight = FontWeight.Bold)
|
||||
Mono(Catalog.itemName(t.free), Modifier.weight(1f), size = (11 * s).sp, maxLines = 2)
|
||||
Mono(if (reached) S.obtained else "", color = Palette.Safety, size = (11 * s).sp, weight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
Mono(S.passFooter, color = Palette.Sub, size = (11 * s).sp, maxLines = 3)
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package kr.tkrmagid.tetrig.ui
|
||||
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.geometry.Size
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.Path
|
||||
import androidx.compose.ui.graphics.drawscope.DrawScope
|
||||
import androidx.compose.ui.graphics.drawscope.Stroke
|
||||
import kr.tkrmagid.tetrig.shop.BlockSkin
|
||||
import kr.tkrmagid.tetrig.shop.BlockStyle
|
||||
|
||||
/**
|
||||
* 스킨 규칙대로 블록 한 칸을 그린다. 모두 플랫 도형만 쓴다 (그라디언트·블러 없음).
|
||||
* - Solid: 꽉 찬 사각형 (기본)
|
||||
* - Inset: 채움 + 안쪽 잉크 테두리
|
||||
* - Outline: 색 테두리만
|
||||
* - Chamfer: 우하단 모서리를 잘라 낸 블록 (네오브루탈 시그니처 컷)
|
||||
* - Plate: 채움 + 잉크 테두리 + 본(BONE) 챔퍼 (서포터 전용)
|
||||
*/
|
||||
fun DrawScope.skinBlock(skin: BlockSkin, type: Char, topLeft: Offset, cell: Size, bg: Color) {
|
||||
val color = skin.color(type)
|
||||
val w = cell.width
|
||||
val h = cell.height
|
||||
val k = minOf(w, h)
|
||||
when (skin.style) {
|
||||
BlockStyle.Solid -> drawRect(color, topLeft, cell)
|
||||
BlockStyle.Inset -> {
|
||||
drawRect(color, topLeft, cell)
|
||||
val t = (k * 0.14f).coerceAtLeast(1f)
|
||||
drawRect(Palette.Ink, Offset(topLeft.x + t / 2, topLeft.y + t / 2), Size(w - t, h - t), style = Stroke(t))
|
||||
}
|
||||
BlockStyle.Outline -> {
|
||||
val t = (k * 0.18f).coerceAtLeast(1.5f)
|
||||
drawRect(color, Offset(topLeft.x + t / 2, topLeft.y + t / 2), Size(w - t, h - t), style = Stroke(t))
|
||||
}
|
||||
BlockStyle.Chamfer -> {
|
||||
drawRect(color, topLeft, cell)
|
||||
drawPath(corner(topLeft, w, h, k * 0.38f), bg)
|
||||
}
|
||||
BlockStyle.Plate -> {
|
||||
drawRect(color, topLeft, cell)
|
||||
val t = (k * 0.12f).coerceAtLeast(1f)
|
||||
drawRect(Palette.Ink, Offset(topLeft.x + t / 2, topLeft.y + t / 2), Size(w - t, h - t), style = Stroke(t))
|
||||
drawPath(corner(topLeft, w, h, k * 0.34f), Palette.Bone)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun corner(tl: Offset, w: Float, h: Float, c: Float) = Path().apply {
|
||||
moveTo(tl.x + w, tl.y + h - c)
|
||||
lineTo(tl.x + w, tl.y + h)
|
||||
lineTo(tl.x + w - c, tl.y + h)
|
||||
close()
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package kr.tkrmagid.tetrig.engine
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class VersusTest {
|
||||
private fun r(lines: Int, tspin: String = "none", ac: Boolean = false, combo: Int = 0, b2b: Int = 0, diff: Boolean = false) =
|
||||
LockResult('T', lines, tspin, ac, combo, b2b, diff)
|
||||
|
||||
@Test
|
||||
fun attackTableMatchesServer() {
|
||||
// server/test/rules.test.js 와 같은 케이스
|
||||
assertEquals(0, attackFor(r(1)))
|
||||
assertEquals(1, attackFor(r(2)))
|
||||
assertEquals(2, attackFor(r(3)))
|
||||
assertEquals(4, attackFor(r(4, diff = true, b2b = 0)))
|
||||
assertEquals(5, attackFor(r(4, diff = true, b2b = 1)))
|
||||
assertEquals(1, attackFor(r(1, "mini")))
|
||||
assertEquals(0, attackFor(r(0, "mini")))
|
||||
assertEquals(4, attackFor(r(2, "tspin", diff = true)))
|
||||
assertEquals(6, attackFor(r(3, "tspin", diff = true)))
|
||||
assertEquals(1, attackFor(r(1, combo = 1)))
|
||||
assertEquals(5, attackFor(r(1, combo = 20)))
|
||||
assertEquals(9, attackFor(r(4, ac = true)))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun counterCancelsPendingFirst() {
|
||||
val q = GarbageQueue(makeRng(7))
|
||||
q.add(3); q.add(2)
|
||||
assertEquals(0, q.counter(4)) // 4줄 공격 → 대기 5줄 중 4줄 상쇄, 전송 0
|
||||
assertEquals(1, q.total)
|
||||
assertEquals(3, q.counter(4)) // 남은 1줄 상쇄 후 3줄 전송
|
||||
assertEquals(0, q.total)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun takeCapsAtEightLines() {
|
||||
val q = GarbageQueue(makeRng(7))
|
||||
q.add(6); q.add(5)
|
||||
val first = q.take()
|
||||
assertEquals(8, first.sumOf { it.first })
|
||||
assertEquals(3, q.total)
|
||||
assertTrue(first.all { it.second in 0 until Config.BOARD_W })
|
||||
}
|
||||
|
||||
@Test
|
||||
fun insertGarbagePushesBoardUpWithHole() {
|
||||
val g = TetrigGame(1)
|
||||
g.board[0][0] = 'I'
|
||||
g.insertGarbage(2, 4)
|
||||
assertEquals('I', g.board[2][0])
|
||||
for (y in 0..1) for (x in 0 until Config.BOARD_W) assertEquals(if (x == 4) null else 'G', g.board[y][x])
|
||||
assertFalse(g.over)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun garbageInsertedBeforeSpawnCanTopOut() {
|
||||
val g = TetrigGame(1)
|
||||
// 거의 꽉 찬 탑을 만들고 가비지를 크게 밀어 넣으면 톱아웃
|
||||
for (y in 0 until 20) for (x in 0 until Config.BOARD_W) if (x != y % Config.BOARD_W) g.board[y][x] = 'G'
|
||||
g.hardDrop { g.insertGarbage(20, 0) }
|
||||
assertTrue(g.over)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun boardRoundTrip() {
|
||||
val g = TetrigGame(3)
|
||||
g.board[0][3] = 'Z'
|
||||
val s = encodeBoard(g.board)
|
||||
assertEquals(200, s.length)
|
||||
assertEquals('Z', decodeBoard(s)[19][3])
|
||||
repeat(5) { g.softDrop() } // 스폰 위치는 일부가 숨김 버퍼(y≥20)라 조금 내린다
|
||||
val withActive = encodeBoard(g.board, g.active)
|
||||
assertTrue(withActive.count { it != '.' } == 5)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,138 @@
|
||||
package kr.tkrmagid.tetrig.game
|
||||
|
||||
import kr.tkrmagid.tetrig.ads.interstitialDue
|
||||
import kr.tkrmagid.tetrig.i18n.I18n
|
||||
import kr.tkrmagid.tetrig.share.DeepLink
|
||||
import kr.tkrmagid.tetrig.shop.Catalog
|
||||
import kr.tkrmagid.tetrig.shop.Unlock
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertNull
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class MonetizationTest {
|
||||
|
||||
/** 세션마다 perSession 판씩 할 때 전면 광고가 뜨는 누적 판 번호 (앱을 껐다 켜도 이어 센다). */
|
||||
private fun adGames(perSession: Int, sessions: Int): List<Int> {
|
||||
var total = 0
|
||||
var last = 0
|
||||
val shown = mutableListOf<Int>()
|
||||
repeat(sessions) {
|
||||
var session = 0
|
||||
repeat(perSession) {
|
||||
total++
|
||||
session++
|
||||
if (interstitialDue(total, last, session)) {
|
||||
shown += total
|
||||
last = total
|
||||
}
|
||||
}
|
||||
}
|
||||
return shown
|
||||
}
|
||||
|
||||
@Test
|
||||
fun twoPerSessionGetsAdEveryFourthGame() {
|
||||
assertEquals(listOf(4, 8, 12), adGames(perSession = 2, sessions = 6))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun threePerSessionKeepsEveryThirdGame() {
|
||||
assertEquals(listOf(3, 6, 9, 12), adGames(perSession = 3, sessions = 4))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun oneGameSessionsNeverShow() {
|
||||
assertEquals(emptyList(), adGames(perSession = 1, sessions = 10))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun longSessionEveryThird() {
|
||||
assertEquals(listOf(3, 6, 9), adGames(perSession = 10, sessions = 1))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sameGameNotShownTwice() {
|
||||
// 결과 화면에서 버튼을 두 번 눌러도(markShown 후) 다시 뜨지 않는다.
|
||||
assertTrue(interstitialDue(total = 3, lastShownAt = 0, session = 3))
|
||||
assertFalse(interstitialDue(total = 3, lastShownAt = 3, session = 3))
|
||||
}
|
||||
|
||||
private fun topOut(state: GameState) {
|
||||
var n = 0
|
||||
while (!state.finished && !state.awaitingContinue && n++ < 500) state.hardDrop()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun timeAttackContinueOnceAndMarksRun() {
|
||||
val s = GameState(Mode.TimeAttack, 7)
|
||||
s.canOfferContinue = { true }
|
||||
topOut(s)
|
||||
assertTrue(s.awaitingContinue)
|
||||
assertFalse(s.finished)
|
||||
val scoreBefore = s.score
|
||||
val elapsedBefore = s.elapsedMs
|
||||
s.tick(5_000) // 선택을 기다리는 동안 시간은 멈춘다
|
||||
assertEquals(elapsedBefore, s.elapsedMs)
|
||||
|
||||
s.acceptContinue()
|
||||
assertTrue(s.continued)
|
||||
assertFalse(s.awaitingContinue)
|
||||
assertFalse(s.game.over)
|
||||
assertEquals(scoreBefore, s.score)
|
||||
|
||||
// 두 번째 톱아웃은 묻지 않고 끝난다 (1판 1회).
|
||||
topOut(s)
|
||||
assertTrue(s.finished)
|
||||
assertFalse(s.awaitingContinue)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun timeAttackWithoutAdFinishesImmediately() {
|
||||
val s = GameState(Mode.TimeAttack, 7)
|
||||
s.canOfferContinue = { false }
|
||||
topOut(s)
|
||||
assertTrue(s.finished)
|
||||
assertFalse(s.continued)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun declineContinueFinishes() {
|
||||
val s = GameState(Mode.TimeAttack, 3)
|
||||
s.canOfferContinue = { true }
|
||||
topOut(s)
|
||||
s.declineContinue()
|
||||
assertTrue(s.finished)
|
||||
assertFalse(s.continued)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sprintNeverOffersContinue() {
|
||||
val s = GameState(Mode.Sprint, 5)
|
||||
s.canOfferContinue = { true }
|
||||
topOut(s)
|
||||
assertTrue(s.finished)
|
||||
assertFalse(s.awaitingContinue)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun inviteLinkParsing() {
|
||||
assertEquals("ABC234", DeepLink.roomFromPath("/r/ABC234"))
|
||||
assertEquals("ABC234", DeepLink.roomFromPath("/r/abc234/"))
|
||||
assertNull(DeepLink.roomFromPath("/r/ABC"))
|
||||
assertNull(DeepLink.roomFromPath("/privacy"))
|
||||
assertNull(DeepLink.roomFromPath(null))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun catalogIdsUniqueAndDefaultsFree() {
|
||||
assertEquals(Catalog.skins.size, Catalog.skins.map { it.id }.toSet().size)
|
||||
assertEquals(Catalog.boards.size, Catalog.boards.map { it.id }.toSet().size)
|
||||
assertEquals(Unlock.Free, Catalog.defaultSkin.unlock)
|
||||
assertEquals(Unlock.Free, Catalog.defaultBoard.unlock)
|
||||
I18n.select("ko")
|
||||
assertEquals("S3 엘리트", Catalog.badgeName("s3_elite"))
|
||||
assertEquals("SUPPORTER", Catalog.badgeName("supporter"))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package kr.tkrmagid.tetrig.i18n
|
||||
|
||||
import kotlin.test.AfterTest
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertSame
|
||||
|
||||
class I18nTest {
|
||||
@AfterTest
|
||||
fun reset() = I18n.select("ko")
|
||||
|
||||
@Test
|
||||
fun deviceLanguagePicksStrings() {
|
||||
assertSame(Ko, I18n.pick("ko", "", "KR"))
|
||||
assertSame(Ja, I18n.pick("ja"))
|
||||
assertSame(ZhHans, I18n.pick("zh", "", "CN"))
|
||||
assertSame(ZhHans, I18n.pick("zh", "Hans", ""))
|
||||
assertSame(ZhHant, I18n.pick("zh", "Hant", ""))
|
||||
assertSame(ZhHant, I18n.pick("zh", "", "TW"))
|
||||
assertSame(ZhHant, I18n.pick("zh", "", "HK"))
|
||||
assertSame(Pt, I18n.pick("pt", "", "BR"))
|
||||
assertSame(Id, I18n.pick("in", "", "ID"))
|
||||
assertSame(Id, I18n.pick("id"))
|
||||
assertSame(En, I18n.pick("en", "", "US"))
|
||||
assertSame(En, I18n.pick("ar", "", "SA")) // 지원 안 하는 언어는 영어
|
||||
assertSame(En, I18n.pick(""))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun serverKoreanErrorsAreTranslated() {
|
||||
I18n.select("en")
|
||||
assertEquals(En.srvWrongLogin, I18n.server("이메일 또는 비밀번호가 맞지 않습니다", 401))
|
||||
assertEquals(En.srvNickCooldown(12), I18n.server("닉네임은 30일에 한 번 바꿀 수 있습니다 (12일 남음)", 429))
|
||||
assertEquals(En.srvNeedTwo, I18n.server("2명 이상 있어야 시작할 수 있습니다"))
|
||||
// 모르는 한국어 문구는 다른 언어 화면에 그대로 내보내지 않는다
|
||||
assertEquals(En.errorCode(503), I18n.server("결제 확인 서버가 아직 준비되지 않았습니다", 503))
|
||||
assertEquals(En.error, I18n.server("처음 보는 문구"))
|
||||
|
||||
I18n.select("ja")
|
||||
assertEquals(Ja.srvNoRoom, I18n.server("없는 방입니다", 404))
|
||||
|
||||
I18n.select("ko")
|
||||
assertEquals("처음 보는 문구", I18n.server("처음 보는 문구"))
|
||||
assertEquals("닉네임은 30일에 한 번 바꿀 수 있습니다 (3일 남음)", I18n.server("닉네임은 30일에 한 번 바꿀 수 있습니다 (3일 남음)", 429))
|
||||
}
|
||||
}
|
||||
@@ -10,5 +10,17 @@ kotlin.code.style=official
|
||||
kotlin.daemon.jvmargs=-Xmx2g
|
||||
|
||||
# 버전은 CI/로컬에서 -PappVersionName -PappVersionCode 로 덮어쓸 수 있다.
|
||||
appVersionName=2.0.3
|
||||
appVersionCode=5
|
||||
appVersionName=2.3.0
|
||||
appVersionCode=10
|
||||
|
||||
# AdMob — 비워 두면 Google 공식 테스트 광고 ID 를 쓴다. 실제 ID 를 받으면 여기만 채운다.
|
||||
# admobAppId=ca-app-pub-XXXXXXXXXXXXXXXX~YYYYYYYYYY
|
||||
# admobBanner=ca-app-pub-XXXXXXXXXXXXXXXX/ZZZZZZZZZZ (메인·로비 하단 적응형 배너)
|
||||
# admobCard=ca-app-pub-XXXXXXXXXXXXXXXX/ZZZZZZZZZZ (결과 화면 300×250)
|
||||
# admobInterstitial=ca-app-pub-XXXXXXXXXXXXXXXX/ZZZZZZZZZZ (전면, 마지막 전면 뒤 3판 이상)
|
||||
# admobRewarded=ca-app-pub-XXXXXXXXXXXXXXXX/ZZZZZZZZZZ (보상형: 30분 끄기·이어하기·스킨 해금)
|
||||
admobAppId=ca-app-pub-5620940055268952~3764791006
|
||||
admobBanner=ca-app-pub-5620940055268952/3629059638
|
||||
admobCard=ca-app-pub-5620940055268952/9185647802
|
||||
admobInterstitial=ca-app-pub-5620940055268952/8689814623
|
||||
admobRewarded=ca-app-pub-5620940055268952/4818852372
|
||||
|
||||
@@ -4,10 +4,22 @@ kotlin = "2.2.20"
|
||||
compose = "1.10.3"
|
||||
androidx-activityCompose = "1.11.0"
|
||||
androidx-lifecycle = "2.9.4"
|
||||
kotlinx-serialization = "1.9.0"
|
||||
okhttp = "4.12.0"
|
||||
play-services-ads = "25.5.0"
|
||||
ump = "4.0.0"
|
||||
admob-applovin = "13.6.4.2"
|
||||
admob-pangle = "8.4.0.5.0"
|
||||
|
||||
[libraries]
|
||||
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
|
||||
androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
|
||||
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
|
||||
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
|
||||
play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "play-services-ads" }
|
||||
ump = { module = "com.google.android.ump:user-messaging-platform", version.ref = "ump" }
|
||||
admob-applovin = { module = "com.google.ads.mediation:applovin", version.ref = "admob-applovin" }
|
||||
admob-pangle = { module = "com.google.ads.mediation:pangle", version.ref = "admob-pangle" }
|
||||
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
||||
|
||||
[plugins]
|
||||
|
||||
@@ -24,6 +24,10 @@ dependencyResolutionManagement {
|
||||
}
|
||||
}
|
||||
mavenCentral()
|
||||
// Pangle SDK (AdMob 미디에이션 어댑터가 의존)
|
||||
maven("https://artifact.bytedance.com/repository/pangle") {
|
||||
mavenContent { includeGroupAndSubgroups("com.pangle") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
15
scripts/build-pages.sh
Executable file
15
scripts/build-pages.sh
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# Cloudflare Pages 배포본(dist/) 조립: PWA + 개인정보처리방침 + 초대 링크 안내 페이지 + 앱 링크 검증 파일 + app-ads.txt.
|
||||
# scripts/build-pages.sh && npx wrangler pages deploy dist --project-name tetrig --branch main
|
||||
set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
node build.js
|
||||
rm -rf dist && mkdir -p dist/r dist/.well-known
|
||||
cp index.html sw.js manifest.webmanifest icon-192.png icon-512.png apple-touch-icon.png dist/
|
||||
cp store/privacy.html dist/privacy.html
|
||||
cp store/room.html dist/r/index.html
|
||||
cp store/_redirects dist/_redirects
|
||||
cp store/app-ads.txt dist/app-ads.txt
|
||||
cp .well-known/assetlinks.json dist/.well-known/assetlinks.json
|
||||
echo "dist/ 준비 완료"
|
||||
3
server/.gitignore
vendored
Normal file
3
server/.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
node_modules/
|
||||
.wrangler/
|
||||
.dev.vars
|
||||
61
server/README.md
Normal file
61
server/README.md
Normal file
@@ -0,0 +1,61 @@
|
||||
# TETRIG 서버 (Cloudflare Workers)
|
||||
|
||||
배포 주소: https://tetrig.tkrmagid.workers.dev
|
||||
|
||||
- `src/index.js` — REST API + WebSocket 라우팅 + Cron
|
||||
- `src/room-logic.js` — 경기방 상태 기계 (리그 1:1 · 커스텀 N인 공용, 순수 로직)
|
||||
- `src/room.js` — GameRoomDO (WebSocket Hibernation, 상태는 DO storage 에 저장)
|
||||
- `src/matchmaker.js` / `src/matchmaking.js` — 리그 대기열 (R ± 2×RD, 30초마다 ×1.2 확장)
|
||||
- `src/glicko.js` — Glicko-2, `src/rules.js` — 튜닝 상수 전부
|
||||
- `src/shop.js` — 시즌 패스(XP·레벨·보상 트랙)·꾸미기 아이템·배지·Play 구매 적용, `src/play.js` — Google Play 영수증 확인
|
||||
- `migrations/` — D1 스키마
|
||||
|
||||
## 개발
|
||||
|
||||
```bash
|
||||
npm install
|
||||
npm test # 단위 테스트
|
||||
printf 'TOKEN_SECRET=dev\n' > .dev.vars
|
||||
npx wrangler d1 migrations apply tetrig --local
|
||||
npx wrangler dev --local --port 8799
|
||||
node scripts/e2e.mjs http://127.0.0.1:8799 # 종단 테스트 (게스트·FFA·계정·리그)
|
||||
|
||||
# 시즌 패스·결제·배지 (가짜 영수증은 로컬 + PLAY_VERIFY_FAKE=1 일 때만 통과)
|
||||
npx wrangler dev --local --port 8799 --var PLAY_VERIFY_FAKE:1
|
||||
node scripts/e2e-shop.mjs http://127.0.0.1:8799
|
||||
```
|
||||
|
||||
## 배포
|
||||
|
||||
```bash
|
||||
export CLOUDFLARE_API_TOKEN=... CLOUDFLARE_ACCOUNT_ID=...
|
||||
npx wrangler d1 migrations apply tetrig --remote
|
||||
npx wrangler deploy
|
||||
```
|
||||
|
||||
비밀값 `TOKEN_SECRET` 은 `wrangler secret put` 으로만 넣는다 (재설정하면 기존 로그인 세션이 모두 끊김).
|
||||
Google 로그인은 `wrangler.toml` 의 `GOOGLE_CLIENT_IDS` 에 OAuth 클라이언트 ID 를 넣으면 켜진다.
|
||||
|
||||
Play 결제 확인은 `PLAY_SA_KEY`(서비스 계정 JSON 키 전체)를 `wrangler secret put PLAY_SA_KEY` 로 넣으면 켜진다.
|
||||
서비스 계정은 Google Cloud 에서 만들고, Play Console > 사용자 및 권한에 초대해 "재무 데이터 보기 / 주문 관리" 권한을 준다.
|
||||
없으면 `/api/purchase` 는 503, `/api/pass` 의 `purchasable` 은 false (앱이 시즌 패스 구매 버튼을 숨김).
|
||||
|
||||
## API 요약
|
||||
|
||||
| 경로 | 설명 |
|
||||
|---|---|
|
||||
| `POST /api/guest` | 게스트 발급 (랜덤 닉) → `{token, user}` |
|
||||
| `POST /api/register` | 이메일 가입. 게스트 토큰을 같이 보내면 그 계정을 승격(기록 유지) |
|
||||
| `POST /api/login` | 이메일 로그인. 게스트 토큰을 같이 보내면 기록 병합 |
|
||||
| `POST /api/google` | Google ID 토큰 로그인 |
|
||||
| `GET /api/me` | 프로필·리그 요약·솔로 베스트·최근 전적 |
|
||||
| `POST /api/nickname` · `GET /api/nickname/check?n=` | 닉 변경(30일 쿨다운) · 중복 검사 |
|
||||
| `POST /api/solo` | 솔로 베스트 제출 `{mode, value}` (+시즌 패스 XP). `{mode, xpOnly:true}` 는 기록 없이 XP 만 |
|
||||
| `GET /api/pass` | 시즌 패스: 시즌·XP·레벨·프리미엄 여부·보상 트랙 |
|
||||
| `POST /api/purchase` | Play 구매 적용 `{productId, purchaseToken}` → `{ok, consume, items}` |
|
||||
| `POST /api/badge` | 배지 장착 `{badge}` (null 이면 해제, 가진 배지만) |
|
||||
| `GET /api/leaderboard?board=league\|sprint\|time\|endless` | 상위 100 (계정만) |
|
||||
| `POST /api/rooms` · `GET /api/rooms/:code` | 커스텀 방 생성 · 조회 |
|
||||
| `WS /ws/room/:code` · `WS /ws/league/:id` · `WS /ws/queue` | 경기방 · 리그 경기 · 리그 대기열 (`?token=`) |
|
||||
|
||||
WebSocket 메시지 형식은 명세서 §14.3 + `src/room-logic.js` 의 `handle()` 참고.
|
||||
58
server/migrations/0001_init.sql
Normal file
58
server/migrations/0001_init.sql
Normal file
@@ -0,0 +1,58 @@
|
||||
-- TETRIG D1 스키마 (명세서 §14.2 기반)
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id TEXT PRIMARY KEY,
|
||||
nickname TEXT UNIQUE NOT NULL,
|
||||
is_guest INTEGER NOT NULL DEFAULT 1,
|
||||
email TEXT UNIQUE,
|
||||
google_sub TEXT UNIQUE,
|
||||
pw_hash TEXT,
|
||||
pw_salt TEXT,
|
||||
device_id TEXT,
|
||||
created_at INTEGER,
|
||||
nickname_changed_at INTEGER
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS ratings (
|
||||
user_id TEXT PRIMARY KEY REFERENCES users(id),
|
||||
season INTEGER NOT NULL,
|
||||
glicko REAL NOT NULL,
|
||||
rd REAL NOT NULL,
|
||||
vol REAL NOT NULL,
|
||||
tr INTEGER NOT NULL DEFAULT 0,
|
||||
games INTEGER NOT NULL DEFAULT 0, -- 이번 시즌
|
||||
wins INTEGER NOT NULL DEFAULT 0, -- 이번 시즌
|
||||
total_games INTEGER NOT NULL DEFAULT 0, -- 누적 (배치 판정용)
|
||||
last_played INTEGER
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS ratings_tr ON ratings(tr DESC);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS matches (
|
||||
id TEXT NOT NULL,
|
||||
season INTEGER,
|
||||
mode TEXT NOT NULL, -- 'league' | 'custom'
|
||||
finished_at INTEGER,
|
||||
room_size INTEGER,
|
||||
p1 TEXT NOT NULL, -- 커스텀 FFA 는 p1 = 본인, score1 = 순위
|
||||
p2 TEXT,
|
||||
score1 INTEGER,
|
||||
score2 INTEGER,
|
||||
tr_delta1 INTEGER,
|
||||
tr_delta2 INTEGER,
|
||||
PRIMARY KEY (id, p1)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS matches_p1 ON matches(p1, finished_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS matches_p2 ON matches(p2, finished_at DESC);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS solo_records (
|
||||
user_id TEXT NOT NULL,
|
||||
mode TEXT NOT NULL, -- 'sprint'(ms, 낮을수록 좋음) | 'time' | 'endless'(점수)
|
||||
best INTEGER NOT NULL,
|
||||
updated_at INTEGER,
|
||||
PRIMARY KEY (user_id, mode)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS solo_mode_best ON solo_records(mode, best);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS meta (
|
||||
key TEXT PRIMARY KEY,
|
||||
value TEXT NOT NULL
|
||||
);
|
||||
29
server/migrations/0002_shop.sql
Normal file
29
server/migrations/0002_shop.sql
Normal file
@@ -0,0 +1,29 @@
|
||||
-- 수익화: 시즌 패스 XP · 꾸미기 아이템 · Play 결제 기록 · 장착 배지
|
||||
CREATE TABLE IF NOT EXISTS season_xp (
|
||||
user_id TEXT NOT NULL,
|
||||
season INTEGER NOT NULL,
|
||||
xp INTEGER NOT NULL DEFAULT 0,
|
||||
premium INTEGER NOT NULL DEFAULT 0, -- 이번 시즌 프리미엄 패스 보유
|
||||
last_solo_at INTEGER, -- 솔로 XP 남용 방지 (최소 간격)
|
||||
PRIMARY KEY (user_id, season)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS user_items (
|
||||
user_id TEXT NOT NULL,
|
||||
item TEXT NOT NULL, -- 'skin:chalk' | 'board:oxide' | 'badge:s1_elite' ...
|
||||
source TEXT, -- 'pass:s1' | 'purchase:<token 앞부분>'
|
||||
created_at INTEGER,
|
||||
PRIMARY KEY (user_id, item)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS purchases (
|
||||
token TEXT PRIMARY KEY, -- Play purchaseToken (한 구매는 한 계정에만 묶인다)
|
||||
user_id TEXT NOT NULL,
|
||||
product TEXT NOT NULL,
|
||||
order_id TEXT,
|
||||
season INTEGER, -- season_pass 를 적용한 시즌
|
||||
created_at INTEGER
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS purchases_user ON purchases(user_id);
|
||||
|
||||
ALTER TABLE users ADD COLUMN badge TEXT;
|
||||
1454
server/package-lock.json
generated
Normal file
1454
server/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
14
server/package.json
Normal file
14
server/package.json
Normal file
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "tetrig-server",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"test": "node --test test/*.test.js",
|
||||
"dev": "wrangler dev --local",
|
||||
"deploy": "wrangler deploy"
|
||||
},
|
||||
"devDependencies": {
|
||||
"wrangler": "^4.40.0"
|
||||
}
|
||||
}
|
||||
92
server/scripts/e2e-shop.mjs
Normal file
92
server/scripts/e2e-shop.mjs
Normal file
@@ -0,0 +1,92 @@
|
||||
// 시즌 패스·결제·배지 종단 테스트 (로컬 전용: 가짜 영수증을 쓴다).
|
||||
// npx wrangler dev --local --port 8799 --var PLAY_VERIFY_FAKE:1
|
||||
// node scripts/e2e-shop.mjs http://127.0.0.1:8799
|
||||
const BASE = process.argv[2] || "http://127.0.0.1:8799";
|
||||
const WS = BASE.replace(/^http/, "ws");
|
||||
let fails = 0;
|
||||
const check = (cond, label) => { console.log(`${cond ? "✓" : "✗"} ${label}`); if (!cond) fails++; };
|
||||
const rnd = () => Math.random().toString(36).slice(2, 10);
|
||||
|
||||
async function api(path, { method = "GET", token, body } = {}) {
|
||||
const res = await fetch(BASE + path, {
|
||||
method, headers: { "Content-Type": "application/json", ...(token ? { Authorization: `Bearer ${token}` } : {}) },
|
||||
body: body ? JSON.stringify(body) : undefined,
|
||||
});
|
||||
return { status: res.status, data: await res.json().catch(() => null) };
|
||||
}
|
||||
const guest = async () => (await api("/api/guest", { method: "POST", body: { deviceId: "shop-" + rnd() } })).data;
|
||||
|
||||
const A = await guest();
|
||||
const B = await guest();
|
||||
|
||||
let p = (await api("/api/pass", { token: A.token })).data;
|
||||
check(p.level === 1 && p.xp === 0 && p.premium === false && p.purchasable === true && p.tiers.length === 9, "패스 초기 상태 Lv1, 0XP, 구매 가능(로컬 가짜 검증)");
|
||||
|
||||
let r = await api("/api/solo", { method: "POST", token: A.token, body: { mode: "sprint", value: 61_000 } });
|
||||
check(r.status === 200 && r.data.xp.xp === 10, "솔로 1판 +10 XP");
|
||||
r = await api("/api/solo", { method: "POST", token: A.token, body: { mode: "time", xpOnly: true } });
|
||||
check(r.data.xp.throttled === true && r.data.xp.xp === 10, "20초 안에 또 보내면 XP 없음");
|
||||
check((await api("/api/me", { token: A.token })).data.solo.time === undefined, "xpOnly 판은 기록에 안 남음");
|
||||
|
||||
// ── 서포터 팩 ──
|
||||
const sup = "fake-0-sup" + rnd() + rnd();
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "supporter_pack", purchaseToken: sup } });
|
||||
check(r.status === 200 && r.data.consume === false && r.data.items.includes("badge:supporter") && r.data.items.includes("skin:supporter"), "서포터 팩: 배지·스킨 지급, 소비 안 함");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "supporter_pack", purchaseToken: sup } });
|
||||
check(r.status === 200, "같은 구매 재전송은 그대로 성공 (멱등)");
|
||||
r = await api("/api/badge", { method: "POST", token: A.token, body: { badge: "supporter" } });
|
||||
check(r.status === 200 && r.data.user.badge === "supporter", "SUPPORTER 배지 장착");
|
||||
r = await api("/api/badge", { method: "POST", token: A.token, body: { badge: "s1_elite" } });
|
||||
check(r.status === 403, "없는 배지는 장착 불가");
|
||||
let me = (await api("/api/me", { token: A.token })).data;
|
||||
check(me.user.badge === "supporter" && me.items.includes("skin:supporter") && me.pass.level === 1, "/api/me 에 배지·아이템·패스 요약");
|
||||
|
||||
// 계정 승격 → 리더보드에 배지
|
||||
const email = `shop${rnd()}@example.com`;
|
||||
r = await api("/api/register", { method: "POST", token: A.token, body: { email, password: "password123" } });
|
||||
check(r.status === 200 && r.data.user.badge === "supporter", "게스트 → 계정 승격 후에도 배지 유지");
|
||||
const lb = (await api("/api/leaderboard?board=sprint")).data.rows.find((x) => x.id === A.user.id);
|
||||
check(lb?.badge === "supporter", "리더보드 행에 배지");
|
||||
|
||||
// 같은 Google 구매를 다른 게임 계정에서 복원 → 옮겨진다
|
||||
r = await api("/api/purchase", { method: "POST", token: B.token, body: { productId: "supporter_pack", purchaseToken: sup } });
|
||||
check(r.status === 200 && r.data.items.includes("badge:supporter"), "다른 계정에서 복원하면 그 계정으로 이전");
|
||||
me = (await api("/api/me", { token: A.token })).data;
|
||||
check(me.user.badge === null && !me.items.includes("badge:supporter"), "원래 계정은 배지·아이템 회수");
|
||||
|
||||
// ── 시즌 패스 ──
|
||||
const pass1 = "fake-0-pass" + rnd() + rnd();
|
||||
r = await api("/api/purchase", { method: "POST", token: B.token, body: { productId: "season_pass", purchaseToken: pass1 } });
|
||||
check(r.status === 200 && r.data.consume === true && r.data.items.includes("board:oxide"), "시즌 패스: 프리미엄 + Lv1 보상 소급, 소비 허용");
|
||||
p = (await api("/api/pass", { token: B.token })).data;
|
||||
check(p.premium === true, "패스 프리미엄 활성");
|
||||
r = await api("/api/purchase", { method: "POST", token: B.token, body: { productId: "season_pass", purchaseToken: "fake-0-pass" + rnd() + rnd() } });
|
||||
check(r.status === 409, "같은 시즌에 두 번째 패스는 적용 안 함 (409, 소비하지 않음)");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "season_pass", purchaseToken: pass1 } });
|
||||
check(r.status === 409, "다른 계정에 쓴 패스 영수증은 거절");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "remove_ads", purchaseToken: "fake-2-pend" + rnd() + rnd() } });
|
||||
check(r.status === 425, "결제 대기 중 구매는 425 (나중에 재시도)");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "remove_ads", purchaseToken: "fake-1-canc" + rnd() + rnd() } });
|
||||
check(r.status === 410, "취소된 구매는 410");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "gems_9999", purchaseToken: "fake-0-x" + rnd() + rnd() } });
|
||||
check(r.status === 400, "모르는 상품은 400");
|
||||
|
||||
// ── 로비에 배지 ──
|
||||
await api("/api/badge", { method: "POST", token: B.token, body: { badge: "supporter" } });
|
||||
const { data: room } = await api("/api/rooms", { method: "POST", token: B.token, body: { rules: {} } });
|
||||
const ws = new WebSocket(`${WS}/ws/room/${room.code}?token=${B.token}`);
|
||||
const lobby = await new Promise((res, rej) => {
|
||||
const to = setTimeout(() => rej(new Error("lobby timeout")), 8000);
|
||||
ws.onmessage = (e) => { const m = JSON.parse(e.data); if (m.t === "lobby") { clearTimeout(to); res(m); } };
|
||||
});
|
||||
check(lobby.players.find((x) => x.id === B.user.id)?.badge === "supporter", "커스텀 로비 플레이어 목록에 배지");
|
||||
ws.close();
|
||||
|
||||
// ── 계정(게스트) 삭제 → 구매 기록도 지워져 다시 복원 가능 ──
|
||||
r = await api("/api/me/delete", { method: "POST", token: B.token });
|
||||
check(r.status === 200, "B 삭제");
|
||||
r = await api("/api/purchase", { method: "POST", token: A.token, body: { productId: "supporter_pack", purchaseToken: sup } });
|
||||
check(r.status === 200 && r.data.items.includes("badge:supporter"), "삭제된 계정의 비소모성 구매를 새 계정에서 복원");
|
||||
|
||||
console.log(fails ? `\n${fails}개 실패` : "\n전부 통과");
|
||||
process.exit(fails ? 1 : 0);
|
||||
128
server/scripts/e2e.mjs
Normal file
128
server/scripts/e2e.mjs
Normal file
@@ -0,0 +1,128 @@
|
||||
// 실서버(로컬 wrangler dev 또는 배포본) 대상 종단 테스트. node scripts/e2e.mjs [baseUrl]
|
||||
const BASE = process.argv[2] || "http://127.0.0.1:8799";
|
||||
const WS = BASE.replace(/^http/, "ws");
|
||||
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
||||
let fails = 0;
|
||||
const check = (cond, label) => { console.log(`${cond ? "✓" : "✗"} ${label}`); if (!cond) fails++; };
|
||||
|
||||
async function api(path, { method = "GET", token, body } = {}) {
|
||||
const res = await fetch(BASE + path, {
|
||||
method, headers: { "Content-Type": "application/json", ...(token ? { Authorization: `Bearer ${token}` } : {}) },
|
||||
body: body ? JSON.stringify(body) : undefined,
|
||||
});
|
||||
return { status: res.status, data: await res.json().catch(() => null) };
|
||||
}
|
||||
|
||||
function client(url, name) {
|
||||
const ws = new WebSocket(url);
|
||||
const inbox = [];
|
||||
const waiters = [];
|
||||
ws.onmessage = (e) => {
|
||||
const m = JSON.parse(e.data);
|
||||
inbox.push(m);
|
||||
for (const w of [...waiters]) if (w.pred(m)) { waiters.splice(waiters.indexOf(w), 1); w.res(m); }
|
||||
};
|
||||
const open = new Promise((res, rej) => { ws.onopen = res; ws.onerror = () => rej(new Error(name + " ws error")); });
|
||||
return {
|
||||
ws, inbox, open, name,
|
||||
send: (m) => ws.send(JSON.stringify(m)),
|
||||
wait(pred, ms = 8000) {
|
||||
const hit = inbox.find(pred);
|
||||
if (hit) { inbox.splice(inbox.indexOf(hit), 1); return Promise.resolve(hit); }
|
||||
return new Promise((res, rej) => {
|
||||
const w = { pred, res: (m) => { clearTimeout(to); inbox.splice(inbox.indexOf(m), 1); res(m); } };
|
||||
const to = setTimeout(() => rej(new Error(`${name}: timeout waiting`)), ms);
|
||||
waiters.push(w);
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const guests = [];
|
||||
for (let i = 0; i < 4; i++) guests.push((await api("/api/guest", { method: "POST", body: { deviceId: "dev" + i } })).data);
|
||||
check(guests.every((g) => g.token && g.user.guest), "게스트 4명 발급: " + guests.map((g) => g.user.nickname).join(", "));
|
||||
|
||||
// ── 커스텀 FFA ──
|
||||
const { data: room } = await api("/api/rooms", { method: "POST", token: guests[0].token, body: { rules: { ft: 1 } } });
|
||||
check(/^[A-HJ-NP-Z2-9]{6}$/.test(room.code), "방 코드 발급 " + room.code);
|
||||
check((await api(`/api/rooms/${room.code}`)).data.exists, "방 조회");
|
||||
check(!(await api(`/api/rooms/ZZZZZZ`)).data.exists, "없는 방은 exists=false");
|
||||
const cs = guests.map((g, i) => client(`${WS}/ws/room/${room.code}?token=${g.token}`, "p" + i));
|
||||
for (const c of cs) { await c.open; await c.wait((m) => m.t === "sync"); }
|
||||
const lobby = await cs[0].wait((m) => m.t === "lobby" && m.players.length === 4);
|
||||
check(lobby.host === guests[0].user.id && lobby.rules.ft === 1, "로비 4인, 호스트=p0, FT1");
|
||||
cs[0].send({ t: "start" });
|
||||
const rs = await Promise.all(cs.map((c) => c.wait((m) => m.t === "round_start")));
|
||||
check(rs.every((m) => m.seed > 0 && m.startIn === 3000), "4명 모두 round_start(seed) 수신");
|
||||
await sleep(3100);
|
||||
const ids = guests.map((g) => g.user.id);
|
||||
cs[0].send({ t: "target", id: ids[2] });
|
||||
cs[0].send({ t: "attack", lines: 4, pieces: 2 });
|
||||
const g2 = await cs[2].wait((m) => m.t === "garbage");
|
||||
check(g2.from === ids[0] && g2.lines === 4, "p0 → p2 가비지 4줄 (수동 타겟)");
|
||||
cs[1].send({ t: "board", grid: ".".repeat(190) + "GGGGGGGGG.", lock: true });
|
||||
const b = await cs[3].wait((m) => m.t === "board");
|
||||
check(b.id === ids[1], "보드 스냅샷 중계");
|
||||
cs[2].send({ t: "topout" });
|
||||
const ko = await cs[0].wait((m) => m.t === "ko" && m.who === ids[2]);
|
||||
check(ko.by === ids[0] && ko.place === 4, "KO 피드: p0 → p2 격추 (4위)");
|
||||
cs[1].send({ t: "topout" }); cs[3].send({ t: "topout" });
|
||||
const me = await cs[0].wait((m) => m.t === "match_end");
|
||||
check(me.winner === ids[0] && me.result[0].id === ids[0], "FT1 매치 종료, 우승 p0");
|
||||
cs[1].send({ t: "rematch", vote: true }); cs[2].send({ t: "rematch", vote: true }); cs[3].send({ t: "rematch", vote: true });
|
||||
check((await cs[0].wait((m) => m.t === "round_start")).n === 1, "리매치 과반 → 새 경기 1라운드");
|
||||
for (const c of cs) c.ws.close();
|
||||
|
||||
// ── 계정 ──
|
||||
const email = `t${Date.now()}@ex.com`;
|
||||
const sprint = await api("/api/solo", { method: "POST", token: guests[0].token, body: { mode: "sprint", value: 65000 } });
|
||||
check(sprint.data.improved, "게스트 솔로 기록 저장");
|
||||
const reg = await api("/api/register", { method: "POST", token: guests[0].token, body: { email, password: "password1", nickname: "테스터" + (Date.now() % 1000) } });
|
||||
check(reg.status === 200 && !reg.data.user.guest && reg.data.user.id === ids[0], "게스트 → 이메일 계정 승격(같은 ID)");
|
||||
const meRes = await api("/api/me", { token: reg.data.token });
|
||||
check(meRes.data.solo.sprint === 65000 && meRes.data.recent.some((m) => m.mode === "custom"), "승격 후 솔로 기록·커스텀 전적 유지");
|
||||
check((await api("/api/login", { method: "POST", body: { email, password: "wrong-pass" } })).status === 401, "틀린 비밀번호 401");
|
||||
await api("/api/solo", { method: "POST", token: guests[1].token, body: { mode: "sprint", value: 50000 } });
|
||||
const login = await api("/api/login", { method: "POST", token: guests[1].token, body: { email, password: "password1" } });
|
||||
check(login.status === 200 && login.data.user.id === ids[0], "로그인 성공");
|
||||
const me2 = await api("/api/me", { token: login.data.token });
|
||||
check(me2.data.solo.sprint === 50000, "로그인 시 게스트 기록 병합 (더 좋은 기록 50.000)");
|
||||
check((await api("/api/nickname", { method: "POST", token: login.data.token, body: { nickname: "다른닉" } })).status === 429, "닉 변경 30일 쿨다운");
|
||||
check((await api("/api/nickname/check?n=재빠른미노123")).data.ok === false, "게스트명 패턴 예약");
|
||||
|
||||
// ── 리그 ──
|
||||
const acct = [login.data];
|
||||
const reg2 = await api("/api/register", { method: "POST", body: { email: "b" + email, password: "password2" } });
|
||||
acct.push(reg2.data);
|
||||
const gq = client(`${WS}/ws/queue?token=${guests[2].token}`, "gq");
|
||||
const gqErr = await gq.open.then(() => "opened", () => "rejected");
|
||||
check(gqErr === "rejected", "게스트는 리그 큐 접속 거부");
|
||||
const qa = client(`${WS}/ws/queue?token=${acct[0].token}`, "qa");
|
||||
const qb = client(`${WS}/ws/queue?token=${acct[1].token}`, "qb");
|
||||
await qa.open; await qb.open;
|
||||
const [ma, mb] = await Promise.all([qa.wait((m) => m.t === "matched"), qb.wait((m) => m.t === "matched")]);
|
||||
check(ma.room === mb.room && ma.ft === 3, "매칭 성사 (FT3) " + ma.room.slice(0, 8));
|
||||
const la = client(`${WS}/ws/league/${ma.room}?token=${acct[0].token}`, "la");
|
||||
const lb = client(`${WS}/ws/league/${ma.room}?token=${acct[1].token}`, "lb");
|
||||
await la.open; await lb.open;
|
||||
for (let r = 1; r <= 3; r++) {
|
||||
await la.wait((m) => m.t === "round_start", 10000);
|
||||
await lb.wait((m) => m.t === "round_start", 10000);
|
||||
await sleep(3100);
|
||||
lb.send({ t: "topout" });
|
||||
await la.wait((m) => m.t === "round_end");
|
||||
}
|
||||
const [ea, eb] = await Promise.all([la.wait((m) => m.t === "match_end"), lb.wait((m) => m.t === "match_end")]);
|
||||
check(ea.winner === acct[0].user.id && ea.trDelta > 0 && eb.trDelta < 0, `리그 결과 TR 반영 (승 +${ea.trDelta} / 패 ${eb.trDelta})`);
|
||||
const meL = await api("/api/me", { token: acct[0].token });
|
||||
check(meL.data.league.placement === 1 && meL.data.league.tr === null && meL.data.recent[0].mode === "league", "배치 1/10, TR 비공개, 리그 전적 기록");
|
||||
la.ws.close(); lb.ws.close();
|
||||
const lbSprint = await api("/api/leaderboard?board=sprint");
|
||||
check(lbSprint.data.rows.some((r) => r.id === acct[0].user.id) && !lbSprint.data.rows.some((r) => r.id === ids[3]), "SPRINT 리더보드: 계정만 등재");
|
||||
|
||||
// ── 계정 삭제 ──
|
||||
const del = await api("/api/me/delete", { method: "POST", token: acct[1].token });
|
||||
check(del.status === 200 && (await api("/api/me", { token: acct[1].token })).status === 401, "계정 삭제 후 토큰 무효");
|
||||
|
||||
console.log(fails ? `\n실패 ${fails}건` : "\n전부 통과");
|
||||
process.exit(fails ? 1 : 0);
|
||||
99
server/src/auth.js
Normal file
99
server/src/auth.js
Normal file
@@ -0,0 +1,99 @@
|
||||
// 세션 토큰(HMAC), 비밀번호(PBKDF2), Google ID 토큰 검증. WebCrypto 만 사용.
|
||||
import { PBKDF2_ITER, TOKEN_TTL_MS } from "./rules.js";
|
||||
|
||||
const enc = new TextEncoder();
|
||||
|
||||
export function b64url(bytes) {
|
||||
let s = "";
|
||||
for (const b of new Uint8Array(bytes)) s += String.fromCharCode(b);
|
||||
return btoa(s).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
||||
}
|
||||
export function unb64url(s) {
|
||||
s = s.replace(/-/g, "+").replace(/_/g, "/");
|
||||
while (s.length % 4) s += "=";
|
||||
const bin = atob(s);
|
||||
const out = new Uint8Array(bin.length);
|
||||
for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i);
|
||||
return out;
|
||||
}
|
||||
|
||||
async function hmacKey(secret) {
|
||||
return crypto.subtle.importKey("raw", enc.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign", "verify"]);
|
||||
}
|
||||
|
||||
/** 토큰 = base64url(JSON{uid, exp}) + "." + base64url(HMAC). */
|
||||
export async function signToken(secret, uid, now = Date.now()) {
|
||||
const body = b64url(enc.encode(JSON.stringify({ uid, exp: now + TOKEN_TTL_MS })));
|
||||
const sig = await crypto.subtle.sign("HMAC", await hmacKey(secret), enc.encode(body));
|
||||
return `${body}.${b64url(sig)}`;
|
||||
}
|
||||
|
||||
export async function verifyToken(secret, token, now = Date.now()) {
|
||||
if (typeof token !== "string") return null;
|
||||
const [body, sig] = token.split(".");
|
||||
if (!body || !sig) return null;
|
||||
let ok = false;
|
||||
try {
|
||||
ok = await crypto.subtle.verify("HMAC", await hmacKey(secret), unb64url(sig), enc.encode(body));
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
if (!ok) return null;
|
||||
try {
|
||||
const p = JSON.parse(new TextDecoder().decode(unb64url(body)));
|
||||
if (typeof p.uid !== "string" || typeof p.exp !== "number" || p.exp < now) return null;
|
||||
return p;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export async function hashPassword(password, saltB64 = null) {
|
||||
const salt = saltB64 ? unb64url(saltB64) : crypto.getRandomValues(new Uint8Array(16));
|
||||
const key = await crypto.subtle.importKey("raw", enc.encode(password), "PBKDF2", false, ["deriveBits"]);
|
||||
const bits = await crypto.subtle.deriveBits({ name: "PBKDF2", hash: "SHA-256", salt, iterations: PBKDF2_ITER }, key, 256);
|
||||
return { hash: b64url(bits), salt: b64url(salt) };
|
||||
}
|
||||
|
||||
export function timingSafeEqual(a, b) {
|
||||
if (a.length !== b.length) return false;
|
||||
let d = 0;
|
||||
for (let i = 0; i < a.length; i++) d |= a.charCodeAt(i) ^ b.charCodeAt(i);
|
||||
return d === 0;
|
||||
}
|
||||
|
||||
// ── Google ID 토큰 (RS256) ──
|
||||
let jwksCache = { at: 0, keys: [] };
|
||||
async function googleKeys(fetchFn = fetch) {
|
||||
if (Date.now() - jwksCache.at < 3600_000 && jwksCache.keys.length) return jwksCache.keys;
|
||||
const res = await fetchFn("https://www.googleapis.com/oauth2/v3/certs");
|
||||
const { keys } = await res.json();
|
||||
jwksCache = { at: Date.now(), keys };
|
||||
return keys;
|
||||
}
|
||||
|
||||
/** 검증되면 payload({sub, email, …}), 아니면 null. audiences = 허용할 OAuth 클라이언트 ID 목록. */
|
||||
export async function verifyGoogleIdToken(idToken, audiences, fetchFn = fetch) {
|
||||
if (!idToken || !audiences.length) return null;
|
||||
const parts = idToken.split(".");
|
||||
if (parts.length !== 3) return null;
|
||||
let header, payload;
|
||||
try {
|
||||
header = JSON.parse(new TextDecoder().decode(unb64url(parts[0])));
|
||||
payload = JSON.parse(new TextDecoder().decode(unb64url(parts[1])));
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
if (header.alg !== "RS256") return null;
|
||||
const jwk = (await googleKeys(fetchFn)).find((k) => k.kid === header.kid);
|
||||
if (!jwk) return null;
|
||||
const key = await crypto.subtle.importKey("jwk", jwk, { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" }, false, ["verify"]);
|
||||
const ok = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key, unb64url(parts[2]), enc.encode(`${parts[0]}.${parts[1]}`));
|
||||
if (!ok) return null;
|
||||
const now = Date.now() / 1000;
|
||||
if (!["accounts.google.com", "https://accounts.google.com"].includes(payload.iss)) return null;
|
||||
if (!audiences.includes(payload.aud)) return null;
|
||||
if (typeof payload.exp !== "number" || payload.exp < now) return null;
|
||||
if (!payload.sub) return null;
|
||||
return payload;
|
||||
}
|
||||
172
server/src/db.js
Normal file
172
server/src/db.js
Normal file
@@ -0,0 +1,172 @@
|
||||
// D1 접근 헬퍼. Worker 와 DO 가 공유한다.
|
||||
import { glickoUpdate } from "./glicko.js";
|
||||
import { PASS, awardXp, mergeShopStatements } from "./shop.js";
|
||||
import {
|
||||
GLICKO, PLACEMENT_GAMES, RANK_VISIBLE_RD, RD_DECAY_IDLE_DAYS, RD_DECAY_PER_DAY, SEASON_LENGTH_DAYS,
|
||||
rankFor, trFor,
|
||||
} from "./rules.js";
|
||||
|
||||
const DAY = 24 * 3600 * 1000;
|
||||
|
||||
export async function getSeason(db, now = Date.now()) {
|
||||
const row = await db.prepare("SELECT value FROM meta WHERE key = 'season'").first();
|
||||
if (row) return JSON.parse(row.value);
|
||||
const s = { n: 1, startedAt: now, endsAt: now + SEASON_LENGTH_DAYS * DAY };
|
||||
await db.prepare("INSERT OR IGNORE INTO meta(key, value) VALUES ('season', ?)").bind(JSON.stringify(s)).run();
|
||||
return s;
|
||||
}
|
||||
|
||||
export async function getUser(db, uid) {
|
||||
return db.prepare("SELECT * FROM users WHERE id = ?").bind(uid).first();
|
||||
}
|
||||
|
||||
export function publicUser(u) {
|
||||
if (!u) return null;
|
||||
return {
|
||||
id: u.id, nickname: u.nickname, guest: !!u.is_guest, email: u.email ?? null,
|
||||
google: !!u.google_sub, nicknameChangedAt: u.nickname_changed_at ?? null, badge: u.badge ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
export async function getRating(db, uid) {
|
||||
const r = await db.prepare("SELECT * FROM ratings WHERE user_id = ?").bind(uid).first();
|
||||
if (r) return r;
|
||||
return {
|
||||
user_id: uid, season: 0, glicko: GLICKO.R, rd: GLICKO.RD, vol: GLICKO.VOL, tr: trFor(GLICKO.R, GLICKO.RD),
|
||||
games: 0, wins: 0, total_games: 0, last_played: null, _new: true,
|
||||
};
|
||||
}
|
||||
|
||||
/** 클라이언트 표시용 레이팅 요약 (배치 중이면 TR 비공개, RD<100 일 때만 랭크). */
|
||||
export function ratingView(r) {
|
||||
const placed = r.total_games >= PLACEMENT_GAMES;
|
||||
return {
|
||||
placed,
|
||||
placement: Math.min(r.total_games, PLACEMENT_GAMES),
|
||||
tr: placed ? r.tr : null,
|
||||
rank: placed && r.rd < RANK_VISIBLE_RD ? rankFor(r.tr) : null,
|
||||
rd: Math.round(r.rd),
|
||||
games: r.games,
|
||||
wins: r.wins,
|
||||
totalGames: r.total_games,
|
||||
};
|
||||
}
|
||||
|
||||
async function putRating(db, r) {
|
||||
await db
|
||||
.prepare(
|
||||
`INSERT INTO ratings(user_id, season, glicko, rd, vol, tr, games, wins, total_games, last_played)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)
|
||||
ON CONFLICT(user_id) DO UPDATE SET season=?2, glicko=?3, rd=?4, vol=?5, tr=?6, games=?7, wins=?8,
|
||||
total_games=?9, last_played=?10`,
|
||||
)
|
||||
.bind(r.user_id, r.season, r.glicko, r.rd, r.vol, r.tr, r.games, r.wins, r.total_games, r.last_played)
|
||||
.run();
|
||||
}
|
||||
|
||||
/** 리그 경기 종료: 양측 Glicko-2 동시 갱신 + 전적 기록. 반환 {[uid]: {trDelta, before, after}} */
|
||||
export async function applyLeagueResult(db, { matchId, winner, loser, score }, now = Date.now()) {
|
||||
const season = (await getSeason(db, now)).n;
|
||||
const [w, l] = await Promise.all([getRating(db, winner), getRating(db, loser)]);
|
||||
const nw = glickoUpdate({ r: w.glicko, rd: w.rd, vol: w.vol }, [{ r: l.glicko, rd: l.rd, score: 1 }]);
|
||||
const nl = glickoUpdate({ r: l.glicko, rd: l.rd, vol: l.vol }, [{ r: w.glicko, rd: w.rd, score: 0 }]);
|
||||
const upd = (old, n, won) => ({
|
||||
...old, season, glicko: n.r, rd: n.rd, vol: n.vol, tr: trFor(n.r, n.rd),
|
||||
games: (old.season === season ? old.games : 0) + 1,
|
||||
wins: (old.season === season ? old.wins : 0) + (won ? 1 : 0),
|
||||
total_games: old.total_games + 1, last_played: now,
|
||||
});
|
||||
const W = upd(w, nw, true);
|
||||
const L = upd(l, nl, false);
|
||||
await putRating(db, W);
|
||||
await putRating(db, L);
|
||||
const dW = W.tr - w.tr;
|
||||
const dL = L.tr - l.tr;
|
||||
await db
|
||||
.prepare(
|
||||
`INSERT OR IGNORE INTO matches(id, season, mode, finished_at, room_size, p1, p2, score1, score2, tr_delta1, tr_delta2)
|
||||
VALUES (?, ?, 'league', ?, 2, ?, ?, ?, ?, ?, ?)`,
|
||||
)
|
||||
.bind(matchId, season, now, winner, loser, score[winner] ?? 0, score[loser] ?? 0, dW, dL)
|
||||
.run();
|
||||
// 시즌 패스 XP (실패해도 경기 결과에는 영향 없음)
|
||||
await Promise.all([
|
||||
awardXp(db, winner, PASS.LEAGUE_XP + PASS.LEAGUE_WIN_XP, now),
|
||||
awardXp(db, loser, PASS.LEAGUE_XP, now),
|
||||
]).catch((e) => console.error("xp", e));
|
||||
return {
|
||||
[winner]: { trDelta: dW, before: ratingView(w), after: ratingView(W), won: true },
|
||||
[loser]: { trDelta: dL, before: ratingView(l), after: ratingView(L), won: false },
|
||||
};
|
||||
}
|
||||
|
||||
export async function recordCustom(db, { matchId, standings, size }, now = Date.now()) {
|
||||
const season = (await getSeason(db, now)).n;
|
||||
const stmts = standings.map((s) =>
|
||||
db
|
||||
.prepare(
|
||||
`INSERT OR IGNORE INTO matches(id, season, mode, finished_at, room_size, p1, score1, score2)
|
||||
VALUES (?, ?, 'custom', ?, ?, ?, ?, ?)`,
|
||||
)
|
||||
.bind(matchId, season, now, size, s.id, s.rank, s.wins),
|
||||
);
|
||||
if (stmts.length) await db.batch(stmts);
|
||||
for (const st of standings) {
|
||||
await awardXp(db, st.id, PASS.CUSTOM_XP + (st.rank === 1 ? PASS.CUSTOM_WIN_XP : 0), now).catch((e) => console.error("xp", e));
|
||||
}
|
||||
}
|
||||
|
||||
/** 일일 Cron: RD 감쇠 + 시즌 마감. */
|
||||
export async function dailyMaintenance(db, now = Date.now()) {
|
||||
const idleBefore = now - RD_DECAY_IDLE_DAYS * DAY;
|
||||
await db
|
||||
.prepare("UPDATE ratings SET rd = MIN(?, rd + ?) WHERE last_played IS NOT NULL AND last_played < ?")
|
||||
.bind(GLICKO.RD_MAX, RD_DECAY_PER_DAY, idleBefore)
|
||||
.run();
|
||||
const s = await getSeason(db, now);
|
||||
if (now >= s.endsAt) {
|
||||
const next = { n: s.n + 1, startedAt: s.endsAt, endsAt: s.endsAt + SEASON_LENGTH_DAYS * DAY };
|
||||
await db.batch([
|
||||
db.prepare("UPDATE meta SET value = ? WHERE key = 'season'").bind(JSON.stringify(next)),
|
||||
// 시즌 소프트 리셋: R 유지, 불확실도(RD)를 최소 150 으로 올려 초반 변동폭을 키운다. 시즌 전적은 0부터.
|
||||
db.prepare("UPDATE ratings SET rd = MAX(rd, 150), games = 0, wins = 0, season = ?").bind(next.n),
|
||||
]);
|
||||
// TR 은 R/RD 에서 다시 계산
|
||||
const { results } = await db.prepare("SELECT user_id, glicko, rd FROM ratings").all();
|
||||
const stmts = results.map((r) => db.prepare("UPDATE ratings SET tr = ? WHERE user_id = ?").bind(trFor(r.glicko, r.rd), r.user_id));
|
||||
for (let i = 0; i < stmts.length; i += 50) await db.batch(stmts.slice(i, i + 50));
|
||||
return { rolled: true, season: next.n };
|
||||
}
|
||||
return { rolled: false, season: s.n };
|
||||
}
|
||||
|
||||
export const soloBetter = (mode, a, b) => (mode === "sprint" ? a < b : a > b);
|
||||
|
||||
/** 게스트 → 계정 기록 이전 (더 좋은 기록 우선). 게스트 행은 삭제해 닉네임을 반환한다. */
|
||||
export async function mergeGuestInto(db, guestId, userId) {
|
||||
if (!guestId || guestId === userId) return;
|
||||
const g = await getUser(db, guestId);
|
||||
if (!g || !g.is_guest) return;
|
||||
const { results } = await db.prepare("SELECT mode, best FROM solo_records WHERE user_id = ?").bind(guestId).all();
|
||||
for (const rec of results) await submitSolo(db, userId, rec.mode, rec.best);
|
||||
await db.batch([
|
||||
...mergeShopStatements(db, guestId, userId),
|
||||
db.prepare("UPDATE OR IGNORE matches SET p1 = ? WHERE p1 = ? AND mode = 'custom'").bind(userId, guestId),
|
||||
db.prepare("DELETE FROM solo_records WHERE user_id = ?").bind(guestId),
|
||||
db.prepare("DELETE FROM matches WHERE p1 = ? AND mode = 'custom'").bind(guestId),
|
||||
db.prepare("DELETE FROM users WHERE id = ? AND is_guest = 1").bind(guestId),
|
||||
]);
|
||||
}
|
||||
|
||||
export async function submitSolo(db, uid, mode, value, now = Date.now()) {
|
||||
const cur = await db.prepare("SELECT best FROM solo_records WHERE user_id = ? AND mode = ?").bind(uid, mode).first();
|
||||
if (cur && !soloBetter(mode, value, cur.best)) return { improved: false, best: cur.best };
|
||||
await db
|
||||
.prepare(
|
||||
`INSERT INTO solo_records(user_id, mode, best, updated_at) VALUES (?1, ?2, ?3, ?4)
|
||||
ON CONFLICT(user_id, mode) DO UPDATE SET best = ?3, updated_at = ?4`,
|
||||
)
|
||||
.bind(uid, mode, value, now)
|
||||
.run();
|
||||
return { improved: true, best: value };
|
||||
}
|
||||
76
server/src/glicko.js
Normal file
76
server/src/glicko.js
Normal file
@@ -0,0 +1,76 @@
|
||||
// Glicko-2 (Glickman 2013, http://www.glicko.net/glicko/glicko2.pdf). 경기 1건 = 레이팅 기간 1개로 처리.
|
||||
import { GLICKO } from "./rules.js";
|
||||
|
||||
const SCALE = 173.7178;
|
||||
const EPS = 1e-6;
|
||||
|
||||
const g = (phi) => 1 / Math.sqrt(1 + (3 * phi * phi) / (Math.PI * Math.PI));
|
||||
const E = (mu, muj, phij) => 1 / (1 + Math.exp(-g(phij) * (mu - muj)));
|
||||
|
||||
/**
|
||||
* player = {r, rd, vol}, results = [{r, rd, score}] (score 1 승 / 0 패 / 0.5 무).
|
||||
* 반환: 새 {r, rd, vol}. RD 는 [RD_MIN, RD_MAX] 로 자른다.
|
||||
*/
|
||||
export function glickoUpdate(player, results, tau = GLICKO.TAU) {
|
||||
const mu = (player.r - 1500) / SCALE;
|
||||
const phi = player.rd / SCALE;
|
||||
const sigma = player.vol;
|
||||
|
||||
if (!results.length) {
|
||||
const phiStar = Math.sqrt(phi * phi + sigma * sigma);
|
||||
return clamp({ r: player.r, rd: phiStar * SCALE, vol: sigma });
|
||||
}
|
||||
|
||||
let vInv = 0;
|
||||
let deltaSum = 0;
|
||||
for (const o of results) {
|
||||
const muj = (o.r - 1500) / SCALE;
|
||||
const phij = o.rd / SCALE;
|
||||
const e = E(mu, muj, phij);
|
||||
const gj = g(phij);
|
||||
vInv += gj * gj * e * (1 - e);
|
||||
deltaSum += gj * (o.score - e);
|
||||
}
|
||||
const v = 1 / vInv;
|
||||
const delta = v * deltaSum;
|
||||
|
||||
// 변동성 σ' — Illinois 알고리즘
|
||||
const a = Math.log(sigma * sigma);
|
||||
const f = (x) => {
|
||||
const ex = Math.exp(x);
|
||||
return (ex * (delta * delta - phi * phi - v - ex)) / (2 * Math.pow(phi * phi + v + ex, 2)) - (x - a) / (tau * tau);
|
||||
};
|
||||
let A = a;
|
||||
let B;
|
||||
if (delta * delta > phi * phi + v) {
|
||||
B = Math.log(delta * delta - phi * phi - v);
|
||||
} else {
|
||||
let k = 1;
|
||||
while (f(a - k * tau) < 0) k++;
|
||||
B = a - k * tau;
|
||||
}
|
||||
let fA = f(A);
|
||||
let fB = f(B);
|
||||
for (let i = 0; i < 100 && Math.abs(B - A) > EPS; i++) {
|
||||
const C = A + ((A - B) * fA) / (fB - fA);
|
||||
const fC = f(C);
|
||||
if (fC * fB <= 0) {
|
||||
A = B;
|
||||
fA = fB;
|
||||
} else {
|
||||
fA /= 2;
|
||||
}
|
||||
B = C;
|
||||
fB = fC;
|
||||
}
|
||||
const sigmaNew = Math.exp(A / 2);
|
||||
|
||||
const phiStar = Math.sqrt(phi * phi + sigmaNew * sigmaNew);
|
||||
const phiNew = 1 / Math.sqrt(1 / (phiStar * phiStar) + 1 / v);
|
||||
const muNew = mu + phiNew * phiNew * deltaSum;
|
||||
return clamp({ r: muNew * SCALE + 1500, rd: phiNew * SCALE, vol: sigmaNew });
|
||||
}
|
||||
|
||||
function clamp(p) {
|
||||
return { r: p.r, rd: Math.min(GLICKO.RD_MAX, Math.max(GLICKO.RD_MIN, p.rd)), vol: p.vol };
|
||||
}
|
||||
351
server/src/index.js
Normal file
351
server/src/index.js
Normal file
@@ -0,0 +1,351 @@
|
||||
// TETRIG Worker — REST API + WebSocket 라우팅 + Cron.
|
||||
import { hashPassword, signToken, timingSafeEqual, verifyGoogleIdToken, verifyToken } from "./auth.js";
|
||||
import {
|
||||
dailyMaintenance, getRating, getSeason, getUser, mergeGuestInto, publicUser, ratingView, submitSolo,
|
||||
} from "./db.js";
|
||||
import {
|
||||
BRAND, NICK_COOLDOWN_MS, NICK_RE, SOLO_MODES, isRoomCode, looksLikeGuestName, randomGuestName, randomRoomCode,
|
||||
} from "./rules.js";
|
||||
|
||||
import { PASS, applyPurchase, awardXp, deleteShopStatements, equipBadge, passView, userItems } from "./shop.js";
|
||||
|
||||
export { GameRoomDO } from "./room.js";
|
||||
export { MatchmakerDO } from "./matchmaker.js";
|
||||
|
||||
const CORS = {
|
||||
"Access-Control-Allow-Origin": "*",
|
||||
"Access-Control-Allow-Methods": "GET, POST, OPTIONS",
|
||||
"Access-Control-Allow-Headers": "Content-Type, Authorization",
|
||||
};
|
||||
|
||||
const json = (data, status = 200) => Response.json(data, { status, headers: CORS });
|
||||
const err = (msg, status = 400) => json({ error: msg }, status);
|
||||
|
||||
async function body(req) {
|
||||
try {
|
||||
return await req.json();
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
function secret(env) {
|
||||
if (!env.TOKEN_SECRET) throw new Error("TOKEN_SECRET 미설정");
|
||||
return env.TOKEN_SECRET;
|
||||
}
|
||||
|
||||
async function authUser(req, env, url) {
|
||||
const h = req.headers.get("Authorization") || "";
|
||||
const token = h.startsWith("Bearer ") ? h.slice(7) : url?.searchParams.get("token");
|
||||
const p = await verifyToken(secret(env), token);
|
||||
if (!p) return null;
|
||||
return getUser(env.DB, p.uid);
|
||||
}
|
||||
|
||||
async function issue(env, user) {
|
||||
return { token: await signToken(secret(env), user.id), user: publicUser(user) };
|
||||
}
|
||||
|
||||
async function uniqueGuestName(db) {
|
||||
for (let i = 0; i < 20; i++) {
|
||||
const n = randomGuestName();
|
||||
const hit = await db.prepare("SELECT 1 FROM users WHERE nickname = ?").bind(n).first();
|
||||
if (!hit) return n;
|
||||
}
|
||||
return "게스트" + crypto.randomUUID().slice(0, 6);
|
||||
}
|
||||
|
||||
async function nicknameProblem(db, nick, selfId = null) {
|
||||
if (typeof nick !== "string" || !NICK_RE.test(nick)) return "닉네임은 2~12자의 한글·영문·숫자·_ 만 쓸 수 있습니다";
|
||||
if (looksLikeGuestName(nick)) return "게스트 이름 형식은 쓸 수 없습니다";
|
||||
const hit = await db.prepare("SELECT id FROM users WHERE nickname = ? COLLATE NOCASE").bind(nick).first();
|
||||
if (hit && hit.id !== selfId) return "이미 사용 중인 닉네임입니다";
|
||||
return null;
|
||||
}
|
||||
|
||||
/** 유저 + 리그 요약 (WS 헤더로 DO 에 넘기는 정보). */
|
||||
async function playerInfo(env, u) {
|
||||
const r = await getRating(env.DB, u.id);
|
||||
const v = ratingView(r);
|
||||
return { nick: u.nickname, guest: !!u.is_guest, tr: v.tr, rank: v.rank, r: r.glicko, rd: r.rd, badge: u.badge ?? null };
|
||||
}
|
||||
|
||||
async function routeWs(req, env, url, u, ns, name, path = "/ws") {
|
||||
if (req.headers.get("Upgrade") !== "websocket") return err("websocket only", 426);
|
||||
const stub = ns.get(ns.idFromName(name));
|
||||
const headers = new Headers(req.headers);
|
||||
headers.set("x-uid", u.id);
|
||||
headers.set("x-info", encodeURIComponent(JSON.stringify(await playerInfo(env, u)))); // 헤더는 ASCII 만 안전
|
||||
return stub.fetch(new Request(`https://do${path}`, { headers }));
|
||||
}
|
||||
|
||||
async function handle(req, env) {
|
||||
const url = new URL(req.url);
|
||||
const path = url.pathname;
|
||||
if (req.method === "OPTIONS") return new Response(null, { headers: CORS });
|
||||
const db = env.DB;
|
||||
|
||||
if (path === "/" || path === "/api/health") {
|
||||
return json({ ok: true, name: BRAND, season: (await getSeason(db)).n });
|
||||
}
|
||||
|
||||
// ── 계정 ──
|
||||
if (path === "/api/guest" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
const id = crypto.randomUUID();
|
||||
const nickname = await uniqueGuestName(db);
|
||||
await db
|
||||
.prepare("INSERT INTO users(id, nickname, is_guest, device_id, created_at) VALUES (?, ?, 1, ?, ?)")
|
||||
.bind(id, nickname, typeof b.deviceId === "string" ? b.deviceId.slice(0, 64) : null, Date.now())
|
||||
.run();
|
||||
return json(await issue(env, await getUser(db, id)));
|
||||
}
|
||||
|
||||
if (path === "/api/register" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
const email = String(b.email || "").trim().toLowerCase();
|
||||
const password = String(b.password || "");
|
||||
if (!/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email)) return err("이메일 형식이 올바르지 않습니다");
|
||||
if (password.length < 8) return err("비밀번호는 8자 이상이어야 합니다");
|
||||
if (await db.prepare("SELECT 1 FROM users WHERE email = ?").bind(email).first()) return err("이미 가입된 이메일입니다", 409);
|
||||
const me = await authUser(req, env, url);
|
||||
let nickname = b.nickname ? String(b.nickname) : null;
|
||||
if (nickname) {
|
||||
const p = await nicknameProblem(db, nickname, me?.id);
|
||||
if (p) return err(p);
|
||||
}
|
||||
const { hash, salt } = await hashPassword(password);
|
||||
const now = Date.now();
|
||||
if (me && me.is_guest) {
|
||||
// 지금 쓰는 게스트 계정을 그대로 정식 계정으로 승격 → 기록이 자동으로 따라온다.
|
||||
await db
|
||||
.prepare("UPDATE users SET is_guest = 0, email = ?, pw_hash = ?, pw_salt = ?, nickname = COALESCE(?, nickname), nickname_changed_at = ? WHERE id = ?")
|
||||
.bind(email, hash, salt, nickname, nickname ? now : null, me.id)
|
||||
.run();
|
||||
return json(await issue(env, await getUser(db, me.id)));
|
||||
}
|
||||
const id = crypto.randomUUID();
|
||||
await db
|
||||
.prepare("INSERT INTO users(id, nickname, is_guest, email, pw_hash, pw_salt, created_at, nickname_changed_at) VALUES (?, ?, 0, ?, ?, ?, ?, ?)")
|
||||
.bind(id, nickname ?? (await uniqueGuestName(db)), email, hash, salt, now, nickname ? now : null)
|
||||
.run();
|
||||
return json(await issue(env, await getUser(db, id)));
|
||||
}
|
||||
|
||||
if (path === "/api/login" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
const email = String(b.email || "").trim().toLowerCase();
|
||||
const u = await db.prepare("SELECT * FROM users WHERE email = ?").bind(email).first();
|
||||
if (!u || !u.pw_hash) return err("이메일 또는 비밀번호가 맞지 않습니다", 401);
|
||||
const { hash } = await hashPassword(String(b.password || ""), u.pw_salt);
|
||||
if (!timingSafeEqual(hash, u.pw_hash)) return err("이메일 또는 비밀번호가 맞지 않습니다", 401);
|
||||
const me = await authUser(req, env, url);
|
||||
if (me && me.is_guest) await mergeGuestInto(db, me.id, u.id);
|
||||
return json(await issue(env, u));
|
||||
}
|
||||
|
||||
if (path === "/api/google" && req.method === "POST") {
|
||||
const auds = String(env.GOOGLE_CLIENT_IDS || "").split(",").map((s) => s.trim()).filter(Boolean);
|
||||
if (!auds.length) return err("Google 로그인이 아직 설정되지 않았습니다", 503);
|
||||
const b = await body(req);
|
||||
const g = await verifyGoogleIdToken(b.idToken, auds);
|
||||
if (!g) return err("Google 인증에 실패했습니다", 401);
|
||||
const me = await authUser(req, env, url);
|
||||
let u = await db.prepare("SELECT * FROM users WHERE google_sub = ?").bind(g.sub).first();
|
||||
if (!u && me && me.is_guest) {
|
||||
await db.prepare("UPDATE users SET is_guest = 0, google_sub = ? WHERE id = ?").bind(g.sub, me.id).run();
|
||||
u = await getUser(db, me.id);
|
||||
} else if (!u) {
|
||||
const id = crypto.randomUUID();
|
||||
await db
|
||||
.prepare("INSERT INTO users(id, nickname, is_guest, google_sub, created_at) VALUES (?, ?, 0, ?, ?)")
|
||||
.bind(id, await uniqueGuestName(db), g.sub, Date.now())
|
||||
.run();
|
||||
u = await getUser(db, id);
|
||||
} else if (me && me.is_guest) {
|
||||
await mergeGuestInto(db, me.id, u.id);
|
||||
}
|
||||
return json(await issue(env, u));
|
||||
}
|
||||
|
||||
if (path === "/api/nickname/check") {
|
||||
const p = await nicknameProblem(db, url.searchParams.get("n") || "");
|
||||
return json({ ok: !p, reason: p });
|
||||
}
|
||||
|
||||
// 이하 인증 필요
|
||||
const needAuth = path.startsWith("/api/me") || path === "/api/nickname" || path === "/api/solo" || path === "/api/rooms" ||
|
||||
path === "/api/pass" || path === "/api/purchase" || path === "/api/badge" || path.startsWith("/ws/");
|
||||
// 가짜 영수증(PLAY_VERIFY_FAKE)은 로컬 wrangler dev 에서만 받는다.
|
||||
const local = url.hostname === "127.0.0.1" || url.hostname === "localhost";
|
||||
const me = needAuth ? await authUser(req, env, url) : null;
|
||||
if (needAuth && !me) return err("로그인이 필요합니다", 401);
|
||||
|
||||
if (path === "/api/me") {
|
||||
const r = await getRating(db, me.id);
|
||||
const { results: solo } = await db.prepare("SELECT mode, best FROM solo_records WHERE user_id = ?").bind(me.id).all();
|
||||
const { results: recent } = await db
|
||||
.prepare(
|
||||
`SELECT m.id, m.mode, m.finished_at, m.room_size, m.p1, m.p2, m.score1, m.score2, m.tr_delta1, m.tr_delta2,
|
||||
u1.nickname AS n1, u2.nickname AS n2
|
||||
FROM matches m LEFT JOIN users u1 ON u1.id = m.p1 LEFT JOIN users u2 ON u2.id = m.p2
|
||||
WHERE m.p1 = ?1 OR m.p2 = ?1 ORDER BY m.finished_at DESC LIMIT 20`,
|
||||
)
|
||||
.bind(me.id)
|
||||
.all();
|
||||
const pass = await passView(db, env, me.id, { local });
|
||||
return json({
|
||||
user: publicUser(me),
|
||||
items: await userItems(db, me.id),
|
||||
pass: { season: pass.season, xp: pass.xp, level: pass.level, premium: pass.premium },
|
||||
league: ratingView(r),
|
||||
season: await getSeason(db),
|
||||
solo: Object.fromEntries(solo.map((s) => [s.mode, s.best])),
|
||||
recent: recent.map((m) => {
|
||||
const mine = m.p1 === me.id;
|
||||
if (m.mode === "custom") return { id: m.id, mode: "custom", at: m.finished_at, size: m.room_size, place: m.score1, wins: m.score2 };
|
||||
return {
|
||||
id: m.id, mode: "league", at: m.finished_at, won: mine, opponent: mine ? m.n2 : m.n1,
|
||||
score: mine ? [m.score1, m.score2] : [m.score2, m.score1], trDelta: mine ? m.tr_delta1 : m.tr_delta2,
|
||||
};
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
// 계정 삭제 (Play 정책: 계정을 만들 수 있으면 앱 안에서 삭제도 가능해야 한다)
|
||||
if (path === "/api/me/delete" && req.method === "POST") {
|
||||
await db.batch([
|
||||
...deleteShopStatements(db, me.id),
|
||||
db.prepare("DELETE FROM solo_records WHERE user_id = ?").bind(me.id),
|
||||
db.prepare("DELETE FROM ratings WHERE user_id = ?").bind(me.id),
|
||||
db.prepare("DELETE FROM matches WHERE p1 = ? AND mode = 'custom'").bind(me.id),
|
||||
db.prepare("DELETE FROM users WHERE id = ?").bind(me.id),
|
||||
]);
|
||||
return json({ ok: true });
|
||||
}
|
||||
|
||||
if (path === "/api/nickname" && req.method === "POST") {
|
||||
if (me.is_guest) return err("게스트는 닉네임을 바꿀 수 없습니다. 로그인해 주세요", 403);
|
||||
const b = await body(req);
|
||||
const now = Date.now();
|
||||
if (me.nickname_changed_at && now - me.nickname_changed_at < NICK_COOLDOWN_MS) {
|
||||
const days = Math.ceil((me.nickname_changed_at + NICK_COOLDOWN_MS - now) / 86400000);
|
||||
return err(`닉네임은 30일에 한 번 바꿀 수 있습니다 (${days}일 남음)`, 429);
|
||||
}
|
||||
const p = await nicknameProblem(db, b.nickname, me.id);
|
||||
if (p) return err(p);
|
||||
await db.prepare("UPDATE users SET nickname = ?, nickname_changed_at = ? WHERE id = ?").bind(b.nickname, now, me.id).run();
|
||||
return json({ user: publicUser(await getUser(db, me.id)) });
|
||||
}
|
||||
|
||||
if (path === "/api/solo" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
if (!SOLO_MODES.includes(b.mode)) return err("잘못된 기록");
|
||||
// 이어하기(보상형 광고)를 쓴 판: 기록·리더보드에는 넣지 않고 시즌 패스 XP 만 준다.
|
||||
if (b.xpOnly === true) return json({ improved: false, xp: await awardXp(db, me.id, PASS.SOLO_XP, Date.now(), { solo: true }) });
|
||||
if (!Number.isInteger(b.value) || b.value <= 0) return err("잘못된 기록");
|
||||
// 최소 상식 검증: SPRINT 40줄 10초 미만은 불가능에 가깝다.
|
||||
if (b.mode === "sprint" && b.value < 10_000) return err("기록이 비정상입니다");
|
||||
const rec = await submitSolo(db, me.id, b.mode, b.value);
|
||||
return json({ ...rec, xp: await awardXp(db, me.id, PASS.SOLO_XP, Date.now(), { solo: true }) });
|
||||
}
|
||||
|
||||
// ── 시즌 패스 · 결제 · 배지 ──
|
||||
if (path === "/api/pass") return json(await passView(db, env, me.id, { local }));
|
||||
|
||||
if (path === "/api/purchase" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
const r = await applyPurchase(db, env, me.id, b.productId, b.purchaseToken, { local });
|
||||
return json(r.body, r.status);
|
||||
}
|
||||
|
||||
if (path === "/api/badge" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
const p = await equipBadge(db, me.id, b.badge ?? null);
|
||||
if (p) return err(p, 403);
|
||||
return json({ user: publicUser(await getUser(db, me.id)) });
|
||||
}
|
||||
|
||||
if (path.startsWith("/api/leaderboard")) {
|
||||
const board = url.searchParams.get("board") || "league";
|
||||
if (board === "league") {
|
||||
const { results } = await db
|
||||
.prepare(
|
||||
`SELECT u.id, u.nickname, u.badge, r.tr, r.rd, r.games, r.wins, r.total_games FROM ratings r JOIN users u ON u.id = r.user_id
|
||||
WHERE u.is_guest = 0 AND r.total_games >= 10 ORDER BY r.tr DESC LIMIT 100`,
|
||||
)
|
||||
.all();
|
||||
return json({
|
||||
board,
|
||||
rows: results.map((r, i) => ({ pos: i + 1, id: r.id, nickname: r.nickname, badge: r.badge ?? null, ...ratingView({ ...r }) })),
|
||||
});
|
||||
}
|
||||
if (!SOLO_MODES.includes(board)) return err("unknown board");
|
||||
const order = board === "sprint" ? "ASC" : "DESC";
|
||||
const { results } = await db
|
||||
.prepare(
|
||||
`SELECT u.id, u.nickname, u.badge, s.best FROM solo_records s JOIN users u ON u.id = s.user_id
|
||||
WHERE s.mode = ? AND u.is_guest = 0 ORDER BY s.best ${order} LIMIT 100`,
|
||||
)
|
||||
.bind(board)
|
||||
.all();
|
||||
return json({ board, rows: results.map((r, i) => ({ pos: i + 1, id: r.id, nickname: r.nickname, badge: r.badge ?? null, best: r.best })) });
|
||||
}
|
||||
|
||||
if (path === "/api/season") return json(await getSeason(db));
|
||||
|
||||
// ── 커스텀 방 ──
|
||||
if (path === "/api/rooms" && req.method === "POST") {
|
||||
const b = await body(req);
|
||||
for (let i = 0; i < 8; i++) {
|
||||
const code = randomRoomCode();
|
||||
const stub = env.ROOMS.get(env.ROOMS.idFromName(`custom:${code}`));
|
||||
const res = await stub.fetch("https://do/init", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ id: code, code, kind: "custom", rules: b.rules ?? {} }),
|
||||
});
|
||||
if (res.ok) return json({ code });
|
||||
}
|
||||
return err("방 코드를 만들지 못했습니다. 다시 시도해 주세요", 503);
|
||||
}
|
||||
|
||||
const roomInfo = /^\/api\/rooms\/([A-Z0-9]{6})$/.exec(path);
|
||||
if (roomInfo) {
|
||||
const code = roomInfo[1];
|
||||
if (!isRoomCode(code)) return json({ exists: false });
|
||||
const stub = env.ROOMS.get(env.ROOMS.idFromName(`custom:${code}`));
|
||||
return json(await (await stub.fetch("https://do/info")).json());
|
||||
}
|
||||
|
||||
// ── WebSocket ──
|
||||
const wsRoom = /^\/ws\/room\/([A-Z0-9]{6})$/.exec(path);
|
||||
if (wsRoom) {
|
||||
if (!isRoomCode(wsRoom[1])) return err("잘못된 코드", 404);
|
||||
const stub = env.ROOMS.get(env.ROOMS.idFromName(`custom:${wsRoom[1]}`));
|
||||
const info = await (await stub.fetch("https://do/info")).json();
|
||||
if (!info.exists) return err("없는 방입니다", 404);
|
||||
return routeWs(req, env, url, me, env.ROOMS, `custom:${wsRoom[1]}`);
|
||||
}
|
||||
const wsLeague = /^\/ws\/league\/([0-9a-f-]{36})$/.exec(path);
|
||||
if (wsLeague) return routeWs(req, env, url, me, env.ROOMS, `league:${wsLeague[1]}`);
|
||||
if (path === "/ws/queue") {
|
||||
if (me.is_guest) return err("리그전은 로그인 후 참가할 수 있습니다", 403);
|
||||
return routeWs(req, env, url, me, env.MATCHMAKER, "global", "/");
|
||||
}
|
||||
|
||||
return err("not found", 404);
|
||||
}
|
||||
|
||||
export default {
|
||||
async fetch(req, env) {
|
||||
try {
|
||||
return await handle(req, env);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return err("서버 오류", 500);
|
||||
}
|
||||
},
|
||||
async scheduled(_event, env) {
|
||||
await dailyMaintenance(env.DB);
|
||||
},
|
||||
};
|
||||
77
server/src/matchmaker.js
Normal file
77
server/src/matchmaker.js
Normal file
@@ -0,0 +1,77 @@
|
||||
// MatchmakerDO — 리그 대기열 싱글턴. 대기열 상태는 소켓 attachment 에만 둔다 (하이버네이션 안전).
|
||||
import { DurableObject } from "cloudflare:workers";
|
||||
import { findPairs } from "./matchmaking.js";
|
||||
import { MM_HINT_AFTER_MS, leagueFt } from "./rules.js";
|
||||
|
||||
const SWEEP_MS = 3_000;
|
||||
|
||||
export class MatchmakerDO extends DurableObject {
|
||||
constructor(ctx, env) {
|
||||
super(ctx, env);
|
||||
ctx.setWebSocketAutoResponse(new WebSocketRequestResponsePair('{"t":"ping"}', '{"t":"pong"}'));
|
||||
}
|
||||
|
||||
async fetch(req) {
|
||||
if (req.headers.get("Upgrade") !== "websocket") return new Response("websocket only", { status: 426 });
|
||||
const uid = req.headers.get("x-uid");
|
||||
const info = JSON.parse(decodeURIComponent(req.headers.get("x-info") || "%7B%7D"));
|
||||
for (const old of this.ctx.getWebSockets(uid)) {
|
||||
try {
|
||||
old.serializeAttachment({ ...old.deserializeAttachment(), gone: true });
|
||||
old.close(4000, "replaced");
|
||||
} catch {}
|
||||
}
|
||||
const [client, server] = Object.values(new WebSocketPair());
|
||||
this.ctx.acceptWebSocket(server, [uid]);
|
||||
server.serializeAttachment({ uid, r: info.r, rd: info.rd, tr: info.tr, nick: info.nick, rank: info.rank, joinedAt: Date.now() });
|
||||
server.send(JSON.stringify({ t: "queue", state: "waiting", waitMs: 0, hint: false }));
|
||||
await this.sweep();
|
||||
return new Response(null, { status: 101, webSocket: client });
|
||||
}
|
||||
|
||||
waiting() {
|
||||
return this.ctx
|
||||
.getWebSockets()
|
||||
.filter((ws) => ws.readyState === 1)
|
||||
.map((ws) => ({ ws, a: ws.deserializeAttachment() }))
|
||||
.filter((x) => x.a && !x.a.gone && !x.a.matched);
|
||||
}
|
||||
|
||||
async sweep() {
|
||||
const now = Date.now();
|
||||
const list = this.waiting();
|
||||
const byUid = new Map(list.map((x) => [x.a.uid, x]));
|
||||
const pairs = findPairs(list.map((x) => x.a), now);
|
||||
for (const [a, b] of pairs) {
|
||||
const roomId = crypto.randomUUID();
|
||||
const ft = leagueFt(a.tr ?? 0, b.tr ?? 0);
|
||||
const stub = this.env.ROOMS.get(this.env.ROOMS.idFromName(`league:${roomId}`));
|
||||
const res = await stub.fetch("https://room/init", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ id: roomId, kind: "league", allowed: [a.uid, b.uid], ft }),
|
||||
});
|
||||
if (!res.ok) continue;
|
||||
for (const [me, opp] of [[a, b], [b, a]]) {
|
||||
const x = byUid.get(me.uid);
|
||||
x.ws.serializeAttachment({ ...x.a, matched: true });
|
||||
x.ws.send(JSON.stringify({ t: "matched", room: roomId, ft, opponent: { id: opp.uid, nick: opp.nick, tr: opp.tr, rank: opp.rank } }));
|
||||
x.ws.close(1000, "matched");
|
||||
}
|
||||
}
|
||||
for (const x of this.waiting()) {
|
||||
const waitMs = now - x.a.joinedAt;
|
||||
x.ws.send(JSON.stringify({ t: "queue", state: "waiting", waitMs, hint: waitMs >= MM_HINT_AFTER_MS, size: this.waiting().length }));
|
||||
}
|
||||
if (this.waiting().length) await this.ctx.storage.setAlarm(now + SWEEP_MS);
|
||||
}
|
||||
|
||||
async alarm() {
|
||||
await this.sweep();
|
||||
}
|
||||
|
||||
async webSocketMessage(ws, data) {
|
||||
if (String(data).includes('"leave"')) ws.close(1000, "left");
|
||||
}
|
||||
|
||||
async webSocketClose() {}
|
||||
}
|
||||
38
server/src/matchmaking.js
Normal file
38
server/src/matchmaking.js
Normal file
@@ -0,0 +1,38 @@
|
||||
// 리그 매치메이킹 순수 로직 (§8.3). MatchmakerDO 가 대기열 스냅샷을 넘겨 짝을 받는다.
|
||||
import { MM_EXPAND_EVERY_MS, MM_EXPAND_FACTOR, MM_WINDOW_RD } from "./rules.js";
|
||||
|
||||
/** 대기 시간에 따라 넓어지는 탐색 반경 (R 기준 반폭). */
|
||||
export function windowFor(entry, now) {
|
||||
const steps = Math.floor(Math.max(0, now - entry.joinedAt) / MM_EXPAND_EVERY_MS);
|
||||
return MM_WINDOW_RD * entry.rd * Math.pow(MM_EXPAND_FACTOR, steps);
|
||||
}
|
||||
|
||||
/** 두 사람의 구간 [R-w, R+w] 가 겹치면 성사. */
|
||||
export function compatible(a, b, now) {
|
||||
return Math.abs(a.r - b.r) <= windowFor(a, now) + windowFor(b, now);
|
||||
}
|
||||
|
||||
/**
|
||||
* queue: [{uid, r, rd, joinedAt}] — 오래 기다린 순서로 우선 매칭, 그 안에서는 R 차이가 가장 작은 상대.
|
||||
* 반환: [[a, b], …]
|
||||
*/
|
||||
export function findPairs(queue, now) {
|
||||
const waiting = [...queue].sort((x, y) => x.joinedAt - y.joinedAt);
|
||||
const used = new Set();
|
||||
const pairs = [];
|
||||
for (const a of waiting) {
|
||||
if (used.has(a.uid)) continue;
|
||||
let best = null;
|
||||
for (const b of waiting) {
|
||||
if (b.uid === a.uid || used.has(b.uid)) continue;
|
||||
if (!compatible(a, b, now)) continue;
|
||||
if (!best || Math.abs(a.r - b.r) < Math.abs(a.r - best.r)) best = b;
|
||||
}
|
||||
if (best) {
|
||||
used.add(a.uid);
|
||||
used.add(best.uid);
|
||||
pairs.push([a, best]);
|
||||
}
|
||||
}
|
||||
return pairs;
|
||||
}
|
||||
88
server/src/play.js
Normal file
88
server/src/play.js
Normal file
@@ -0,0 +1,88 @@
|
||||
// Google Play Developer API 로 인앱 구매 영수증을 확인한다.
|
||||
// 비밀값 PLAY_SA_KEY = 서비스 계정 JSON 키 전체 (Play Console 에서 "재무 데이터 보기" 권한을 준 계정).
|
||||
export const PACKAGE_NAME = "kr.tkrmagid.tetrig";
|
||||
|
||||
const enc = new TextEncoder();
|
||||
|
||||
function b64url(data) {
|
||||
const bytes = typeof data === "string" ? enc.encode(data) : new Uint8Array(data);
|
||||
let s = "";
|
||||
for (const b of bytes) s += String.fromCharCode(b);
|
||||
return btoa(s).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
||||
}
|
||||
|
||||
function pemToDer(pem) {
|
||||
const body = pem.replace(/-----[^-]+-----/g, "").replace(/\s+/g, "");
|
||||
const bin = atob(body);
|
||||
const out = new Uint8Array(bin.length);
|
||||
for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i);
|
||||
return out.buffer;
|
||||
}
|
||||
|
||||
let cached = null; // { token, exp, email }
|
||||
|
||||
async function accessToken(saJson) {
|
||||
const sa = JSON.parse(saJson);
|
||||
if (cached && cached.email === sa.client_email && cached.exp > Date.now() + 60_000) return cached.token;
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const head = b64url(JSON.stringify({ alg: "RS256", typ: "JWT" }));
|
||||
const claim = b64url(
|
||||
JSON.stringify({
|
||||
iss: sa.client_email,
|
||||
scope: "https://www.googleapis.com/auth/androidpublisher",
|
||||
aud: "https://oauth2.googleapis.com/token",
|
||||
iat: now,
|
||||
exp: now + 3600,
|
||||
}),
|
||||
);
|
||||
const key = await crypto.subtle.importKey(
|
||||
"pkcs8", pemToDer(sa.private_key), { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" }, false, ["sign"],
|
||||
);
|
||||
const sig = await crypto.subtle.sign("RSASSA-PKCS1-v1_5", key, enc.encode(`${head}.${claim}`));
|
||||
const r = await fetch("https://oauth2.googleapis.com/token", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
||||
body: new URLSearchParams({
|
||||
grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
|
||||
assertion: `${head}.${claim}.${b64url(sig)}`,
|
||||
}),
|
||||
});
|
||||
if (!r.ok) throw new Error(`google oauth ${r.status}`);
|
||||
const j = await r.json();
|
||||
cached = { token: j.access_token, exp: Date.now() + (j.expires_in ?? 3600) * 1000, email: sa.client_email };
|
||||
return cached.token;
|
||||
}
|
||||
|
||||
/**
|
||||
* 반환: { valid:false } (없는/남의 앱 토큰) 또는
|
||||
* { valid:true, purchaseState(0 구매·1 취소·2 대기), consumptionState(0 미소비·1 소비), orderId, purchaseTime }
|
||||
* 네트워크/권한 오류는 throw (클라이언트는 나중에 다시 시도한다).
|
||||
*
|
||||
* 로컬 개발(wrangler dev)에서만 PLAY_VERIFY_FAKE=1 이면 "fake-<state>-..." 토큰을 받아 준다.
|
||||
*/
|
||||
export async function verifyPlayPurchase(env, productId, token, { local = false } = {}) {
|
||||
if (local && env.PLAY_VERIFY_FAKE === "1" && token.startsWith("fake-")) {
|
||||
const state = Number(token.split("-")[1]) || 0;
|
||||
return { valid: true, purchaseState: state, consumptionState: 0, orderId: `GPA.FAKE-${token.slice(-6)}`, purchaseTime: Date.now() };
|
||||
}
|
||||
if (!env.PLAY_SA_KEY) throw new Error("PLAY_SA_KEY 미설정");
|
||||
const at = await accessToken(env.PLAY_SA_KEY);
|
||||
const url =
|
||||
`https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${PACKAGE_NAME}` +
|
||||
`/purchases/products/${encodeURIComponent(productId)}/tokens/${encodeURIComponent(token)}`;
|
||||
const r = await fetch(url, { headers: { Authorization: `Bearer ${at}` } });
|
||||
if (r.status === 400 || r.status === 404 || r.status === 410) return { valid: false };
|
||||
if (!r.ok) throw new Error(`play api ${r.status}`);
|
||||
const j = await r.json();
|
||||
return {
|
||||
valid: true,
|
||||
purchaseState: j.purchaseState ?? 0,
|
||||
consumptionState: j.consumptionState ?? 0,
|
||||
orderId: j.orderId ?? null,
|
||||
purchaseTime: Number(j.purchaseTimeMillis) || Date.now(),
|
||||
};
|
||||
}
|
||||
|
||||
export function playVerifyConfigured(env, local = false) {
|
||||
return !!env.PLAY_SA_KEY || (local && env.PLAY_VERIFY_FAKE === "1");
|
||||
}
|
||||
490
server/src/room-logic.js
Normal file
490
server/src/room-logic.js
Normal file
@@ -0,0 +1,490 @@
|
||||
// 경기방 상태 기계 (리그 1:1 & 커스텀 N인 공용). 전송·저장과 분리된 순수 로직이라 node 로 테스트한다.
|
||||
// GameRoomDO(room.js)가 소켓 메시지를 handle() 로 넘기고, outbox/effects 를 비워 실제로 보낸다.
|
||||
import {
|
||||
AUTO_TARGET_MS, DEFAULT_RULES, MAX_ATTACK_PER_PIECE, MAX_PPS, RECONNECT_GRACE_MS,
|
||||
ROUND_COUNTDOWN_MS, ROUND_GAP_MS, overtimeMultiplier, sanitizeRules,
|
||||
} from "./rules.js";
|
||||
|
||||
const BOARD_W = 10;
|
||||
const BOARD_ROWS = 20;
|
||||
const BOARD_RE = /^[.IOTSZJLG]+$/;
|
||||
|
||||
export class RoomLogic {
|
||||
/**
|
||||
* opts: { id, kind: "custom"|"league", code?, allowed?: [uid, uid], ft?, now?, rand? }
|
||||
*/
|
||||
constructor(opts) {
|
||||
this.id = opts.id;
|
||||
this.kind = opts.kind;
|
||||
this.code = opts.code ?? null;
|
||||
this.allowed = opts.allowed ?? null;
|
||||
this.rules = { ...DEFAULT_RULES, ...(opts.kind === "league" ? { ft: opts.ft ?? 3 } : {}) };
|
||||
this.now = opts.now ?? (() => Date.now());
|
||||
this.rand = opts.rand ?? Math.random;
|
||||
|
||||
/** @type {Map<string, any>} uid -> player */
|
||||
this.players = new Map();
|
||||
this.order = [];
|
||||
this.host = null;
|
||||
this.phase = "lobby"; // lobby | countdown | playing | between | match_end
|
||||
this.round = 0;
|
||||
this.roundStartAt = 0;
|
||||
this.nextRoundAt = 0;
|
||||
this.matchId = null;
|
||||
this.finished = false;
|
||||
this.lastEnd = null; // 끊겼다 돌아온 사람에게 다시 보낼 match_end ({uid|"*": msg}) // 리그 경기 종료 후 방 폐기 표시
|
||||
|
||||
this.outbox = []; // {to: uid|null, except?: uid, msg}
|
||||
this.effects = []; // {type, ...}
|
||||
}
|
||||
|
||||
// ── 출력 ──
|
||||
send(to, msg) {
|
||||
this.outbox.push({ to, msg });
|
||||
}
|
||||
broadcast(msg, except = null) {
|
||||
this.outbox.push({ to: null, except, msg });
|
||||
}
|
||||
drain() {
|
||||
const o = this.outbox;
|
||||
const e = this.effects;
|
||||
this.outbox = [];
|
||||
this.effects = [];
|
||||
return { out: o, effects: e };
|
||||
}
|
||||
|
||||
// ── 직렬화 (DO 하이버네이션 대비) ──
|
||||
toJSON() {
|
||||
return {
|
||||
id: this.id, kind: this.kind, code: this.code, allowed: this.allowed, rules: this.rules,
|
||||
players: [...this.players.values()], order: this.order, host: this.host, phase: this.phase,
|
||||
round: this.round, roundStartAt: this.roundStartAt, nextRoundAt: this.nextRoundAt,
|
||||
matchId: this.matchId, finished: this.finished, lastEnd: this.lastEnd,
|
||||
};
|
||||
}
|
||||
static fromJSON(j, deps = {}) {
|
||||
const r = new RoomLogic({ id: j.id, kind: j.kind, code: j.code, allowed: j.allowed, ...deps });
|
||||
Object.assign(r, {
|
||||
rules: j.rules, order: j.order, host: j.host, phase: j.phase, round: j.round,
|
||||
roundStartAt: j.roundStartAt, nextRoundAt: j.nextRoundAt, matchId: j.matchId, finished: j.finished,
|
||||
lastEnd: j.lastEnd ?? null,
|
||||
});
|
||||
for (const p of j.players) r.players.set(p.uid, p);
|
||||
return r;
|
||||
}
|
||||
|
||||
// ── 조회 ──
|
||||
get connected() {
|
||||
return [...this.players.values()].filter((p) => p.connected);
|
||||
}
|
||||
get alive() {
|
||||
return [...this.players.values()].filter((p) => p.inRound && p.alive);
|
||||
}
|
||||
ftTarget() {
|
||||
return this.rules.ft;
|
||||
}
|
||||
|
||||
lobbyMsg() {
|
||||
return {
|
||||
t: "lobby",
|
||||
room: this.id,
|
||||
code: this.code,
|
||||
kind: this.kind,
|
||||
host: this.host,
|
||||
rules: this.rules,
|
||||
phase: this.phase,
|
||||
round: this.round,
|
||||
players: this.order.map((uid) => {
|
||||
const p = this.players.get(uid);
|
||||
return {
|
||||
id: p.uid, nick: p.nick, guest: p.guest, wins: p.wins, alive: p.alive, inRound: p.inRound,
|
||||
connected: p.connected, rematch: p.rematch, tr: p.tr ?? null, rank: p.rank ?? null, badge: p.badge ?? null,
|
||||
};
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
// ── 입장/퇴장 ──
|
||||
/** 반환: {ok:true} | {ok:false, reason} */
|
||||
join(uid, info = {}) {
|
||||
if (this.finished) return { ok: false, reason: "이미 끝난 경기입니다" };
|
||||
if (this.allowed && !this.allowed.includes(uid)) return { ok: false, reason: "이 경기의 참가자가 아닙니다" };
|
||||
const existing = this.players.get(uid);
|
||||
if (existing) {
|
||||
existing.connected = true;
|
||||
existing.disconnectedAt = 0;
|
||||
Object.assign(existing, pickInfo(info));
|
||||
this.send(uid, this.syncMsg(uid));
|
||||
if (this.phase === "match_end" && this.lastEnd) {
|
||||
const end = this.lastEnd[uid] ?? this.lastEnd["*"];
|
||||
if (end) this.send(uid, end);
|
||||
}
|
||||
if (existing.pendingGarbage?.length) {
|
||||
for (const g of existing.pendingGarbage) this.send(uid, g);
|
||||
existing.pendingGarbage = [];
|
||||
}
|
||||
this.broadcast(this.lobbyMsg());
|
||||
return { ok: true, rejoined: true };
|
||||
}
|
||||
const p = {
|
||||
uid, nick: info.nick ?? "?", guest: !!info.guest, tr: info.tr ?? null, rank: info.rank ?? null, badge: info.badge ?? null,
|
||||
connected: true, disconnectedAt: 0,
|
||||
wins: 0, inRound: false, alive: false, place: 0,
|
||||
target: null, autoTarget: null, autoTargetAt: 0, lastAttacker: null,
|
||||
carry: 0, pieces: 0, lastBoardAt: 0, grid: null, rematch: false, pendingGarbage: [], flagged: 0,
|
||||
};
|
||||
this.players.set(uid, p);
|
||||
this.order.push(uid);
|
||||
if (!this.host) this.host = uid;
|
||||
this.send(uid, this.syncMsg(uid));
|
||||
this.broadcast(this.lobbyMsg());
|
||||
if (this.kind === "league" && this.phase === "lobby" && this.allowed.every((u) => this.players.get(u)?.connected)) {
|
||||
this.startRound();
|
||||
}
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
syncMsg(uid) {
|
||||
const p = this.players.get(uid);
|
||||
return {
|
||||
...this.lobbyMsg(), t: "sync", you: uid,
|
||||
inRound: p.inRound, alive: p.alive,
|
||||
boards: Object.fromEntries([...this.players.values()].filter((o) => o.grid && o.uid !== uid).map((o) => [o.uid, o.grid])),
|
||||
};
|
||||
}
|
||||
|
||||
/** 소켓 종료. 리그·라운드 중이면 15초 유예 후 톱아웃 처리. */
|
||||
disconnect(uid) {
|
||||
const p = this.players.get(uid);
|
||||
if (!p) return;
|
||||
p.connected = false;
|
||||
p.disconnectedAt = this.now();
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
|
||||
leave(uid) {
|
||||
const p = this.players.get(uid);
|
||||
if (!p) return;
|
||||
if (this.kind === "league" && !this.finished) {
|
||||
this.forfeit(uid);
|
||||
return;
|
||||
}
|
||||
if (p.inRound && p.alive) this.topout(uid);
|
||||
this.players.delete(uid);
|
||||
this.order = this.order.filter((u) => u !== uid);
|
||||
if (this.host === uid) this.host = this.order.find((u) => this.players.get(u).connected) ?? this.order[0] ?? null;
|
||||
if (this.phase !== "lobby" && this.phase !== "match_end" && this.participants().length < 2 && this.alive.length <= 1) {
|
||||
// 남은 인원으로 라운드를 이어갈 수 없으면 로비로
|
||||
if (this.phase === "between" || this.phase === "countdown") this.toLobby();
|
||||
}
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
|
||||
participants() {
|
||||
return this.connected;
|
||||
}
|
||||
|
||||
// ── 라운드 ──
|
||||
startRound() {
|
||||
const ready = this.connected;
|
||||
if (ready.length < 2) return false;
|
||||
this.round += 1;
|
||||
this.phase = "countdown";
|
||||
const now = this.now();
|
||||
this.roundStartAt = now + ROUND_COUNTDOWN_MS;
|
||||
this.nextRoundAt = 0;
|
||||
const shared = this.randomSeed();
|
||||
for (const p of this.players.values()) {
|
||||
const inRound = p.connected;
|
||||
Object.assign(p, {
|
||||
inRound, alive: inRound, place: 0, target: null, autoTarget: null, autoTargetAt: 0,
|
||||
lastAttacker: null, carry: 0, pieces: 0, grid: null, rematch: false, pendingGarbage: [],
|
||||
});
|
||||
}
|
||||
for (const p of this.players.values()) {
|
||||
if (!p.inRound) continue;
|
||||
const seed = this.rules.sameBag ? shared : this.randomSeed();
|
||||
this.send(p.uid, { t: "round_start", n: this.round, startIn: ROUND_COUNTDOWN_MS, seed, rules: this.rules });
|
||||
}
|
||||
// 관전자에게도 라운드 시작 알림 (seed 없음)
|
||||
for (const p of this.players.values()) {
|
||||
if (!p.inRound) this.send(p.uid, { t: "round_start", n: this.round, startIn: ROUND_COUNTDOWN_MS, seed: null, rules: this.rules });
|
||||
}
|
||||
this.broadcast(this.lobbyMsg());
|
||||
return true;
|
||||
}
|
||||
|
||||
randomSeed() {
|
||||
return 1 + Math.floor(this.rand() * 0x7ffffffe);
|
||||
}
|
||||
|
||||
elapsed() {
|
||||
return Math.max(0, this.now() - this.roundStartAt);
|
||||
}
|
||||
|
||||
/** 시간 경과 처리. DO 알람에서 호출. */
|
||||
tick() {
|
||||
const now = this.now();
|
||||
if (this.phase === "countdown" && now >= this.roundStartAt) this.phase = "playing";
|
||||
if (this.phase === "between" && this.nextRoundAt && now >= this.nextRoundAt) {
|
||||
if (!this.startRound()) this.toLobby();
|
||||
}
|
||||
for (const p of [...this.players.values()]) {
|
||||
if (!p.connected && p.disconnectedAt && now - p.disconnectedAt >= RECONNECT_GRACE_MS) {
|
||||
if (this.kind === "league" && !this.finished) {
|
||||
this.forfeit(p.uid);
|
||||
} else if (p.inRound && p.alive) {
|
||||
this.topout(p.uid);
|
||||
p.disconnectedAt = 0;
|
||||
} else if (this.phase === "lobby" || this.phase === "match_end") {
|
||||
this.leave(p.uid);
|
||||
} else {
|
||||
p.disconnectedAt = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 다음에 tick() 이 필요한 시각 (없으면 null). */
|
||||
nextWake() {
|
||||
const t = [];
|
||||
if (this.phase === "countdown") t.push(this.roundStartAt);
|
||||
if (this.phase === "between" && this.nextRoundAt) t.push(this.nextRoundAt);
|
||||
for (const p of this.players.values()) if (!p.connected && p.disconnectedAt) t.push(p.disconnectedAt + RECONNECT_GRACE_MS);
|
||||
return t.length ? Math.min(...t) : null;
|
||||
}
|
||||
|
||||
ensurePlaying() {
|
||||
if (this.phase === "countdown" && this.now() >= this.roundStartAt) this.phase = "playing";
|
||||
return this.phase === "playing";
|
||||
}
|
||||
|
||||
// ── 메시지 처리 ──
|
||||
handle(uid, m) {
|
||||
const p = this.players.get(uid);
|
||||
if (!p || !m || typeof m.t !== "string") return;
|
||||
switch (m.t) {
|
||||
case "start":
|
||||
if (this.kind === "custom" && uid === this.host && (this.phase === "lobby" || this.phase === "match_end")) {
|
||||
if (this.phase === "match_end") this.resetWins();
|
||||
if (!this.startRound()) this.send(uid, { t: "error", msg: "2명 이상 있어야 시작할 수 있습니다" });
|
||||
}
|
||||
break;
|
||||
case "rules":
|
||||
if (this.kind === "custom" && uid === this.host && this.phase === "lobby") {
|
||||
this.rules = sanitizeRules(m.rules, this.rules);
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
break;
|
||||
case "stop":
|
||||
if (this.kind === "custom" && uid === this.host) this.toLobby();
|
||||
break;
|
||||
case "attack":
|
||||
this.onAttack(p, m);
|
||||
break;
|
||||
case "board":
|
||||
this.onBoard(p, m);
|
||||
break;
|
||||
case "topout":
|
||||
if (p.inRound && p.alive && (this.phase === "playing" || this.ensurePlaying())) this.topout(uid);
|
||||
break;
|
||||
case "target":
|
||||
if (typeof m.id === "string" && m.id !== uid && this.players.has(m.id)) {
|
||||
p.target = m.id;
|
||||
this.send(uid, { t: "targeting", id: m.id, manual: true });
|
||||
} else if (m.id === null) {
|
||||
p.target = null;
|
||||
}
|
||||
break;
|
||||
case "rematch":
|
||||
this.onRematch(p, !!m.vote);
|
||||
break;
|
||||
case "leave":
|
||||
this.leave(uid);
|
||||
break;
|
||||
case "ping":
|
||||
this.send(uid, { t: "pong", ts: m.ts ?? null });
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
onAttack(p, m) {
|
||||
if (!p.inRound || !p.alive || !this.ensurePlaying()) return;
|
||||
const lines = m.lines;
|
||||
const pieces = m.pieces;
|
||||
if (!Number.isInteger(lines) || lines < 0 || lines > MAX_ATTACK_PER_PIECE) {
|
||||
p.flagged++;
|
||||
return;
|
||||
}
|
||||
if (Number.isInteger(pieces)) {
|
||||
const sec = this.elapsed() / 1000;
|
||||
if (pieces > MAX_PPS * sec + 3) {
|
||||
p.flagged++;
|
||||
return;
|
||||
}
|
||||
p.pieces = pieces;
|
||||
}
|
||||
if (lines === 0) return;
|
||||
const mul = this.rules.garbageMul * overtimeMultiplier(this.elapsed(), this.rules.overtime);
|
||||
p.carry += lines * mul;
|
||||
const send = Math.floor(p.carry + 1e-9);
|
||||
p.carry -= send;
|
||||
if (send <= 0) return;
|
||||
const target = this.pickTarget(p);
|
||||
if (!target) return;
|
||||
target.lastAttacker = p.uid;
|
||||
const msg = { t: "garbage", from: p.uid, lines: send };
|
||||
if (target.connected) this.send(target.uid, msg);
|
||||
else target.pendingGarbage.push(msg);
|
||||
this.broadcast({ t: "attack", from: p.uid, to: target.uid, lines: send }, target.uid);
|
||||
}
|
||||
|
||||
pickTarget(p) {
|
||||
const others = this.alive.filter((o) => o.uid !== p.uid);
|
||||
if (!others.length) return null;
|
||||
if (others.length === 1) return others[0];
|
||||
if (p.target) {
|
||||
const t = this.players.get(p.target);
|
||||
if (t && t.inRound && t.alive) return t;
|
||||
p.target = null;
|
||||
}
|
||||
const now = this.now();
|
||||
let t = p.autoTarget && this.players.get(p.autoTarget);
|
||||
if (!t || !t.alive || !t.inRound || now - p.autoTargetAt >= AUTO_TARGET_MS) {
|
||||
t = others[Math.floor(this.rand() * others.length)];
|
||||
p.autoTarget = t.uid;
|
||||
p.autoTargetAt = now;
|
||||
this.send(p.uid, { t: "targeting", id: t.uid, manual: false });
|
||||
}
|
||||
return t;
|
||||
}
|
||||
|
||||
onBoard(p, m) {
|
||||
if (!p.inRound) return;
|
||||
const grid = m.grid;
|
||||
if (typeof grid !== "string" || grid.length !== BOARD_W * BOARD_ROWS || !BOARD_RE.test(grid)) return;
|
||||
p.grid = grid;
|
||||
const now = this.now();
|
||||
// 인원이 많을수록 브로드캐스트 주기를 늘린다 (§14.1).
|
||||
const minGap = 150 * Math.max(1, Math.ceil(this.connected.length / 6));
|
||||
if (now - p.lastBoardAt < minGap && !m.lock) return;
|
||||
p.lastBoardAt = now;
|
||||
this.broadcast({ t: "board", id: p.uid, grid, pending: m.pending ?? 0 }, p.uid);
|
||||
}
|
||||
|
||||
topout(uid) {
|
||||
const p = this.players.get(uid);
|
||||
if (!p || !p.alive) return;
|
||||
const aliveBefore = this.alive.length;
|
||||
p.alive = false;
|
||||
p.place = aliveBefore;
|
||||
this.broadcast({ t: "ko", who: uid, by: p.lastAttacker, place: p.place });
|
||||
const left = this.alive;
|
||||
if (left.length <= 1) this.endRound(left[0] ?? null);
|
||||
else this.broadcast(this.lobbyMsg()); // 생존 인원·KO 표시 갱신
|
||||
}
|
||||
|
||||
endRound(winner) {
|
||||
if (winner) {
|
||||
winner.wins += 1;
|
||||
winner.place = 1;
|
||||
}
|
||||
const score = Object.fromEntries(this.order.map((u) => [u, this.players.get(u).wins]));
|
||||
this.broadcast({ t: "round_end", n: this.round, winner: winner?.uid ?? null, score });
|
||||
const ft = this.ftTarget();
|
||||
if (ft > 0 && winner && winner.wins >= ft) {
|
||||
this.endMatch(winner.uid);
|
||||
return;
|
||||
}
|
||||
this.phase = "between";
|
||||
this.nextRoundAt = this.now() + ROUND_GAP_MS;
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
|
||||
standings() {
|
||||
return [...this.players.values()]
|
||||
.filter((p) => p.wins > 0 || p.inRound)
|
||||
.sort((a, b) => b.wins - a.wins)
|
||||
.map((p, i) => ({ id: p.uid, nick: p.nick, wins: p.wins, rank: i + 1 }));
|
||||
}
|
||||
|
||||
endMatch(winnerUid) {
|
||||
this.phase = "match_end";
|
||||
this.nextRoundAt = 0;
|
||||
const standings = this.standings();
|
||||
if (this.kind === "league") {
|
||||
this.finished = true;
|
||||
const [a, b] = this.allowed;
|
||||
const loser = winnerUid === a ? b : a;
|
||||
this.effects.push({
|
||||
type: "league_end", winner: winnerUid, loser,
|
||||
score: { [a]: this.players.get(a)?.wins ?? 0, [b]: this.players.get(b)?.wins ?? 0 },
|
||||
});
|
||||
// match_end 메시지는 레이팅 반영 후 래퍼가 trDelta 를 붙여 보낸다.
|
||||
} else {
|
||||
this.effects.push({ type: "custom_end", standings, size: this.order.length });
|
||||
const msg = { t: "match_end", result: standings, winner: winnerUid };
|
||||
this.lastEnd = { "*": msg };
|
||||
this.broadcast(msg);
|
||||
this.broadcastRematch();
|
||||
}
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
|
||||
forfeit(uid) {
|
||||
if (this.finished) return;
|
||||
const other = this.allowed.find((u) => u !== uid);
|
||||
const o = this.players.get(other);
|
||||
if (o) o.wins = Math.max(o.wins, this.rules.ft);
|
||||
const me = this.players.get(uid);
|
||||
if (me) me.alive = false;
|
||||
this.broadcast({ t: "ko", who: uid, by: null, place: 2, forfeit: true });
|
||||
this.endMatch(other);
|
||||
}
|
||||
|
||||
resetWins() {
|
||||
this.lastEnd = null;
|
||||
for (const p of this.players.values()) {
|
||||
p.wins = 0;
|
||||
p.rematch = false;
|
||||
}
|
||||
this.round = 0;
|
||||
}
|
||||
|
||||
toLobby() {
|
||||
this.phase = "lobby";
|
||||
this.nextRoundAt = 0;
|
||||
for (const p of this.players.values()) {
|
||||
p.inRound = false;
|
||||
p.alive = false;
|
||||
}
|
||||
this.broadcast(this.lobbyMsg());
|
||||
}
|
||||
|
||||
onRematch(p, vote) {
|
||||
if (this.kind !== "custom" || this.phase !== "match_end") return;
|
||||
p.rematch = vote;
|
||||
this.broadcastRematch();
|
||||
const conn = this.connected;
|
||||
const votes = conn.filter((x) => x.rematch).length;
|
||||
if (votes * 2 > conn.length && conn.length >= 2) {
|
||||
this.resetWins();
|
||||
this.startRound();
|
||||
}
|
||||
}
|
||||
|
||||
broadcastRematch() {
|
||||
const conn = this.connected;
|
||||
this.broadcast({
|
||||
t: "rematch_state",
|
||||
votes: conn.filter((x) => x.rematch).map((x) => x.uid),
|
||||
needed: Math.floor(conn.length / 2) + 1,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function pickInfo(info) {
|
||||
const o = {};
|
||||
for (const k of ["nick", "guest", "tr", "rank", "badge"]) if (k in info) o[k] = info[k];
|
||||
return o;
|
||||
}
|
||||
185
server/src/room.js
Normal file
185
server/src/room.js
Normal file
@@ -0,0 +1,185 @@
|
||||
// GameRoomDO — 경기당 1개 (리그 1:1 & 커스텀 N인 공용). WebSocket Hibernation 사용.
|
||||
import { DurableObject } from "cloudflare:workers";
|
||||
import { RoomLogic } from "./room-logic.js";
|
||||
import { DEFAULT_RULES, sanitizeRules } from "./rules.js";
|
||||
import { applyLeagueResult, recordCustom } from "./db.js";
|
||||
|
||||
const QUIET = new Set(["board", "attack", "ping"]);
|
||||
|
||||
export class GameRoomDO extends DurableObject {
|
||||
constructor(ctx, env) {
|
||||
super(ctx, env);
|
||||
this.logic = null;
|
||||
// 클라이언트 keepalive: DO 를 깨우지 않고 런타임이 바로 응답한다.
|
||||
ctx.setWebSocketAutoResponse(new WebSocketRequestResponsePair('{"t":"ping"}', '{"t":"pong"}'));
|
||||
}
|
||||
|
||||
async load() {
|
||||
if (this.logic) return this.logic;
|
||||
const j = await this.ctx.storage.get("room");
|
||||
if (j) this.logic = RoomLogic.fromJSON(j);
|
||||
return this.logic;
|
||||
}
|
||||
|
||||
async save() {
|
||||
if (this.logic) await this.ctx.storage.put("room", this.logic.toJSON());
|
||||
}
|
||||
|
||||
async fetch(req) {
|
||||
const url = new URL(req.url);
|
||||
if (url.pathname === "/init") {
|
||||
const body = await req.json();
|
||||
const cur = await this.load();
|
||||
if (cur && cur.players.size > 0) return Response.json({ ok: false, reason: "exists" }, { status: 409 });
|
||||
this.logic = new RoomLogic({
|
||||
id: body.id, kind: body.kind, code: body.code ?? null, allowed: body.allowed ?? null, ft: body.ft,
|
||||
});
|
||||
if (body.kind === "custom") this.logic.rules = sanitizeRules(body.rules ?? {}, DEFAULT_RULES);
|
||||
this.logic.matchId = crypto.randomUUID();
|
||||
this.logic.createdAt = Date.now();
|
||||
await this.save();
|
||||
// 아무도 안 들어오면 10분 뒤 정리
|
||||
await this.ctx.storage.setAlarm(Date.now() + 10 * 60_000);
|
||||
return Response.json({ ok: true });
|
||||
}
|
||||
if (url.pathname === "/info") {
|
||||
const l = await this.load();
|
||||
if (!l || l.finished) return Response.json({ exists: false });
|
||||
return Response.json({ exists: true, kind: l.kind, players: l.players.size, phase: l.phase, rules: l.rules });
|
||||
}
|
||||
if (url.pathname === "/ws") {
|
||||
if (req.headers.get("Upgrade") !== "websocket") return new Response("websocket only", { status: 426 });
|
||||
const l = await this.load();
|
||||
if (!l) return new Response("no such room", { status: 404 });
|
||||
const uid = req.headers.get("x-uid");
|
||||
const info = JSON.parse(decodeURIComponent(req.headers.get("x-info") || "%7B%7D"));
|
||||
const pair = new WebSocketPair();
|
||||
const [client, server] = Object.values(pair);
|
||||
// 같은 유저의 이전 소켓은 정리 (재접속)
|
||||
for (const old of this.ctx.getWebSockets(uid)) {
|
||||
try {
|
||||
old.serializeAttachment({ uid, replaced: true });
|
||||
old.close(4000, "replaced");
|
||||
} catch {}
|
||||
}
|
||||
this.ctx.acceptWebSocket(server, [uid]);
|
||||
server.serializeAttachment({ uid });
|
||||
const res = l.join(uid, info);
|
||||
if (!res.ok) {
|
||||
server.send(JSON.stringify({ t: "error", msg: res.reason, fatal: true }));
|
||||
server.close(4001, "rejected");
|
||||
}
|
||||
await this.flush();
|
||||
return new Response(null, { status: 101, webSocket: client });
|
||||
}
|
||||
return new Response("not found", { status: 404 });
|
||||
}
|
||||
|
||||
async webSocketMessage(ws, data) {
|
||||
const l = await this.load();
|
||||
const att = ws.deserializeAttachment();
|
||||
if (!l || !att || att.replaced) return;
|
||||
let m;
|
||||
try {
|
||||
m = JSON.parse(typeof data === "string" ? data : new TextDecoder().decode(data));
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
l.handle(att.uid, m);
|
||||
await this.flush(!QUIET.has(m.t));
|
||||
}
|
||||
|
||||
async webSocketClose(ws) {
|
||||
await this.onGone(ws);
|
||||
}
|
||||
|
||||
async webSocketError(ws) {
|
||||
await this.onGone(ws);
|
||||
}
|
||||
|
||||
async onGone(ws) {
|
||||
const l = await this.load();
|
||||
const att = ws.deserializeAttachment();
|
||||
if (!l || !att || att.replaced) return;
|
||||
const others = this.ctx.getWebSockets(att.uid).filter((s) => s !== ws && s.readyState === 1);
|
||||
if (!others.length) l.disconnect(att.uid);
|
||||
await this.flush();
|
||||
}
|
||||
|
||||
async alarm() {
|
||||
const l = await this.load();
|
||||
if (!l) return;
|
||||
if (l.players.size === 0) {
|
||||
await this.ctx.storage.deleteAll();
|
||||
this.logic = null;
|
||||
return;
|
||||
}
|
||||
l.tick();
|
||||
await this.flush();
|
||||
}
|
||||
|
||||
/** outbox 전송 + effects 처리 + 저장 + 다음 알람. */
|
||||
async flush(persist = true) {
|
||||
const l = this.logic;
|
||||
if (!l) return;
|
||||
// 효과를 먼저 처리해야 match_end(trDelta 포함)가 순서대로 나간다.
|
||||
for (let guard = 0; guard < 4; guard++) {
|
||||
const { out, effects } = l.drain();
|
||||
this.deliver(out);
|
||||
if (!effects.length) break;
|
||||
for (const e of effects) await this.applyEffect(l, e);
|
||||
}
|
||||
if (persist) await this.save();
|
||||
const wake = l.nextWake();
|
||||
if (l.players.size === 0) {
|
||||
await this.ctx.storage.setAlarm(Date.now() + 60_000);
|
||||
} else if (wake) {
|
||||
await this.ctx.storage.setAlarm(wake);
|
||||
}
|
||||
}
|
||||
|
||||
deliver(out) {
|
||||
if (!out.length) return;
|
||||
const sockets = this.ctx.getWebSockets();
|
||||
for (const o of out) {
|
||||
const payload = JSON.stringify(o.msg);
|
||||
for (const ws of sockets) {
|
||||
const att = ws.deserializeAttachment();
|
||||
if (!att || att.replaced) continue;
|
||||
if (o.to !== null && att.uid !== o.to) continue;
|
||||
if (o.except && att.uid === o.except) continue;
|
||||
try {
|
||||
ws.send(payload);
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async applyEffect(l, e) {
|
||||
const db = this.env.DB;
|
||||
if (e.type === "league_end") {
|
||||
let result = null;
|
||||
try {
|
||||
result = await applyLeagueResult(db, { matchId: l.matchId, winner: e.winner, loser: e.loser, score: e.score });
|
||||
} catch (err) {
|
||||
console.error("league_end failed", err);
|
||||
}
|
||||
l.lastEnd = {};
|
||||
for (const uid of [e.winner, e.loser]) {
|
||||
const msg = {
|
||||
t: "match_end", winner: e.winner, score: e.score,
|
||||
trDelta: result?.[uid]?.trDelta ?? null, before: result?.[uid]?.before ?? null, after: result?.[uid]?.after ?? null,
|
||||
};
|
||||
l.lastEnd[uid] = msg;
|
||||
l.send(uid, msg);
|
||||
}
|
||||
} else if (e.type === "custom_end") {
|
||||
try {
|
||||
await recordCustom(db, { matchId: l.matchId, standings: e.standings, size: e.size });
|
||||
} catch (err) {
|
||||
console.error("custom_end failed", err);
|
||||
}
|
||||
l.matchId = crypto.randomUUID(); // 리매치는 새 경기
|
||||
}
|
||||
}
|
||||
}
|
||||
146
server/src/rules.js
Normal file
146
server/src/rules.js
Normal file
@@ -0,0 +1,146 @@
|
||||
// TETRIG 서버 공용 규칙·튜닝 상수 (명세서 §6~§9).
|
||||
// 튜닝 대상 수치는 전부 여기 모아 둔다. 클라이언트(Kotlin)의 Versus.kt 와 값이 같아야 한다.
|
||||
|
||||
export const BRAND = "TETRIG";
|
||||
export const BRAND_KO = "테트리그";
|
||||
|
||||
// ── 대전 (§6) ────────────────────────────────────────────────────
|
||||
export const ATTACK = {
|
||||
lines: [0, 0, 1, 2, 4], // Single/Double/Triple/Quad
|
||||
tspinMini: [0, 1], // Mini(0줄) / Mini Single
|
||||
tspin: [0, 2, 4, 6], // T-spin 0/Single/Double/Triple
|
||||
b2bBonus: 1,
|
||||
allClear: 5,
|
||||
combo: [1, 1, 2, 2, 3, 3, 4, 4, 4, 5], // 콤보 2부터(combo 인덱스 1부터), 이후 5 고정
|
||||
};
|
||||
export const GARBAGE_MAX_PER_INSERT = 8;
|
||||
export const GARBAGE_SAME_HOLE_CHANCE = 0.7;
|
||||
export const OVERTIME_START_MS = 90_000;
|
||||
export const OVERTIME_STEP_MS = 30_000;
|
||||
export const OVERTIME_STEP = 0.25;
|
||||
export const AUTO_TARGET_MS = 8_000;
|
||||
export const RECONNECT_GRACE_MS = 15_000;
|
||||
export const ROUND_COUNTDOWN_MS = 3_000;
|
||||
export const ROUND_GAP_MS = 4_000;
|
||||
|
||||
// 최소 안티치트 (§14.1)
|
||||
export const MAX_PPS = 5.0;
|
||||
// 한 피스로 낼 수 있는 이론상 최대치: T-spin Triple 6 + B2B 1 + AC 5 + 콤보 5 = 17
|
||||
export const MAX_ATTACK_PER_PIECE = 17;
|
||||
|
||||
/**
|
||||
* 한 번의 락 결과로 보낼 줄 수 (상쇄 전).
|
||||
* combo: 연속 클리어 인덱스 (0 = 첫 클리어, 1 = 콤보 2번째 …). b2b: 연속 어려운 클리어 인덱스.
|
||||
*/
|
||||
export function attackFor({ lines, tspin = "none", allClear = false, combo = -1, b2b = -1, difficult = false }) {
|
||||
if (lines <= 0) return 0;
|
||||
let n;
|
||||
if (tspin === "tspin") n = ATTACK.tspin[Math.min(lines, 3)];
|
||||
else if (tspin === "mini") n = ATTACK.tspinMini[Math.min(lines, 1)];
|
||||
else n = ATTACK.lines[Math.min(lines, 4)];
|
||||
if (difficult && b2b >= 1) n += ATTACK.b2bBonus;
|
||||
if (combo >= 1) n += ATTACK.combo[Math.min(combo - 1, ATTACK.combo.length - 1)];
|
||||
if (allClear) n += ATTACK.allClear;
|
||||
return n;
|
||||
}
|
||||
|
||||
/** 장기전 배율: 90초 후 30초마다 +25%. */
|
||||
export function overtimeMultiplier(elapsedMs, enabled = true) {
|
||||
if (!enabled || elapsedMs < OVERTIME_START_MS) return 1;
|
||||
return 1 + OVERTIME_STEP * (1 + Math.floor((elapsedMs - OVERTIME_START_MS) / OVERTIME_STEP_MS));
|
||||
}
|
||||
|
||||
// ── 커스텀 룸 (§7) ───────────────────────────────────────────────
|
||||
export const ROOM_CODE_CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"; // I/1/O/0 제외
|
||||
export const ROOM_CODE_LEN = 6;
|
||||
export const DEFAULT_RULES = Object.freeze({
|
||||
garbageMul: 1.0, // 0.5 ~ 2.0
|
||||
ft: 0, // 0 = 무제한, 1/3/5
|
||||
sameBag: false, // true = 동일 bag 공정전
|
||||
overtime: true,
|
||||
});
|
||||
|
||||
export function sanitizeRules(input = {}, base = DEFAULT_RULES) {
|
||||
const r = { ...base };
|
||||
if (typeof input.garbageMul === "number") r.garbageMul = Math.min(2, Math.max(0.5, Math.round(input.garbageMul * 4) / 4));
|
||||
if ([0, 1, 3, 5].includes(input.ft)) r.ft = input.ft;
|
||||
if (typeof input.sameBag === "boolean") r.sameBag = input.sameBag;
|
||||
if (typeof input.overtime === "boolean") r.overtime = input.overtime;
|
||||
return r;
|
||||
}
|
||||
|
||||
export function randomRoomCode(rand = Math.random) {
|
||||
let s = "";
|
||||
for (let i = 0; i < ROOM_CODE_LEN; i++) s += ROOM_CODE_CHARS[Math.floor(rand() * ROOM_CODE_CHARS.length)];
|
||||
return s;
|
||||
}
|
||||
|
||||
export function isRoomCode(s) {
|
||||
return typeof s === "string" && s.length === ROOM_CODE_LEN && [...s].every((c) => ROOM_CODE_CHARS.includes(c));
|
||||
}
|
||||
|
||||
// ── 리그 (§8) ────────────────────────────────────────────────────
|
||||
export const GLICKO = { R: 1500, RD: 350, VOL: 0.06, TAU: 0.5, RD_MIN: 58, RD_MAX: 350 };
|
||||
export const TR_MID = 1600;
|
||||
export const TR_SCALE = 300;
|
||||
export const PLACEMENT_GAMES = 10;
|
||||
export const RANK_VISIBLE_RD = 100;
|
||||
export const RD_DECAY_IDLE_DAYS = 7;
|
||||
export const RD_DECAY_PER_DAY = 1;
|
||||
export const SEASON_LENGTH_DAYS = 61; // 약 2개월 (§17 기본 제안값)
|
||||
|
||||
export const RANKS = [
|
||||
["D", 0], ["D+", 800], ["C-", 1400], ["C", 2000], ["C+", 2600], ["B-", 3300], ["B", 4000], ["B+", 4800],
|
||||
["A-", 5700], ["A", 6700], ["A+", 7800], ["S-", 9200], ["S", 10800], ["S+", 12400], ["SS", 14200],
|
||||
["U", 16500], ["X", 19500], ["X+", 22500],
|
||||
];
|
||||
|
||||
export function trFor(R, RD) {
|
||||
return Math.round(25000 / (1 + Math.pow(10, (TR_MID - (R - RD)) / TR_SCALE)));
|
||||
}
|
||||
|
||||
export function rankFor(tr) {
|
||||
let r = RANKS[0][0];
|
||||
for (const [name, cut] of RANKS) if (tr >= cut) r = name;
|
||||
return r;
|
||||
}
|
||||
|
||||
/** 경기 형식: 높은 쪽 랭크가 S- 이상이면 FT5, 아니면 FT3. */
|
||||
export function leagueFt(trA, trB) {
|
||||
const sMinus = RANKS.find(([n]) => n === "S-")[1];
|
||||
return Math.max(trA, trB) >= sMinus ? 5 : 3;
|
||||
}
|
||||
|
||||
// 매치메이킹 (§8.3)
|
||||
export const MM_WINDOW_RD = 2;
|
||||
export const MM_EXPAND_EVERY_MS = 30_000;
|
||||
export const MM_EXPAND_FACTOR = 1.2;
|
||||
export const MM_HINT_AFTER_MS = 120_000;
|
||||
|
||||
// ── 계정 (§9) ────────────────────────────────────────────────────
|
||||
export const GUEST_ADJ = [
|
||||
"재빠른", "용감한", "조용한", "빛나는", "날쌘", "느긋한", "단단한", "엉뚱한", "반짝이는", "졸린",
|
||||
"배고픈", "씩씩한", "수상한", "깜찍한", "똑똑한", "푸른", "붉은", "하얀", "검은", "노란",
|
||||
];
|
||||
export const GUEST_NOUN = [
|
||||
"미노", "블록", "벽돌", "큐브", "타일", "조각", "기둥", "탑", "망치", "번개",
|
||||
"여우", "고양이", "펭귄", "수달", "다람쥐", "부엉이", "판다", "고래", "참새", "두더지",
|
||||
];
|
||||
export function randomGuestName(rand = Math.random) {
|
||||
const a = GUEST_ADJ[Math.floor(rand() * GUEST_ADJ.length)];
|
||||
const n = GUEST_NOUN[Math.floor(rand() * GUEST_NOUN.length)];
|
||||
const d = String(Math.floor(rand() * 1000)).padStart(3, "0");
|
||||
return a + n + d;
|
||||
}
|
||||
/** 게스트명 패턴은 시스템 예약 — 로그인 유저가 이 모양의 닉으로 바꿀 수 없다. */
|
||||
export function looksLikeGuestName(s) {
|
||||
const m = /^(.+?)(\d{3})$/.exec(s);
|
||||
if (!m) return false;
|
||||
return GUEST_ADJ.some((a) => m[1].startsWith(a) && GUEST_NOUN.includes(m[1].slice(a.length)));
|
||||
}
|
||||
export const NICK_RE = /^[가-힣A-Za-z0-9_]{2,12}$/;
|
||||
export const NICK_COOLDOWN_MS = 30 * 24 * 3600 * 1000;
|
||||
export const TOKEN_TTL_MS = 30 * 24 * 3600 * 1000;
|
||||
export const PBKDF2_ITER = 100_000;
|
||||
|
||||
export const SOLO_MODES = ["sprint", "time", "endless"];
|
||||
227
server/src/shop.js
Normal file
227
server/src/shop.js
Normal file
@@ -0,0 +1,227 @@
|
||||
// 시즌 패스 XP · 꾸미기 아이템 · Play 결제 처리.
|
||||
import { getSeason } from "./db.js";
|
||||
import { playVerifyConfigured, verifyPlayPurchase } from "./play.js";
|
||||
|
||||
export const PRODUCTS = {
|
||||
remove_ads: { consumable: false, items: [] },
|
||||
supporter_pack: { consumable: false, items: ["skin:supporter", "badge:supporter"] },
|
||||
season_pass: { consumable: true, items: [] },
|
||||
};
|
||||
|
||||
export const PASS = {
|
||||
XP_PER_LEVEL: 100,
|
||||
MAX_LEVEL: 30,
|
||||
SOLO_XP: 10,
|
||||
SOLO_MIN_GAP_MS: 20_000, // 솔로 XP 는 20초에 한 번만 (빈 판 연타 방지)
|
||||
CUSTOM_XP: 20,
|
||||
CUSTOM_WIN_XP: 10,
|
||||
LEAGUE_XP: 25,
|
||||
LEAGUE_WIN_XP: 15,
|
||||
};
|
||||
|
||||
// {n} 은 시즌 번호. 아이템 ID 는 앱 Catalog 와 같아야 한다.
|
||||
const TIERS = [
|
||||
{ level: 1, premium: "board:oxide" },
|
||||
{ level: 5, free: "skin:chalk" },
|
||||
{ level: 8, premium: "skin:outline" },
|
||||
{ level: 12, free: "board:nogrid" },
|
||||
{ level: 15, premium: "skin:signal" },
|
||||
{ level: 20, free: "skin:mono" },
|
||||
{ level: 22, premium: "board:moss" },
|
||||
{ level: 25, premium: "badge:s{n}_pass" },
|
||||
{ level: 30, free: "badge:s{n}_finish", premium: "badge:s{n}_elite" },
|
||||
];
|
||||
|
||||
export function passTiers(season) {
|
||||
const sub = (x) => (x ? x.replace("{n}", String(season)) : null);
|
||||
return TIERS.map((t) => ({ level: t.level, free: sub(t.free), premium: sub(t.premium) }));
|
||||
}
|
||||
|
||||
export const levelFor = (xp) => Math.min(PASS.MAX_LEVEL, Math.floor(Math.max(0, xp) / PASS.XP_PER_LEVEL) + 1);
|
||||
|
||||
/** (fromLevel, toLevel] 구간에서 새로 받는 보상. premium 이면 프리미엄 트랙 포함. */
|
||||
export function rewardsBetween(season, fromLevel, toLevel, premium) {
|
||||
const out = [];
|
||||
for (const t of passTiers(season)) {
|
||||
if (t.level <= fromLevel || t.level > toLevel) continue;
|
||||
if (t.free) out.push(t.free);
|
||||
if (premium && t.premium) out.push(t.premium);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** 프리미엄을 산 순간: 지금 레벨까지의 프리미엄 보상을 한꺼번에. */
|
||||
export function premiumBackfill(season, level) {
|
||||
return passTiers(season).filter((t) => t.premium && t.level <= level).map((t) => t.premium);
|
||||
}
|
||||
|
||||
async function grantItems(db, uid, items, source, now = Date.now()) {
|
||||
if (!items.length) return;
|
||||
await db.batch(
|
||||
items.map((it) =>
|
||||
db.prepare("INSERT OR IGNORE INTO user_items(user_id, item, source, created_at) VALUES (?, ?, ?, ?)").bind(uid, it, source, now),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
async function passRow(db, uid, season) {
|
||||
return (await db.prepare("SELECT * FROM season_xp WHERE user_id = ? AND season = ?").bind(uid, season).first()) ?? {
|
||||
user_id: uid, season, xp: 0, premium: 0, last_solo_at: null,
|
||||
};
|
||||
}
|
||||
|
||||
/** XP 를 더하고, 새로 닿은 레벨의 보상을 준다. 반환 { xp, level, gained:[아이템] } */
|
||||
export async function awardXp(db, uid, amount, now = Date.now(), { solo = false } = {}) {
|
||||
const season = (await getSeason(db, now)).n;
|
||||
const row = await passRow(db, uid, season);
|
||||
if (solo && row.last_solo_at && now - row.last_solo_at < PASS.SOLO_MIN_GAP_MS) {
|
||||
return { xp: row.xp, level: levelFor(row.xp), gained: [], throttled: true };
|
||||
}
|
||||
const xp = row.xp + amount;
|
||||
await db
|
||||
.prepare(
|
||||
`INSERT INTO season_xp(user_id, season, xp, premium, last_solo_at) VALUES (?1, ?2, ?3, 0, ?4)
|
||||
ON CONFLICT(user_id, season) DO UPDATE SET xp = xp + ?5, last_solo_at = COALESCE(?4, last_solo_at)`,
|
||||
)
|
||||
.bind(uid, season, xp, solo ? now : null, amount)
|
||||
.run();
|
||||
const gained = rewardsBetween(season, levelFor(row.xp), levelFor(xp), !!row.premium);
|
||||
await grantItems(db, uid, gained, `pass:s${season}`, now);
|
||||
return { xp, level: levelFor(xp), gained };
|
||||
}
|
||||
|
||||
export async function passView(db, env, uid, { local = false } = {}) {
|
||||
const s = await getSeason(db);
|
||||
const row = await passRow(db, uid, s.n);
|
||||
return {
|
||||
season: s.n,
|
||||
endsAt: s.endsAt,
|
||||
xp: row.xp,
|
||||
level: levelFor(row.xp),
|
||||
maxLevel: PASS.MAX_LEVEL,
|
||||
xpPerLevel: PASS.XP_PER_LEVEL,
|
||||
premium: !!row.premium,
|
||||
purchasable: playVerifyConfigured(env, local),
|
||||
tiers: passTiers(s.n),
|
||||
};
|
||||
}
|
||||
|
||||
export async function userItems(db, uid) {
|
||||
const { results } = await db.prepare("SELECT item FROM user_items WHERE user_id = ? ORDER BY item").bind(uid).all();
|
||||
return results.map((r) => r.item);
|
||||
}
|
||||
|
||||
/** 장착 배지 검증: 가진 배지만. null 이면 해제. */
|
||||
export async function equipBadge(db, uid, badge) {
|
||||
if (badge === null || badge === undefined || badge === "") {
|
||||
await db.prepare("UPDATE users SET badge = NULL WHERE id = ?").bind(uid).run();
|
||||
return null;
|
||||
}
|
||||
if (typeof badge !== "string" || !/^[a-z0-9_]{1,24}$/.test(badge)) return "잘못된 배지입니다";
|
||||
const own = await db.prepare("SELECT 1 FROM user_items WHERE user_id = ? AND item = ?").bind(uid, `badge:${badge}`).first();
|
||||
if (!own) return "가지고 있지 않은 배지입니다";
|
||||
await db.prepare("UPDATE users SET badge = ? WHERE id = ?").bind(badge, uid).run();
|
||||
return null;
|
||||
}
|
||||
|
||||
/** 배지를 잃었으면(구매 이전 등) 장착도 푼다. */
|
||||
async function dropLostBadge(db, uid) {
|
||||
await db
|
||||
.prepare(
|
||||
`UPDATE users SET badge = NULL WHERE id = ?1 AND badge IS NOT NULL
|
||||
AND NOT EXISTS (SELECT 1 FROM user_items WHERE user_id = ?1 AND item = 'badge:' || users.badge)`,
|
||||
)
|
||||
.bind(uid)
|
||||
.run();
|
||||
}
|
||||
|
||||
/**
|
||||
* Play 구매 확인 → 권한 부여. 반환 { status, body }.
|
||||
* - 200 { ok, consume, items } : 적용됨 (consume=true 면 클라이언트가 소비해도 된다)
|
||||
* - 409 : 이미 다른 계정에 적용된 시즌 패스 / 이번 시즌 패스를 이미 가짐 (소비하지 말 것)
|
||||
* - 410 : 취소·환불된 구매, 400 : 잘못된 요청, 425 : 결제 대기 중, 503 : 확인 서버 미설정·Google 오류
|
||||
*/
|
||||
export async function applyPurchase(db, env, uid, productId, token, { now = Date.now(), local = false } = {}) {
|
||||
const prod = PRODUCTS[productId];
|
||||
if (!prod || typeof token !== "string" || token.length < 10 || token.length > 4096) {
|
||||
return { status: 400, body: { error: "잘못된 구매 정보입니다" } };
|
||||
}
|
||||
if (!playVerifyConfigured(env, local)) return { status: 503, body: { error: "결제 확인 서버가 아직 준비되지 않았습니다" } };
|
||||
|
||||
const existing = await db.prepare("SELECT * FROM purchases WHERE token = ?").bind(token).first();
|
||||
if (existing && existing.product !== productId) return { status: 400, body: { error: "잘못된 구매 정보입니다" } };
|
||||
if (existing && existing.user_id === uid) {
|
||||
return { status: 200, body: { ok: true, consume: prod.consumable, items: await userItems(db, uid) } };
|
||||
}
|
||||
if (existing && prod.consumable) return { status: 409, body: { error: "이미 다른 계정에 적용된 구매입니다" } };
|
||||
|
||||
let v;
|
||||
try {
|
||||
v = await verifyPlayPurchase(env, productId, token, { local });
|
||||
} catch (e) {
|
||||
console.error("play verify", e);
|
||||
return { status: 503, body: { error: "결제 확인에 실패했습니다. 잠시 뒤 자동으로 다시 시도합니다" } };
|
||||
}
|
||||
if (!v.valid) return { status: 400, body: { error: "확인할 수 없는 구매입니다" } };
|
||||
if (v.purchaseState === 2) return { status: 425, body: { error: "결제 대기 중입니다" } };
|
||||
if (v.purchaseState !== 0) return { status: 410, body: { error: "취소되었거나 환불된 구매입니다" } };
|
||||
|
||||
const season = (await getSeason(db, now)).n;
|
||||
const src = `purchase:${token.slice(0, 24)}`;
|
||||
|
||||
if (prod.consumable) {
|
||||
if (v.consumptionState === 1) return { status: 410, body: { error: "이미 사용된 구매입니다" } };
|
||||
const row = await passRow(db, uid, season);
|
||||
if (row.premium) return { status: 409, body: { error: "이번 시즌 패스를 이미 가지고 있습니다. 이 구매는 다음 시즌에 적용됩니다" } };
|
||||
await db.batch([
|
||||
db.prepare("INSERT INTO purchases(token, user_id, product, order_id, season, created_at) VALUES (?, ?, ?, ?, ?, ?)")
|
||||
.bind(token, uid, productId, v.orderId, season, now),
|
||||
db.prepare(
|
||||
`INSERT INTO season_xp(user_id, season, xp, premium) VALUES (?1, ?2, 0, 1)
|
||||
ON CONFLICT(user_id, season) DO UPDATE SET premium = 1`,
|
||||
).bind(uid, season),
|
||||
]);
|
||||
await grantItems(db, uid, premiumBackfill(season, levelFor(row.xp)), `pass:s${season}`, now);
|
||||
} else {
|
||||
if (existing) {
|
||||
// 같은 Google 계정의 비소모성 구매를 다른 게임 계정에서 복원 → 가장 최근 계정으로 옮긴다 (동시 공유 방지).
|
||||
await db.batch([
|
||||
db.prepare("DELETE FROM user_items WHERE user_id = ? AND source = ?").bind(existing.user_id, src),
|
||||
db.prepare("UPDATE purchases SET user_id = ?, created_at = ? WHERE token = ?").bind(uid, now, token),
|
||||
]);
|
||||
await dropLostBadge(db, existing.user_id);
|
||||
} else {
|
||||
await db
|
||||
.prepare("INSERT INTO purchases(token, user_id, product, order_id, season, created_at) VALUES (?, ?, ?, ?, NULL, ?)")
|
||||
.bind(token, uid, productId, v.orderId, now)
|
||||
.run();
|
||||
}
|
||||
await grantItems(db, uid, prod.items, src, now);
|
||||
}
|
||||
return { status: 200, body: { ok: true, consume: prod.consumable, items: await userItems(db, uid) } };
|
||||
}
|
||||
|
||||
/** 게스트 → 계정 병합 때 시즌 패스·아이템·구매를 옮긴다 (db.mergeGuestInto 에서 호출). */
|
||||
export function mergeShopStatements(db, guestId, userId) {
|
||||
return [
|
||||
db.prepare(
|
||||
`INSERT INTO season_xp(user_id, season, xp, premium, last_solo_at)
|
||||
SELECT ?2, season, xp, premium, last_solo_at FROM season_xp WHERE user_id = ?1 AND true
|
||||
ON CONFLICT(user_id, season) DO UPDATE SET xp = season_xp.xp + excluded.xp, premium = MAX(season_xp.premium, excluded.premium)`,
|
||||
).bind(guestId, userId),
|
||||
db.prepare("INSERT OR IGNORE INTO user_items(user_id, item, source, created_at) SELECT ?2, item, source, created_at FROM user_items WHERE user_id = ?1")
|
||||
.bind(guestId, userId),
|
||||
db.prepare("UPDATE purchases SET user_id = ?2 WHERE user_id = ?1").bind(guestId, userId),
|
||||
db.prepare("DELETE FROM season_xp WHERE user_id = ?").bind(guestId),
|
||||
db.prepare("DELETE FROM user_items WHERE user_id = ?").bind(guestId),
|
||||
];
|
||||
}
|
||||
|
||||
export function deleteShopStatements(db, uid) {
|
||||
return [
|
||||
db.prepare("DELETE FROM season_xp WHERE user_id = ?").bind(uid),
|
||||
db.prepare("DELETE FROM user_items WHERE user_id = ?").bind(uid),
|
||||
// 구매 기록을 지워야 같은 Google 계정으로 새 게임 계정에 다시 복원할 수 있다.
|
||||
db.prepare("DELETE FROM purchases WHERE user_id = ?").bind(uid),
|
||||
];
|
||||
}
|
||||
192
server/test/room.test.js
Normal file
192
server/test/room.test.js
Normal file
@@ -0,0 +1,192 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { RoomLogic } from "../src/room-logic.js";
|
||||
|
||||
function mkRoom(kind = "custom", extra = {}) {
|
||||
let t = 1_000_000;
|
||||
const clock = { now: () => t, adv: (ms) => (t += ms) };
|
||||
let seed = 1;
|
||||
const rand = () => ((seed = (seed * 16807) % 2147483647) / 2147483647);
|
||||
const r = new RoomLogic({ id: "R", kind, code: "ABCDEF", now: clock.now, rand, ...extra });
|
||||
return { r, clock };
|
||||
}
|
||||
const msgs = (r, uid, type) => r.drain().out.filter((o) => (o.to === null ? o.except !== uid : o.to === uid) && (!type || o.msg.t === type)).map((o) => o.msg);
|
||||
const startPlaying = (r, clock) => { r.handle(r.host, { t: "start" }); clock.adv(3001); r.tick(); };
|
||||
|
||||
test("커스텀 1:1: 호스트 시작 → 가비지 → 톱아웃 → 라운드 승리", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a", { nick: "A" });
|
||||
r.join("b", { nick: "B" });
|
||||
assert.equal(r.host, "a");
|
||||
r.drain();
|
||||
r.handle("b", { t: "start" }); // 호스트 아님
|
||||
assert.equal(r.phase, "lobby");
|
||||
r.handle("a", { t: "start" });
|
||||
assert.equal(r.phase, "countdown");
|
||||
const starts = r.drain().out.filter((o) => o.msg.t === "round_start");
|
||||
assert.equal(starts.length, 2);
|
||||
assert.ok(starts.every((o) => o.msg.seed > 0));
|
||||
clock.adv(3001);
|
||||
r.tick();
|
||||
assert.equal(r.phase, "playing");
|
||||
r.handle("a", { t: "attack", lines: 4, pieces: 3 });
|
||||
const g = msgs(r, "b", "garbage");
|
||||
assert.deepEqual(g, [{ t: "garbage", from: "a", lines: 4 }]);
|
||||
r.handle("b", { t: "topout" });
|
||||
const out = r.drain().out.map((o) => o.msg);
|
||||
assert.ok(out.find((m) => m.t === "ko" && m.who === "b" && m.by === "a"));
|
||||
const end = out.find((m) => m.t === "round_end");
|
||||
assert.equal(end.winner, "a");
|
||||
assert.equal(end.score.a, 1);
|
||||
assert.equal(r.phase, "between"); // FT 무제한 → 다음 라운드 대기
|
||||
clock.adv(4001);
|
||||
r.tick();
|
||||
assert.equal(r.phase, "countdown");
|
||||
assert.equal(r.round, 2);
|
||||
});
|
||||
|
||||
test("가비지 배율 0.5× 는 소수 누적(carry)으로 공정하게", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b");
|
||||
r.handle("a", { t: "rules", rules: { garbageMul: 0.5, overtime: false } });
|
||||
startPlaying(r, clock);
|
||||
r.drain();
|
||||
r.handle("a", { t: "attack", lines: 1, pieces: 1 });
|
||||
assert.equal(msgs(r, "b", "garbage").length, 0);
|
||||
r.handle("a", { t: "attack", lines: 1, pieces: 2 });
|
||||
assert.equal(msgs(r, "b", "garbage")[0].lines, 1);
|
||||
});
|
||||
|
||||
test("안티치트: 비정상 공격량·PPS 는 무시", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b");
|
||||
startPlaying(r, clock);
|
||||
r.drain();
|
||||
r.handle("a", { t: "attack", lines: 40, pieces: 1 });
|
||||
r.handle("a", { t: "attack", lines: 4, pieces: 500 });
|
||||
assert.equal(msgs(r, "b", "garbage").length, 0);
|
||||
assert.equal(r.players.get("a").flagged, 2);
|
||||
});
|
||||
|
||||
test("FFA 4인: 타겟 수동 지정, KO 순위, 최후 생존자 승리, FT1 → match_end → 리매치 과반", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
for (const u of ["a", "b", "c", "d"]) r.join(u, { nick: u.toUpperCase() });
|
||||
r.handle("a", { t: "rules", rules: { ft: 1 } });
|
||||
startPlaying(r, clock);
|
||||
r.drain();
|
||||
r.handle("a", { t: "target", id: "c" });
|
||||
r.handle("a", { t: "attack", lines: 2, pieces: 2 });
|
||||
assert.equal(msgs(r, "c", "garbage")[0].from, "a");
|
||||
r.handle("c", { t: "topout" });
|
||||
assert.equal(r.players.get("c").place, 4);
|
||||
r.handle("a", { t: "attack", lines: 2, pieces: 3 }); // 수동 타겟이 죽었으니 자동 타겟으로
|
||||
const atk = r.drain().out.find((o) => o.msg.t === "garbage");
|
||||
assert.ok(["b", "d"].includes(atk.to));
|
||||
r.handle("d", { t: "topout" });
|
||||
r.handle("b", { t: "topout" });
|
||||
assert.equal(r.phase, "match_end");
|
||||
const { effects } = r.drain();
|
||||
assert.equal(effects[0].type, "custom_end");
|
||||
assert.equal(effects[0].standings[0].id, "a");
|
||||
r.handle("a", { t: "rematch", vote: true });
|
||||
r.handle("b", { t: "rematch", vote: true });
|
||||
assert.equal(r.phase, "match_end"); // 2/4 는 과반 아님
|
||||
r.handle("c", { t: "rematch", vote: true });
|
||||
assert.equal(r.phase, "countdown");
|
||||
assert.equal(r.players.get("a").wins, 0);
|
||||
});
|
||||
|
||||
test("도중 입장은 관전 후 다음 라운드부터 참전", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b");
|
||||
startPlaying(r, clock);
|
||||
r.join("c");
|
||||
assert.equal(r.players.get("c").inRound, false);
|
||||
r.handle("b", { t: "topout" });
|
||||
clock.adv(4001);
|
||||
r.tick();
|
||||
assert.equal(r.players.get("c").inRound, true);
|
||||
});
|
||||
|
||||
test("호스트 퇴장 시 다음 입장자에게 위임", () => {
|
||||
const { r } = mkRoom();
|
||||
r.join("a"); r.join("b"); r.join("c");
|
||||
r.handle("a", { t: "leave" });
|
||||
assert.equal(r.host, "b");
|
||||
});
|
||||
|
||||
test("재접속 유예 15초: 그 안에 돌아오면 유지, 넘기면 톱아웃", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b"); r.join("c");
|
||||
startPlaying(r, clock);
|
||||
r.disconnect("b");
|
||||
clock.adv(10_000); r.tick();
|
||||
assert.equal(r.players.get("b").alive, true);
|
||||
r.handle("a", { t: "target", id: "b" });
|
||||
r.handle("a", { t: "attack", lines: 2, pieces: 2 });
|
||||
r.drain();
|
||||
r.join("b");
|
||||
const back = msgs(r, "b");
|
||||
assert.ok(back.find((m) => m.t === "sync"));
|
||||
assert.ok(back.find((m) => m.t === "garbage" && m.lines === 2)); // 끊긴 동안 받은 가비지 재전달
|
||||
r.disconnect("c");
|
||||
clock.adv(15_001); r.tick();
|
||||
assert.equal(r.players.get("c").alive, false);
|
||||
});
|
||||
|
||||
test("리그: 지정된 2명만 입장, 둘 다 오면 자동 시작, FT3, 이탈은 몰수패", () => {
|
||||
const { r, clock } = mkRoom("league", { allowed: ["a", "b"], ft: 3 });
|
||||
assert.equal(r.join("x").ok, false);
|
||||
r.join("a");
|
||||
assert.equal(r.phase, "lobby");
|
||||
r.join("b");
|
||||
assert.equal(r.phase, "countdown");
|
||||
for (let i = 0; i < 2; i++) {
|
||||
clock.adv(3001); r.tick();
|
||||
r.handle("b", { t: "topout" });
|
||||
clock.adv(4001); r.tick();
|
||||
}
|
||||
assert.equal(r.players.get("a").wins, 2);
|
||||
r.drain();
|
||||
r.disconnect("a");
|
||||
clock.adv(15_001); r.tick();
|
||||
assert.equal(r.phase, "match_end");
|
||||
const { effects } = r.drain();
|
||||
assert.deepEqual({ w: effects[0].winner, l: effects[0].loser }, { w: "b", l: "a" });
|
||||
assert.equal(r.finished, true);
|
||||
});
|
||||
|
||||
test("직렬화 왕복 (하이버네이션 복원)", () => {
|
||||
const { r } = mkRoom();
|
||||
r.join("a", { nick: "A" }); r.join("b", { nick: "B" });
|
||||
const j = JSON.parse(JSON.stringify(r.toJSON()));
|
||||
const r2 = RoomLogic.fromJSON(j);
|
||||
assert.equal(r2.players.get("a").nick, "A");
|
||||
assert.equal(r2.host, "a");
|
||||
});
|
||||
|
||||
test("보드 스냅샷 검증·중계", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b");
|
||||
startPlaying(r, clock);
|
||||
r.drain();
|
||||
r.handle("a", { t: "board", grid: "x".repeat(200) });
|
||||
assert.equal(msgs(r, "b", "board").length, 0);
|
||||
r.handle("a", { t: "board", grid: ".".repeat(190) + "GGGGGGGGG.", lock: true });
|
||||
assert.equal(msgs(r, "b", "board").length, 1);
|
||||
});
|
||||
|
||||
test("끝난 경기 결과는 재접속한 사람에게 다시 보낸다", () => {
|
||||
const { r, clock } = mkRoom();
|
||||
r.join("a"); r.join("b");
|
||||
r.handle("a", { t: "rules", rules: { ft: 1 } });
|
||||
startPlaying(r, clock);
|
||||
r.disconnect("b");
|
||||
r.handle("a", { t: "topout" }); // b 가 끊긴 사이 경기 종료 (b 승)
|
||||
assert.equal(r.phase, "match_end");
|
||||
r.drain();
|
||||
r.join("b");
|
||||
const end = msgs(r, "b", "match_end");
|
||||
assert.equal(end.length, 1);
|
||||
assert.equal(end[0].winner, "b");
|
||||
});
|
||||
83
server/test/rules.test.js
Normal file
83
server/test/rules.test.js
Normal file
@@ -0,0 +1,83 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { attackFor, overtimeMultiplier, trFor, rankFor, leagueFt, randomRoomCode, isRoomCode, randomGuestName, looksLikeGuestName, sanitizeRules } from "../src/rules.js";
|
||||
import { glickoUpdate } from "../src/glicko.js";
|
||||
import { findPairs, compatible } from "../src/matchmaking.js";
|
||||
|
||||
test("가비지 전송 테이블 (§6)", () => {
|
||||
assert.equal(attackFor({ lines: 1 }), 0);
|
||||
assert.equal(attackFor({ lines: 2 }), 1);
|
||||
assert.equal(attackFor({ lines: 3 }), 2);
|
||||
assert.equal(attackFor({ lines: 4, difficult: true, b2b: 0 }), 4);
|
||||
assert.equal(attackFor({ lines: 4, difficult: true, b2b: 1 }), 5); // B2B +1
|
||||
assert.equal(attackFor({ lines: 1, tspin: "mini" }), 1);
|
||||
assert.equal(attackFor({ lines: 0, tspin: "mini" }), 0);
|
||||
assert.equal(attackFor({ lines: 2, tspin: "tspin", difficult: true, b2b: 0 }), 4);
|
||||
assert.equal(attackFor({ lines: 3, tspin: "tspin", difficult: true, b2b: 0 }), 6);
|
||||
assert.equal(attackFor({ lines: 1, combo: 1 }), 1); // 콤보 2번째 → +1
|
||||
assert.equal(attackFor({ lines: 1, combo: 20 }), 5); // 이후 5 고정
|
||||
assert.equal(attackFor({ lines: 4, allClear: true }), 9);
|
||||
});
|
||||
|
||||
test("장기전 배율", () => {
|
||||
assert.equal(overtimeMultiplier(89_999), 1);
|
||||
assert.equal(overtimeMultiplier(90_000), 1.25);
|
||||
assert.equal(overtimeMultiplier(120_000), 1.5);
|
||||
assert.equal(overtimeMultiplier(200_000, false), 1);
|
||||
});
|
||||
|
||||
test("TR·랭크·FT", () => {
|
||||
assert.ok(trFor(1500, 350) < 1000);
|
||||
assert.ok(trFor(2500, 60) > 24000);
|
||||
assert.equal(rankFor(0), "D");
|
||||
assert.equal(rankFor(7800), "A+");
|
||||
assert.equal(rankFor(9199), "A+");
|
||||
assert.equal(rankFor(9200), "S-");
|
||||
assert.equal(rankFor(25000), "X+");
|
||||
assert.equal(leagueFt(7000, 9199), 3);
|
||||
assert.equal(leagueFt(1000, 9200), 5);
|
||||
});
|
||||
|
||||
test("방 코드·게스트명·규칙", () => {
|
||||
for (let i = 0; i < 200; i++) {
|
||||
const c = randomRoomCode();
|
||||
assert.ok(isRoomCode(c), c);
|
||||
assert.ok(!/[I1O0]/.test(c));
|
||||
}
|
||||
const n = randomGuestName();
|
||||
assert.match(n, /\d{3}$/);
|
||||
assert.ok(looksLikeGuestName(n));
|
||||
assert.ok(!looksLikeGuestName("홍길동"));
|
||||
assert.deepEqual(sanitizeRules({ garbageMul: 9, ft: 7, sameBag: true }), { garbageMul: 2, ft: 0, sameBag: true, overtime: true });
|
||||
});
|
||||
|
||||
test("Glicko-2: Glickman 논문 예제", () => {
|
||||
const p = glickoUpdate({ r: 1500, rd: 200, vol: 0.06 }, [
|
||||
{ r: 1400, rd: 30, score: 1 },
|
||||
{ r: 1550, rd: 100, score: 0 },
|
||||
{ r: 1700, rd: 300, score: 0 },
|
||||
]);
|
||||
assert.ok(Math.abs(p.r - 1464.06) < 0.05, String(p.r));
|
||||
assert.ok(Math.abs(p.rd - 151.52) < 0.05, String(p.rd));
|
||||
assert.ok(Math.abs(p.vol - 0.05999) < 0.0001, String(p.vol));
|
||||
});
|
||||
|
||||
test("Glicko-2: 승자는 오르고 패자는 내려간다, RD 하한 58", () => {
|
||||
const w = glickoUpdate({ r: 1500, rd: 350, vol: 0.06 }, [{ r: 1500, rd: 350, score: 1 }]);
|
||||
const l = glickoUpdate({ r: 1500, rd: 350, vol: 0.06 }, [{ r: 1500, rd: 350, score: 0 }]);
|
||||
assert.ok(w.r > 1500 && l.r < 1500);
|
||||
const tight = glickoUpdate({ r: 1500, rd: 58, vol: 0.06 }, [{ r: 1500, rd: 58, score: 1 }]);
|
||||
assert.ok(tight.rd >= 58);
|
||||
});
|
||||
|
||||
test("매치메이킹: R±2RD 겹침, 대기 시간에 따라 확장", () => {
|
||||
const now = 1_000_000;
|
||||
const a = { uid: "a", r: 1500, rd: 50, joinedAt: now };
|
||||
const b = { uid: "b", r: 1750, rd: 50, joinedAt: now };
|
||||
assert.equal(compatible(a, b, now), false); // 250 > 100+100
|
||||
assert.equal(compatible({ ...a, joinedAt: now - 60_000 }, { ...b, joinedAt: now - 60_000 }, now), true); // ×1.44
|
||||
const c = { uid: "c", r: 1520, rd: 50, joinedAt: now };
|
||||
const pairs = findPairs([b, a, c], now);
|
||||
assert.equal(pairs.length, 1);
|
||||
assert.deepEqual(pairs[0].map((x) => x.uid).sort(), ["a", "c"]);
|
||||
});
|
||||
36
server/test/shop.test.js
Normal file
36
server/test/shop.test.js
Normal file
@@ -0,0 +1,36 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { PASS, levelFor, passTiers, premiumBackfill, rewardsBetween } from "../src/shop.js";
|
||||
|
||||
test("레벨: 100 XP 마다 1레벨, 30 상한", () => {
|
||||
assert.equal(levelFor(0), 1);
|
||||
assert.equal(levelFor(99), 1);
|
||||
assert.equal(levelFor(100), 2);
|
||||
assert.equal(levelFor(2900), 30);
|
||||
assert.equal(levelFor(999_999), PASS.MAX_LEVEL);
|
||||
});
|
||||
|
||||
test("시즌 번호가 배지 ID 에 들어간다", () => {
|
||||
const last = passTiers(3).find((t) => t.level === 30);
|
||||
assert.equal(last.free, "badge:s3_finish");
|
||||
assert.equal(last.premium, "badge:s3_elite");
|
||||
});
|
||||
|
||||
test("레벨 구간 보상: 무료 트랙만 / 프리미엄 포함", () => {
|
||||
assert.deepEqual(rewardsBetween(1, 4, 5, false), ["skin:chalk"]);
|
||||
assert.deepEqual(rewardsBetween(1, 1, 8, false), ["skin:chalk"]);
|
||||
assert.deepEqual(rewardsBetween(1, 1, 8, true), ["skin:chalk", "skin:outline"]);
|
||||
assert.deepEqual(rewardsBetween(1, 5, 5, true), []); // 같은 레벨이면 없음
|
||||
});
|
||||
|
||||
test("프리미엄 구매 시 지난 레벨 보상 소급", () => {
|
||||
assert.deepEqual(premiumBackfill(1, 1), ["board:oxide"]);
|
||||
assert.deepEqual(premiumBackfill(2, 16), ["board:oxide", "skin:outline", "skin:signal"]);
|
||||
});
|
||||
|
||||
test("만렙까지 받는 보상 = 전체 트랙", () => {
|
||||
const free = rewardsBetween(1, 0, 30, false);
|
||||
const all = rewardsBetween(1, 0, 30, true);
|
||||
assert.equal(free.length, 4);
|
||||
assert.equal(all.length, 4 + 6);
|
||||
});
|
||||
32
server/wrangler.toml
Normal file
32
server/wrangler.toml
Normal file
@@ -0,0 +1,32 @@
|
||||
name = "tetrig"
|
||||
main = "src/index.js"
|
||||
compatibility_date = "2026-09-01"
|
||||
workers_dev = true
|
||||
|
||||
[[d1_databases]]
|
||||
binding = "DB"
|
||||
database_name = "tetrig"
|
||||
database_id = "d08b6a47-4f54-43c1-9590-1fe61930216f"
|
||||
migrations_dir = "migrations"
|
||||
|
||||
[[durable_objects.bindings]]
|
||||
name = "ROOMS"
|
||||
class_name = "GameRoomDO"
|
||||
|
||||
[[durable_objects.bindings]]
|
||||
name = "MATCHMAKER"
|
||||
class_name = "MatchmakerDO"
|
||||
|
||||
# 무료 플랜은 SQLite 백엔드 DO 만 쓸 수 있다.
|
||||
[[migrations]]
|
||||
tag = "v1"
|
||||
new_sqlite_classes = ["GameRoomDO", "MatchmakerDO"]
|
||||
|
||||
[triggers]
|
||||
crons = ["0 18 * * *"] # 매일 03:00 KST — RD 감쇠·시즌 마감
|
||||
|
||||
[vars]
|
||||
# Google 로그인용 OAuth 클라이언트 ID (쉼표 구분). 비어 있으면 /api/google 은 503.
|
||||
GOOGLE_CLIENT_IDS = ""
|
||||
|
||||
# 비밀값: npx wrangler secret put TOKEN_SECRET
|
||||
1
store/_redirects
Normal file
1
store/_redirects
Normal file
@@ -0,0 +1 @@
|
||||
/r/* /r/ 200
|
||||
1
store/app-ads.txt
Normal file
1
store/app-ads.txt
Normal file
@@ -0,0 +1 @@
|
||||
google.com, pub-5620940055268952, DIRECT, f08c47fec0942fa0
|
||||
116
store/listing.md
116
store/listing.md
@@ -11,43 +11,56 @@ Play Console → 스토어 설정 / 기본 스토어 등록정보에 그대로
|
||||
TETRIG
|
||||
```
|
||||
|
||||
## 간단한 설명 (80자 이내) — 현재 31자
|
||||
## 간단한 설명 (80자 이내) — 현재 47자
|
||||
|
||||
```
|
||||
스프린트·타임어택·엔들리스. 광고 없는 순수 블록 퍼즐.
|
||||
실시간 1:1 리그전부터 인원 무제한 커스텀 난투까지 — 모바일 대전 블록 스태커
|
||||
```
|
||||
|
||||
## 자세한 설명 (4000자 이내)
|
||||
|
||||
```
|
||||
TETRIG은 군더더기를 걷어낸 블록 스태킹 퍼즐입니다. 로그인도, 광고도, 결제도 없습니다. 앱을 열면 바로 게임이 시작됩니다.
|
||||
쌓아라, 부숴라, 올라가라. TETRIG은 모바일에 맞춰 다시 설계한 실시간 대전 블록 스태커입니다. 가입 없이 바로 시작하고, 원하면 계정을 만들어 랭크로 실력을 증명하세요.
|
||||
|
||||
■ 세 가지 솔로 모드
|
||||
· SPRINT — 40줄을 얼마나 빨리 지우는지 겨루는 기록 경기입니다.
|
||||
· TIME ATTACK — 2분 동안 최대 점수를 뽑아내는 모드입니다. 시간이 갈수록 레벨이 올라갑니다.
|
||||
· ENDLESS — 제한이 없습니다. 탑아웃해도 이어서 계속 쌓을 수 있어 연습에 좋습니다.
|
||||
■ 리그전
|
||||
· 실시간 1:1 랭크 매치. 비슷한 실력의 상대를 자동으로 찾아 줍니다.
|
||||
· Glicko-2 레이팅과 18단계 랭크(D ~ X+). 배치 10경기를 마치면 TR 이 공개됩니다.
|
||||
· 3선승제, 상위 랭크는 5선승제. 시즌제로 운영됩니다.
|
||||
|
||||
■ 제대로 된 조작감
|
||||
· SRS+180 회전과 킥 테이블을 구현해, 익숙한 회전 보정이 그대로 통합니다.
|
||||
· 7-bag 랜덤이라 같은 블록이 몰려 나오지 않습니다.
|
||||
· 홀드, 고스트(착지 위치 미리보기), 하드 드롭, 소프트 드롭, 180도 회전을 모두 지원합니다.
|
||||
· T-스핀, 백투백, 콤보, 퍼펙트 클리어를 판정해 점수에 반영합니다.
|
||||
· DAS/ARR, 락 딜레이를 조정해 반응이 끊기지 않게 맞췄습니다.
|
||||
■ 커스텀 룸
|
||||
· 6자리 코드로 방을 만들고 친구를 부르세요. 인원 제한이 없습니다.
|
||||
· 2명이면 1:1, 3명 이상이면 최후의 1인이 살아남는 난투.
|
||||
· 가비지 배율, 목표 승수, 동일 bag 공정전, 장기전 배율을 방장이 정합니다.
|
||||
· 상대 보드를 눌러 공격 대상을 직접 고르고, 격추 피드로 판세를 확인하세요. 끝나면 리매치 투표로 바로 한 판 더.
|
||||
|
||||
■ 어떤 화면에서든 맞춰집니다
|
||||
· 일반 스마트폰은 물론 갤럭시 폴드(접었을 때·펼쳤을 때), 플립, 태블릿까지 화면 크기에 따라 배치가 바뀝니다.
|
||||
· 가로 화면에서는 조작 버튼이 좌우로 갈라져 양손 엄지에 닿습니다.
|
||||
· 폴드를 펼치거나 화면을 돌려도 게임이 재시작되지 않고 그대로 이어집니다.
|
||||
· 태블릿·폴드용 '큰 버튼' 옵션과 왼손잡이용 좌우 반전 옵션이 있습니다.
|
||||
■ 솔로
|
||||
· SPRINT — 40줄 최속 클리어
|
||||
· TIME ATTACK — 2분 점수 어택
|
||||
· ENDLESS — 톱아웃해도 이어지는 연습 모드
|
||||
|
||||
■ 개인정보를 수집하지 않습니다
|
||||
· 인터넷 권한조차 요청하지 않습니다. 앱은 네트워크에 전혀 접속하지 않습니다.
|
||||
· 기록과 설정은 기기 안에만 저장되고 어디로도 전송되지 않습니다.
|
||||
· 회원가입, 광고, 추적, 분석 도구가 없습니다.
|
||||
· 비행기 모드에서도 모든 기능이 동일하게 동작합니다.
|
||||
■ 손맛
|
||||
· SRS+180 회전·킥, 7-bag, 홀드, 고스트, T-스핀, 백투백, 콤보, 올 클리어 판정
|
||||
· 상쇄(카운터)와 가비지 게이지까지 갖춘 대전 규칙
|
||||
|
||||
■ 광고도 결제도 없습니다
|
||||
전체 기능이 처음부터 열려 있습니다. 결제 유도, 에너지·하트 같은 플레이 제한, 보상형 광고가 없습니다.
|
||||
■ 기록
|
||||
· 리그·SPRINT·TIME ATTACK·ENDLESS 리더보드, 프로필 전적
|
||||
· 결과 화면을 이미지 한 장으로 바로 공유
|
||||
|
||||
■ 시즌 패스 · 꾸미기
|
||||
· 게임을 할 때마다 XP 가 쌓이고, 레벨 보상으로 블록 스킨·보드 테마·배지를 받습니다
|
||||
· 다른 스킨·보드는 광고 1편을 보고 해금할 수 있습니다
|
||||
· 꾸미기는 보는 재미만 바꿉니다. 실력·레이팅에 영향을 주는 아이템은 없습니다
|
||||
|
||||
■ 친구 초대
|
||||
· 커스텀 방에서 초대 링크를 보내면 친구는 링크를 눌러 바로 같은 방에 들어옵니다
|
||||
|
||||
■ 어떤 화면에서든
|
||||
· 스마트폰, 갤럭시 폴드·플립, 태블릿, 가로 화면까지 배치가 자동으로 맞춰집니다. 왼손 배치·큰 버튼 옵션 제공.
|
||||
|
||||
게임 플레이 중에는 광고가 나오지 않습니다. 광고 1편을 보고 30분 동안 전면 광고를 끌 수 있습니다. 앱 안 결제는 없습니다.
|
||||
계정은 앱 안 프로필에서 언제든 삭제할 수 있습니다.
|
||||
|
||||
배치 10경기를 끝내보세요.
|
||||
|
||||
개인정보처리방침: https://tetrig.pages.dev/privacy
|
||||
|
||||
@@ -72,21 +85,50 @@ TETRIG은 개인이 만든 앱입니다. Tetris Holding LLC 및 관련 회사와
|
||||
|
||||
---
|
||||
|
||||
## 데이터 보안(Data safety) 설문 답안
|
||||
## 데이터 보안(Data safety) 설문 답안 (v2.3.0~, 앱 안 결제 제거 후)
|
||||
|
||||
릴리스 APK의 권한을 확인한 결과 `INTERNET` 권한이 없다(`kr.tkrmagid.tetrig.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION` 하나뿐). 그래서 모든 문항이 "아니요"로 끝난다.
|
||||
- 사용자 데이터를 수집하거나 공유하나요? → **예**
|
||||
- 전송 중 암호화 → **예** (앱 자체는 HTTPS/WSS. targetSdk 36 이라 Android 가 평문 HTTP 를 기본 차단하고, 병합 매니페스트·AAB·광고 SDK AAR(AdMob, AppLovin, Pangle) 어디에도 `usesCleartextTraffic`·`networkSecurityConfig`·`cleartextTrafficPermitted` 가 없다. AppLovin 공식 Play 공개 문서는 찾지 못함)
|
||||
- 사용자가 데이터 삭제를 요청할 수 있나요? → **예** (앱 프로필 > 계정 삭제, 또는 이메일 요청 — 개인정보처리방침 4항)
|
||||
- 수집 항목
|
||||
- 개인 정보 > 이름(닉네임): 수집(선택 — 가입 화면 닉네임은 선택 입력이고, 입력하지 않으면 서버가 자동 닉네임을 만든다), 목적 = 앱 기능·계정 관리. 공유 안 함. Google 정의상 "이름"에 닉네임이 들어간다
|
||||
- 개인 정보 > 이메일 주소: 수집(선택 — 게스트로 가입 없이 쓸 수 있음), 목적 = 계정 관리. 공유 안 함
|
||||
- 개인 정보 > 사용자 ID(내부 계정 ID): 수집(필수), 목적 = 앱 기능·계정 관리. 공유 안 함
|
||||
- 앱 활동 > 기타 작업(게임 기록·레이팅·전적): 수집(필수), 목적 = 앱 기능. 공유 안 함. Google 정의상 게임플레이는 "기타 작업"이고 "기타 사용자 제작 콘텐츠"(자기소개·메모 등)가 아니다
|
||||
- 아래 4개는 광고 SDK(Google Mobile Ads, 미디에이션 AppLovin·Pangle)가 자동으로 수집해 광고 회사에 보낸다. 전부 **수집·공유**, 목적 = 광고 또는 마케팅 · 분석 · 사기 예방/보안/규정 준수 (Google 공식 공개 항목: https://developers.google.com/admob/android/privacy/play-data-disclosure)
|
||||
- 위치 > 대략적인 위치 (IP 주소로 추정)
|
||||
- 앱 활동 > 앱 상호작용 (앱 실행·탭·동영상 조회). 앱 자체도 시즌 패스 XP·꾸미기 아이템을 저장하므로 목적에 **앱 기능**도 함께 체크
|
||||
- 앱 정보 및 성능 > 진단 (앱 실행 시간·멈춤 비율·전력 사용)
|
||||
- 기기 또는 기타 ID (광고 ID·앱 세트 ID). 앱도 게스트 계정용 무작위 기기 ID(`device.id`)를 서버에 저장하므로 수집 목적에 **앱 기능**도 함께 체크
|
||||
- 위 4개는 Play 설문에서 전부 **필수**로 답한다 (AdMob 문서가 IP·상호작용·진단을 기본 수집으로 적고, 기기 ID 는 앱도 게스트 계정에 필수로 쓴다)
|
||||
- 아래 2개는 Pangle 만 공개하는 항목이다 (AdMob 공개 목록에는 없음). Pangle 표에 "Collected" 만 있고 "Shared" 는 없으므로 **수집만(공유 안 함)**, 목적은 Pangle 표 그대로 (https://www.pangleglobal.com/integration/app-privacy-details-gp). Pangle 은 선택(광고를 안 받으면 수집 안 함)으로 적지만 앱 안에 광고·수집을 끄는 설정이 없으므로 **필수**로 답한다
|
||||
- 앱 정보 및 성능 > 비정상 종료 로그: 목적 = 분석 (Pangle 선택 기능이지만 앱에서 끄는 설정이 없으므로 신고)
|
||||
- 앱 정보 및 성능 > 기타 앱 성능 데이터: 목적 = 사기 예방/보안/규정 준수
|
||||
- 계정 삭제 URL(웹): `https://tetrig.pages.dev/privacy` (4항 — 이메일 삭제 요청 안내)
|
||||
|
||||
- 앱이 필요한 사용자 데이터 유형을 수집하거나 공유하나요? → **아니요**
|
||||
- 모든 사용자 데이터가 전송 중에 암호화되나요? → (수집 없음이므로 해당 없음)
|
||||
- 사용자가 데이터 삭제를 요청할 수 있나요? → (수집 없음이므로 해당 없음)
|
||||
- 앱에 광고가 포함되어 있나요? → **아니요**
|
||||
- 인앱 구매 → **없음**
|
||||
## 광고 (AdMob)
|
||||
|
||||
근거: 기록·설정은 안드로이드 SharedPreferences 로 기기 내부에만 저장되고 외부로 나가지 않는다.
|
||||
- 앱 콘텐츠 > 광고: **예, 광고 포함**
|
||||
- 광고 단위 ID 는 `app/gradle.properties` 의 `admob*` 값. 비어 있으면 Google 테스트 광고.
|
||||
- 노출 규칙: 메인·커스텀 로비 하단 배너, 모든 결과 화면 300×250, 결과 → 다음 행동 사이 전면(마지막 전면 뒤 3판 이상 + 세션 첫 판 제외, 판 수는 앱을 꺼도 이어서 셈). 플레이 화면 광고 0.
|
||||
- 보상형(사용자가 고를 때만): 30분 전면 끄기 · TIME ATTACK 이어하기(1판 1회, 기록 미반영) · 스킨(리소·외곽선·시그널·서포터)/보드(흑연·산화철·이끼) 해금.
|
||||
- 미디에이션: AppLovin·Pangle 어댑터 포함. AdMob 콘솔 > 미디에이션에서 그룹을 만들어야 입찰에 들어온다.
|
||||
- `app-ads.txt`: `store/app-ads.txt` → https://tetrig.pages.dev/app-ads.txt (`scripts/build-pages.sh` 가 복사). 현재 AdMob 한 줄. AppLovin·Pangle 계정을 만들면 그쪽이 주는 줄을 추가한다. Play 등록정보의 웹사이트는 `https://tetrig.pages.dev` 로 둔다.
|
||||
|
||||
## 인앱 상품
|
||||
|
||||
없음 (v2.3.0 부터 광고만으로 운영). 앱에 Play 결제 라이브러리(BILLING 권한)도 들어 있지 않다.
|
||||
콘텐츠 등급 설문의 "디지털 상품 구매"는 **아니요**.
|
||||
|
||||
## 출시 국가 · 언어
|
||||
|
||||
- 출시 국가: 전체 국가. 앱 화면은 기기 언어를 따라간다: 한국어·영어·일본어·중국어(간체/번체)·스페인어·포르투갈어·프랑스어·독일어·러시아어·튀르키예어·인도네시아어·베트남어·태국어. 그 밖의 언어는 영어.
|
||||
- 스토어 등록정보 번역: Play Console > 기본 스토어 등록정보 > 번역 관리에서 언어를 추가한다(위 한국어 문구를 원문으로 Google 번역 사용 가능).
|
||||
- EEA·영국 배포: GDPR 동의 메시지(AdMob > 개인정보 보호 및 메시지)를 게시해야 그 지역에 광고가 정상 노출된다.
|
||||
|
||||
## 콘텐츠 등급 설문
|
||||
|
||||
퍼즐 게임 카테고리로, 폭력·성적 내용·욕설·도박·약물 요소가 전부 없고 사용자 간 소통 기능도 없다. 전 문항 "아니요"로 답하면 전체이용가(ESRB Everyone / PEGI 3 / GRAC 전체이용가)가 나온다.
|
||||
퍼즐 게임 카테고리로, 폭력·성적 내용·욕설·도박·약물 요소가 전부 없다. 디지털 상품 구매: 아니요. 채팅은 없지만 온라인 대전에서 다른 사용자의 닉네임이 보이므로 "사용자 간 상호작용: 예(채팅 없음)"로 답한다.
|
||||
|
||||
## 기타 Play Console 입력값
|
||||
|
||||
@@ -94,8 +136,10 @@ TETRIG은 개인이 만든 앱입니다. Tetris Holding LLC 및 관련 회사와
|
||||
- 카테고리: **퍼즐**
|
||||
- 태그: 퍼즐 / 캐주얼 / 아케이드
|
||||
- 무료 또는 유료: **무료**
|
||||
- 대상 연령: 전체
|
||||
- 광고 포함: **아니요**
|
||||
- 타겟층(대상 연령대): **16~17세, 18세 이상**만 선택. 개인정보처리방침의 "만 14세 미만 대상 아님"과 맞추고, 13세 미만이 없으므로 가족 정책 대상이 아니다
|
||||
- 콘텐츠 등급: 위 설문 결과를 그대로 쓴다 (타겟층과 별개)
|
||||
- 광고 포함: **예**
|
||||
- 광고 ID 선언(앱 콘텐츠 > 광고 ID): **예**, 용도 = 광고 또는 마케팅 · 분석 · 사기 예방/보안/규정 준수 (매니페스트에 AD_ID 권한이 있어 선언이 없으면 업로드가 막힌다)
|
||||
- 개인정보처리방침 URL: `https://tetrig.pages.dev/privacy`
|
||||
- 이메일: `tkrmagid@gmail.com`
|
||||
- 패키지명: `kr.tkrmagid.tetrig`
|
||||
|
||||
@@ -25,77 +25,93 @@
|
||||
<body>
|
||||
<main>
|
||||
<h1><span class="o">TET</span>RIG 개인정보처리방침</h1>
|
||||
<p class="meta">최종 수정일: 2026-09-24 · 앱 패키지: kr.tkrmagid.tetrig</p>
|
||||
<p class="meta">최종 수정일: 2026-11-20 · 앱 패키지: kr.tkrmagid.tetrig</p>
|
||||
|
||||
<div class="panel">
|
||||
<p><strong>요약: TETRIG은 개인정보를 일절 수집하지 않습니다.</strong> 앱에는 인터넷 접근 권한조차 없으며,
|
||||
모든 데이터는 기기 안에만 저장됩니다.</p>
|
||||
<p><strong>요약:</strong> 온라인 대전(커스텀 방·리그전)과 리더보드를 위해 게임 계정 정보와 경기 기록을 서버에 저장합니다.
|
||||
무료 운영을 위해 Google AdMob 광고(및 AdMob 이 중개하는 AppLovin·Pangle 광고)를 표시하며, 이 과정에서 광고 ID 등 기기 정보가 광고 회사에 전송될 수 있습니다.
|
||||
앱 안 결제는 없습니다.
|
||||
솔로 모드는 계정 없이도 쓸 수 있고, 계정은 앱 안에서 언제든 삭제할 수 있습니다.</p>
|
||||
</div>
|
||||
|
||||
<h2>1. 수집하는 개인정보</h2>
|
||||
<p>없습니다. TETRIG은 이름, 이메일, 전화번호, 위치, 연락처, 사진, 기기 식별자 등
|
||||
어떤 개인정보도 수집·요청·전송하지 않습니다. 회원가입 절차가 없습니다.</p>
|
||||
|
||||
<h2>2. 기기에 저장되는 정보</h2>
|
||||
<p>아래 항목만 기기 내부 저장소(Android SharedPreferences)에 저장되며 외부로 전송되지 않습니다.</p>
|
||||
<h2>1. 수집하는 정보와 목적</h2>
|
||||
<ul>
|
||||
<li>솔로 모드 최고 기록 (SPRINT 최단 시간, TIME ATTACK / ENDLESS 최고 점수)</li>
|
||||
<li>게임 설정값 (고스트 표시, 왼손 배치, 큰 버튼)</li>
|
||||
<li><strong>게스트 계정</strong>: 앱이 처음 실행될 때 무작위 닉네임과 무작위 기기 식별값(앱이 직접 만든 값, 하드웨어 ID 아님)을 서버에 등록합니다. 온라인 대전 참가와 기록 저장에 씁니다.</li>
|
||||
<li><strong>이메일 계정(선택)</strong>: 이메일 주소, 비밀번호(PBKDF2 해시로만 저장, 원문 저장 안 함), 닉네임. 로그인과 기록 이전에 씁니다.</li>
|
||||
<li><strong>게임 기록</strong>: 솔로 최고 기록, 리그 레이팅(Glicko-2·TR)·전적, 커스텀 방 순위. 리더보드·프로필 표시와 매칭에 씁니다.</li>
|
||||
<li><strong>대전 중 데이터</strong>: 보드 상태, 공격량 등 경기 진행 신호. 실시간 중계와 부정행위 방지에만 쓰며 경기가 끝나면 결과만 남습니다.</li>
|
||||
<li><strong>시즌 패스·꾸미기</strong>: 시즌별 경험치(XP), 받은 꾸미기 아이템(블록 스킨·보드 테마·배지), 장착한 배지. 장착한 배지는 다른 플레이어에게 닉네임과 함께 보입니다.</li>
|
||||
</ul>
|
||||
<p>앱을 삭제하면 이 데이터도 함께 삭제됩니다.</p>
|
||||
|
||||
<h2>3. 권한</h2>
|
||||
<p>TETRIG은 인터넷, 저장소, 위치, 카메라, 마이크, 연락처 등 어떤 런타임 권한도 요청하지 않습니다.</p>
|
||||
<h2>2. 광고 (Google AdMob)</h2>
|
||||
<p>메인 화면·커스텀 로비 하단 배너, 결과 화면 광고, 그리고 마지막 전면 광고 뒤 3판 이상 지났을 때 결과 화면을 나가면 전면 광고를 표시합니다. 게임 플레이 중에는 광고가 나오지 않습니다.
|
||||
보상형 광고(30분간 전면 광고 끄기, TIME ATTACK 이어하기, 스킨 해금)는 사용자가 직접 고를 때만 나옵니다.
|
||||
광고 제공을 위해 Google 과, Google 이 입찰을 중개하는 광고 네트워크(AppLovin, Pangle)가 광고 ID, IP 주소, 기기·앱 정보를 수집·처리할 수 있습니다. 유럽경제지역·영국 등에서는 처음 실행 시 동의 화면이 표시됩니다.
|
||||
Google 의 처리 방식: <a href="https://policies.google.com/technologies/partner-sites">https://policies.google.com/technologies/partner-sites</a>,
|
||||
AppLovin: <a href="https://www.applovin.com/privacy/">https://www.applovin.com/privacy/</a>,
|
||||
Pangle: <a href="https://www.pangleglobal.com/privacy">https://www.pangleglobal.com/privacy</a>.
|
||||
기기 설정 > Google > 광고에서 광고 ID 를 재설정하거나 삭제할 수 있습니다.</p>
|
||||
|
||||
<h2>4. 제3자 제공 · 광고 · 분석</h2>
|
||||
<p>광고 SDK, 분석 SDK, 크래시 리포팅 도구를 일절 포함하지 않습니다.
|
||||
따라서 제3자에게 제공되는 데이터도 없습니다.</p>
|
||||
<h2>3. 보관과 처리 위치</h2>
|
||||
<p>서버는 Cloudflare(Workers·D1)에서 운영되며 전송 구간은 모두 HTTPS/WSS 로 암호화됩니다. 계정을 삭제하기 전까지 보관하고, 삭제하면 즉시 지웁니다.
|
||||
리그 경기 결과에는 상대 플레이어의 전적 보존을 위해 개인을 식별할 수 없는 내부 ID 와 점수만 남습니다.</p>
|
||||
|
||||
<h2>5. 아동 개인정보</h2>
|
||||
<p>어떤 이용자로부터도 개인정보를 수집하지 않으므로, 만 14세 미만 아동의 개인정보 역시 수집하지 않습니다.</p>
|
||||
<h2>4. 계정 삭제</h2>
|
||||
<p>앱 > 프로필 > <strong>계정 삭제</strong>를 누르면 계정, 이메일, 비밀번호 해시, 닉네임, 레이팅, 솔로 기록, 커스텀 전적, 시즌 패스 XP·꾸미기 아이템이 즉시 삭제됩니다.
|
||||
앱을 쓸 수 없는 경우 가입한 이메일로 <a href="mailto:tkrmagid@gmail.com?subject=TETRIG%20계정%20삭제%20요청">tkrmagid@gmail.com</a> 에 삭제를 요청하면 7일 안에 처리합니다.</p>
|
||||
|
||||
<h2>6. 변경 고지</h2>
|
||||
<p>향후 온라인 대전 기능이 추가되어 수집 항목이 생기면, 이 문서를 갱신하고
|
||||
앱 업데이트 시점에 안내합니다.</p>
|
||||
<h2>5. 기기에 저장되는 정보</h2>
|
||||
<p>로그인 토큰, 솔로 최고 기록, 설정값(고스트·왼손 배치·큰 버튼), 장착한 스킨, 광고 횟수(전면 광고 간격 계산용), 보상형 광고로 해금한 아이템이 기기 안(SharedPreferences)에 저장되며 앱을 삭제하면 함께 지워집니다.
|
||||
결과 이미지를 공유할 때 만든 그림은 앱 캐시에만 잠시 저장됩니다.</p>
|
||||
|
||||
<h2>7. 문의</h2>
|
||||
<p>개인정보 관련 문의: <a href="mailto:tkrmagid@gmail.com">tkrmagid@gmail.com</a></p>
|
||||
<h2>6. 권한</h2>
|
||||
<p>인터넷·네트워크 상태 권한만 사용합니다(온라인 대전과 광고). 위치·카메라·마이크·연락처 권한은 요청하지 않습니다.</p>
|
||||
|
||||
<h2>7. 제3자 제공</h2>
|
||||
<p>광고를 위한 Google AdMob 과 미디에이션 광고 네트워크(AppLovin, Pangle) 외에는 어떤 제3자에게도 정보를 판매·제공하지 않습니다. 분석·추적 SDK 는 쓰지 않습니다.</p>
|
||||
|
||||
<h2>8. 아동</h2>
|
||||
<p>만 14세 미만 아동을 대상으로 하지 않으며, 그 사실을 알게 되면 해당 계정을 삭제합니다.</p>
|
||||
|
||||
<h2>9. 문의</h2>
|
||||
<p><a href="mailto:tkrmagid@gmail.com">tkrmagid@gmail.com</a></p>
|
||||
|
||||
<hr>
|
||||
|
||||
<h1><span class="o">TET</span>RIG Privacy Policy</h1>
|
||||
<p class="meta">Last updated: 2026-09-24 · Package: kr.tkrmagid.tetrig</p>
|
||||
<p class="meta">Last updated: 2026-11-05 · Package: kr.tkrmagid.tetrig</p>
|
||||
|
||||
<div class="panel">
|
||||
<p><strong>Summary: TETRIG collects no personal data.</strong> The app does not even hold the
|
||||
INTERNET permission. All data stays on your device.</p>
|
||||
<p><strong>Summary:</strong> To provide online matches (custom rooms, ranked league) and leaderboards, we store your game account and match records on our server.
|
||||
The app shows Google AdMob ads (including AppLovin and Pangle ads mediated by AdMob), which may send device information such as the advertising ID to these ad networks.
|
||||
In-app purchases (remove ads, supporter pack, season pass) are processed by Google Play; we never receive card details.
|
||||
Solo modes work without an account, and you can delete your account in the app at any time.</p>
|
||||
</div>
|
||||
|
||||
<h2>1. Data we collect</h2>
|
||||
<p>None. TETRIG does not collect, request, or transmit any personal information such as name,
|
||||
email, phone number, location, contacts, photos, or device identifiers. There is no account system.</p>
|
||||
|
||||
<h2>2. Data stored on your device</h2>
|
||||
<ul>
|
||||
<li>Solo mode personal bests (SPRINT time, TIME ATTACK / ENDLESS score)</li>
|
||||
<li>Gameplay settings (ghost piece, left-handed layout, large buttons)</li>
|
||||
<li><strong>Guest account</strong>: a random nickname and a random app-generated install ID (not a hardware ID), created on first launch.</li>
|
||||
<li><strong>Email account (optional)</strong>: email, password (stored only as a PBKDF2 hash), nickname.</li>
|
||||
<li><strong>Game records</strong>: solo bests, league rating and match history, custom room placements.</li>
|
||||
<li><strong>In-match signals</strong>: board state and attacks, used only to relay the live match and prevent cheating.</li>
|
||||
<li><strong>Season pass and cosmetics</strong>: seasonal XP, unlocked cosmetics and your equipped badge (visible to other players next to your nickname).</li>
|
||||
<li><strong>Purchase records</strong>: the Google Play purchase token, order ID, product ID and time, used only to verify the purchase with the Google Play Developer API and grant the item.</li>
|
||||
</ul>
|
||||
<p>Uninstalling the app removes this data.</p>
|
||||
|
||||
<h2>3. Permissions</h2>
|
||||
<p>TETRIG requests no runtime permissions and has no internet access.</p>
|
||||
<h2>2. Advertising (Google AdMob)</h2>
|
||||
<p>Banner ads on the home screen and custom lobby, an ad on result screens, and an interstitial when leaving a result screen once at least three games have passed since the last one. No ads during gameplay.
|
||||
Rewarded ads (30 minutes without interstitials, TIME ATTACK continue, skin unlock) are shown only when you choose them.
|
||||
Google and the mediated networks (AppLovin, Pangle) may collect the advertising ID, IP address and device/app information to serve ads. Users in the EEA/UK see a consent form on first launch.
|
||||
See <a href="https://policies.google.com/technologies/partner-sites">https://policies.google.com/technologies/partner-sites</a>.</p>
|
||||
|
||||
<h2>4. Third parties, ads, analytics</h2>
|
||||
<p>No advertising SDK, no analytics SDK, no crash reporting. No data is shared with anyone.</p>
|
||||
<h2>3. Storage</h2>
|
||||
<p>The server runs on Cloudflare (Workers, D1); all traffic is encrypted (HTTPS/WSS). Data is kept until you delete your account.</p>
|
||||
|
||||
<h2>5. Children</h2>
|
||||
<p>Since no personal data is collected from any user, none is collected from children either.</p>
|
||||
<h2>4. Account deletion</h2>
|
||||
<p>In the app: Profile > <strong>계정 삭제 (Delete account)</strong> deletes your account, email, password hash, nickname, rating, solo records, custom history, season pass XP, cosmetics and purchase records immediately.
|
||||
If you cannot use the app, email <a href="mailto:tkrmagid@gmail.com?subject=TETRIG%20account%20deletion">tkrmagid@gmail.com</a> from your registered address; requests are handled within 7 days.</p>
|
||||
|
||||
<h2>6. Changes</h2>
|
||||
<p>If online multiplayer is added later and data collection begins, this document will be updated
|
||||
and the change announced with the app update.</p>
|
||||
|
||||
<h2>7. Contact</h2>
|
||||
<h2>5. Contact</h2>
|
||||
<p><a href="mailto:tkrmagid@gmail.com">tkrmagid@gmail.com</a></p>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
61
store/room.html
Normal file
61
store/room.html
Normal file
@@ -0,0 +1,61 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ko">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>TETRIG 커스텀 방 초대</title>
|
||||
<meta property="og:title" content="TETRIG 커스텀 방 초대">
|
||||
<meta property="og:description" content="링크를 누르면 앱에서 바로 방에 들어갑니다. 인원 제한 없는 실시간 난투!">
|
||||
<meta property="og:image" content="https://tetrig.pages.dev/icon-512.png">
|
||||
<meta name="robots" content="noindex">
|
||||
<style>
|
||||
:root{ --ink:#17161B; --bone:#EDE7DA; --paper:#E1D9C7; --sub:#6E6A5E; --safety:#FF4E11; }
|
||||
*{ box-sizing:border-box; margin:0; padding:0; }
|
||||
body{ background:var(--bone); color:var(--ink); font-family:ui-monospace,'Menlo',monospace; padding:36px 20px; }
|
||||
main{ max-width:460px; margin:0 auto; }
|
||||
h1{ font-size:34px; font-style:italic; font-weight:900; }
|
||||
h1 .o{ color:var(--safety); }
|
||||
.bar{ width:150px; height:10px; background:var(--ink); margin:6px 0 28px; }
|
||||
.code{ background:var(--ink); color:var(--safety); border:2px solid var(--ink); box-shadow:5px 5px 0 var(--ink);
|
||||
text-align:center; padding:18px; margin-bottom:22px;
|
||||
clip-path:polygon(0 0,100% 0,100% calc(100% - 14px),calc(100% - 14px) 100%,0 100%); }
|
||||
.code small{ display:block; color:#8D8A80; font-size:12px; margin-bottom:4px; }
|
||||
.code b{ font-size:44px; font-style:italic; font-weight:900; letter-spacing:4px; }
|
||||
a.btn{ display:block; text-align:center; text-decoration:none; color:var(--ink); font-weight:700; font-size:15px;
|
||||
border:2px solid var(--ink); box-shadow:4px 4px 0 var(--ink); padding:14px; margin-bottom:14px; background:var(--bone); }
|
||||
a.btn.go{ background:var(--safety); }
|
||||
p{ font-size:13px; line-height:1.7; color:var(--sub); margin-top:8px; }
|
||||
.bad{ color:var(--safety); font-weight:700; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<h1><span class="o">TET</span>RIG</h1>
|
||||
<div class="bar"></div>
|
||||
<div id="ok" hidden>
|
||||
<div class="code"><small>커스텀 방 초대 코드</small><b id="code">------</b></div>
|
||||
<a class="btn go" id="open" href="#">앱에서 바로 들어가기</a>
|
||||
<a class="btn" id="store" href="https://play.google.com/store/apps/details?id=kr.tkrmagid.tetrig">Google Play 에서 TETRIG 받기</a>
|
||||
<p>앱이 설치돼 있으면 위 버튼으로 이 방에 바로 들어갑니다. 앱이 없으면 Play 스토어로 이동합니다.<br>
|
||||
직접 들어가려면 앱 > 커스텀 > 참가하기에서 코드를 입력하세요.</p>
|
||||
</div>
|
||||
<p id="bad" class="bad" hidden>초대 링크가 올바르지 않습니다.</p>
|
||||
</main>
|
||||
<script>
|
||||
const m = /^\/r\/([A-Za-z0-9]{6})\/?$/.exec(location.pathname);
|
||||
if (!m) {
|
||||
document.getElementById('bad').hidden = false;
|
||||
} else {
|
||||
const code = m[1].toUpperCase();
|
||||
const play = 'https://play.google.com/store/apps/details?id=kr.tkrmagid.tetrig';
|
||||
document.getElementById('ok').hidden = false;
|
||||
document.getElementById('code').textContent = code;
|
||||
document.title = 'TETRIG 방 ' + code + ' 초대';
|
||||
// Android Chrome: 앱이 있으면 앱으로, 없으면 Play 스토어로
|
||||
document.getElementById('open').href =
|
||||
'intent://tetrig.pages.dev/r/' + code + '#Intent;scheme=https;package=kr.tkrmagid.tetrig;S.browser_fallback_url=' +
|
||||
encodeURIComponent(play) + ';end';
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 60 KiB |
Reference in New Issue
Block a user