diff --git a/app/build.gradle b/app/build.gradle
index b3e64e045142915b26300f71f299310203ea1508..526f96616a7985720940ddffbce34f39b5841f73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -74,6 +74,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-database-ktx:20.2.1'
     implementation platform('androidx.compose:compose-bom:2022.10.00')
     implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2022.10.00')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -81,6 +82,7 @@ dependencies {
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
     implementation 'com.airbnb.android:lottie:4.2.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6832fbc28feeafb84d9e75d237cb4ae274cd2966..3b6ad50038faf7eaf743733958980912e1341318 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MyGame"
         tools:targetApi="31">
+        <activity
+            android:name=".QuizQuestion"
+            android:exported="false"
+            android:label="@string/title_activity_quiz_question"
+            android:theme="@style/Theme.MyGame" />
         <activity
             android:name=".CustomButton"
             android:exported="false"
diff --git a/app/src/main/java/com/example/game/Quiz.kt b/app/src/main/java/com/example/game/Quiz.kt
index 370f624ebd38d8bf6df096da80acdd05276c6e62..3fe7892368d87af00a9a34bcf113fca2c2f76793 100644
--- a/app/src/main/java/com/example/game/Quiz.kt
+++ b/app/src/main/java/com/example/game/Quiz.kt
@@ -1,18 +1,18 @@
 package com.example.game
 
+import android.R.id
 import android.annotation.SuppressLint
-import android.content.Context
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.widget.Button
 import android.widget.GridLayout
 import android.widget.TextView
-import androidx.activity.ComponentActivity
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatButton
-import com.google.firebase.auth.FirebaseAuth
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -20,12 +20,13 @@ import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
 import java.io.PrintWriter
-import java.lang.Math.random
 import java.net.Socket
-import java.util.Random
+
 
 const val MAX_ROW: Int = 5
 const val MAX_COLUMN: Int = 2
+var enableQue: MutableList<Question> = mutableListOf()
+var ret: Int? = -1
 
 class Quiz : AppCompatActivity() {
     private val GAME_ID = "3"
@@ -46,8 +47,6 @@ class Quiz : AppCompatActivity() {
     //private var playerEmail: String ? = FirebaseAuth.getInstance().currentUser!!.email?.removeSuffix("@whatever.ru")
     private var playerEmail: String ? = "login" // !!! временно
 
-    private var enableQue: MutableList<Question> = mutableListOf()
-
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -57,7 +56,7 @@ class Quiz : AppCompatActivity() {
         var castle1But = findViewById<Button>(R.id.castle1)
         var _castle1But = CustomButton(castle1But, Pair<Int, Int>(0, 1))
         var castle2But = findViewById<Button>(R.id.castle2)
-        var _castle2But = CustomButton(castle2But, Pair<Int, Int>(MAX_ROW, 1))
+        var _castle2But = CustomButton(castle2But, Pair<Int, Int>(MAX_ROW, 1), 1) // TODO: у всех замок снизу, и сервер инверсирует номера?
         buttons.add(_castle1But);
 
         // Настройка обработчиков нажатия для кнопок
@@ -256,7 +255,7 @@ class Quiz : AppCompatActivity() {
     }
 
     suspend private fun onDuel(id: Pair<Int, Int>) {
-        var ret = toDuelQuestion()
+        toDuelQuestion()
         if (ret == 1) {
             onWin(id)
         } else if (ret == -1){
@@ -264,64 +263,88 @@ class Quiz : AppCompatActivity() {
         }
     }
 
-    private fun toDuelQuestion(): Int {
-        setContentView(R.layout.activity_quiz_question)
-        var ret: Int = 0
-
-        var Qtv = findViewById<TextView>(R.id.QuestionTV)
-
-        var ansButtons: Array<Button> = arrayOf()
-        ansButtons[0] = findViewById<Button>(R.id.ans1) as Button
-        ansButtons[1] = findViewById<Button>(R.id.ans2) as Button
-        ansButtons[2] = findViewById<Button>(R.id.ans3) as Button
-        ansButtons[3] = findViewById<Button>(R.id.ans4) as Button
-
-        var num = (0..enableQue.size).random()
-        Qtv.text = enableQue[num].que
-        var ans = enableQue[num].ans
-        ansButtons[0].text = ans[0]
-        ansButtons[1].text = ans[1]
-        ansButtons[2].text = ans[2]
-        ansButtons[3].text = ans[3]
-        ansButtons[0].setOnClickListener {
-            enableQue[num].checkAnswer(0)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[1].setOnClickListener {
-            enableQue[num].checkAnswer(1)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[2].setOnClickListener {
-            enableQue[num].checkAnswer(2)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[3].setOnClickListener {
-            enableQue[num].checkAnswer(3)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
+    private fun toDuelQuestion() {
+        SocketHelper.clientSocket = clientSocket
+        val someActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val data: Intent? = result.data
+                ret = data?.getIntExtra("ret", -1)
+            }
         }
-        enableQue.removeAt(num)
 
-        GlobalScope.launch(Dispatchers.IO) {
-            try {
-                writer.println(enableQue[num].correct)
-                writer.flush()
-                var str = reader.readLine()
-                if (str == "$player_id")
-                    ret = 1
-                else if (str == "333")
-                    ret = 0
-                else
-                    ret -1
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+        val intent = Intent(this, QuizQuestion::class.java)
+        intent.putExtra("flag", true)
+        someActivityResultLauncher.launch(intent)
+
+//        // TODO: новая активность
+//        val requestCode = 1 // Вы можете использовать любое число
+//        val i = Intent(this, QuizQuestion::class.java)
+
+        //startActivityForResult(i, requestCode)
+
+//        setContentView(R.layout.activity_quiz_question)
+//        var ret: Int = 0
+//
+//        var Qtv = findViewById<TextView>(R.id.QuestionTV) as TextView
+//
+//        var ansButtons: Array<Button> = arrayOf()
+//        ansButtons[0] = findViewById<Button>(R.id.ans1) as Button
+//        ansButtons[1] = findViewById<Button>(R.id.ans2) as Button
+//        ansButtons[2] = findViewById<Button>(R.id.ans3) as Button
+//        ansButtons[3] = findViewById<Button>(R.id.ans4) as Button
+//
+//        var num = (0..enableQue.size).random()
+//        Qtv.text = enableQue[num].que
+//        var ans = enableQue[num].ans
+//        ansButtons[0].text = ans[0]
+//        ansButtons[1].text = ans[1]
+//        ansButtons[2].text = ans[2]
+//        ansButtons[3].text = ans[3]
+//        ansButtons[0].setOnClickListener {
+//            enableQue[num].checkAnswer(0)
+//            for (buttons in ansButtons)
+//                buttons.isEnabled = false
+//        }
+//        ansButtons[1].setOnClickListener {
+//            enableQue[num].checkAnswer(1)
+//            for (buttons in ansButtons)
+//                buttons.isEnabled = false
+//        }
+//        ansButtons[2].setOnClickListener {
+//            enableQue[num].checkAnswer(2)
+//            for (buttons in ansButtons)
+//                buttons.isEnabled = false
+//        }
+//        ansButtons[3].setOnClickListener {
+//            enableQue[num].checkAnswer(3)
+//            for (buttons in ansButtons)
+//                buttons.isEnabled = false
+//        }
+//        enableQue.removeAt(num)
+//
+//        GlobalScope.launch(Dispatchers.IO) {
+//            try {
+//                writer.println(enableQue[num].correct)
+//                writer.flush()
+//                var str = reader.readLine()
+//                if (str == "$player_id")
+//                    ret = 1
+//                else if (str == "333")
+//                    ret = 0
+//                else
+//                    ret -1
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//            }
+//        }
+//        setContentView(R.layout.activity_quiz)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 1 && resultCode == Activity.RESULT_OK) {
+            val ret = data?.getStringExtra("ret")
         }
-        setContentView(R.layout.activity_quiz)
-        return ret
     }
 
     private fun exitToMenu() {
@@ -409,65 +432,27 @@ class Quiz : AppCompatActivity() {
     }
 
     private fun onButtonClick(id: Pair<Int, Int>) {
-        GlobalScope.launch(Dispatchers.IO) {
-            try {
-                if(toQuestion()) {
-                    writer.println("1")
-                    writer.flush()
-                    onWin(id)
-                } else {
-                    writer.println("0")
-                    writer.flush()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
+        Log.d("Debug", "Вход в обычный вопрос-0")
+        toQuestion()
+        if (ret == 1)
+            onWin(id)
     }
 
-    private fun toQuestion(): Boolean {
-        setContentView(R.layout.activity_quiz_question)
-        var ret = false
-
-        var Qtv = findViewById<TextView>(R.id.QuestionTV)
-
-        var ansButtons: Array<Button> = arrayOf()
-        ansButtons[0] = findViewById<Button>(R.id.ans1) as Button
-        ansButtons[1] = findViewById<Button>(R.id.ans2) as Button
-        ansButtons[2] = findViewById<Button>(R.id.ans3) as Button
-        ansButtons[3] = findViewById<Button>(R.id.ans4) as Button
-
-        var num = (0..enableQue.size).random()
-        Qtv.text = enableQue[num].que
-        var ans = enableQue[num].ans
-        ansButtons[0].text = ans[0]
-        ansButtons[1].text = ans[1]
-        ansButtons[2].text = ans[2]
-        ansButtons[3].text = ans[3]
-        ansButtons[0].setOnClickListener {
-            enableQue[num].checkAnswer(0)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[1].setOnClickListener {
-            enableQue[num].checkAnswer(1)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[2].setOnClickListener {
-            enableQue[num].checkAnswer(2)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        ansButtons[3].setOnClickListener {
-            enableQue[num].checkAnswer(3)
-            for (buttons in ansButtons)
-                buttons.isEnabled = false
-        }
-        enableQue.removeAt(num)
-
-        setContentView(R.layout.activity_quiz)
-        return ret
+    private fun toQuestion() {
+        SocketHelper.clientSocket = clientSocket
+        Log.d("Debug", "Вход в обычный вопрос-0.5")
+//        val someActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+//            if (result.resultCode == Activity.RESULT_OK) {
+//                val data: Intent? = result.data
+//                ret = data?.getIntExtra("ret", -1)
+//            }
+//        }
+        Log.d("Debug", "Вход в обычный вопрос-0.5")
+        val intent = Intent(this, QuizQuestion::class.java)
+        intent.putExtra("flag", false)
+        Log.d("Debug", "Вход в обычный вопрос-0.5")
+        startActivity(intent)
+        //someActivityResultLauncher.launch(intent)
     }
 
 
@@ -567,5 +552,7 @@ class Question(val que: String, val ans: Array<String>, val correctAnswerIndex:
     }
 }
 
-
+object SocketHelper {
+    var clientSocket: Socket? = null
+}
 
diff --git a/app/src/main/java/com/example/game/QuizQuestion.kt b/app/src/main/java/com/example/game/QuizQuestion.kt
new file mode 100644
index 0000000000000000000000000000000000000000..035a7d4b3ad654d6c2b7fc1c2a9c413b5041917d
--- /dev/null
+++ b/app/src/main/java/com/example/game/QuizQuestion.kt
@@ -0,0 +1,129 @@
+package com.example.game
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.io.PrintWriter
+
+class QuizQuestion : ComponentActivity() {
+    private lateinit var Qtv: TextView
+    private var ansButtons: Array<Button> = arrayOf()
+
+    val clientSocket = SocketHelper.clientSocket
+    private var writer = PrintWriter(clientSocket?.getOutputStream())
+    private var reader = BufferedReader(InputStreamReader(clientSocket?.getInputStream()))
+
+    var num: Int = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.d("Debug", "Вход в обычный вопрос")
+        setContentView(R.layout.activity_quiz_question)
+        Log.d("Debug", "Вход в обычный вопрос-2")
+
+//        GlobalScope.launch(Dispatchers.IO) {
+//            try {
+//                }
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//            }
+//        }
+
+//        val b = intent.extras
+//        val id = b!!.getInt("id")
+
+        Qtv = findViewById<TextView>(R.id.QuestionTV)
+        ansButtons[0] = findViewById<Button>(R.id.ans1)
+        ansButtons[1] = findViewById<Button>(R.id.ans2)
+        ansButtons[2] = findViewById<Button>(R.id.ans3)
+        ansButtons[3] = findViewById<Button>(R.id.ans4)
+
+        Log.d("Debug", "Вход в обычный вопрос-2.5")
+
+        num = (0..enableQue.size).random()
+        Qtv.text = enableQue[num].que
+        val ans = enableQue[num].ans
+        ansButtons[0].text = ans[0]
+        ansButtons[1].text = ans[1]
+        ansButtons[2].text = ans[2]
+        ansButtons[3].text = ans[3]
+        Log.d("Debug", "Вход в обычный вопрос-3")
+        ansButtons[0].setOnClickListener {
+            enableQue[num].checkAnswer(0)
+            for (buttons in ansButtons)
+                buttons.isEnabled = false
+            end()
+        }
+        ansButtons[1].setOnClickListener {
+            enableQue[num].checkAnswer(1)
+            for (buttons in ansButtons)
+                buttons.isEnabled = false
+            end()
+        }
+        ansButtons[2].setOnClickListener {
+            enableQue[num].checkAnswer(2)
+            for (buttons in ansButtons)
+                buttons.isEnabled = false
+            end()
+        }
+        ansButtons[3].setOnClickListener {
+            enableQue[num].checkAnswer(3)
+            for (buttons in ansButtons)
+                buttons.isEnabled = false
+            end()
+        }
+
+    }
+
+    private fun end() {
+        Log.d("Debug", "Выход из обычного вопроса")
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                writer.println("${enableQue[num].correct}")
+                writer.flush()
+                ret = enableQue[num].correct as Int
+
+                val b = intent.extras
+
+                if (b != null) {
+                    if (b.getBoolean("flag", false)) {
+                        var str = reader.readLine()
+                        if (str == "1")
+                            ret = 1
+                        else if (str == "0")
+                            ret = 0
+                        else if (str == "-1")
+                            ret = -1
+                        if ((ret == -1) and (enableQue[num].correct))
+                            ret = 1
+                        if ((ret == 1) and !enableQue[num].correct)
+                            ret = -1
+                    } else {
+                        Log.d("Debug", "Пройден обычный вопрос")
+                    }
+                }
+
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+        }
+
+        enableQue.removeAt(num)
+
+        //val resultCode = Activity.RESULT_OK // Используйте код результата по вашему усмотрению
+        //val intent = Intent()
+        //intent.putExtra("ret", ret)
+        //setResult(resultCode, intent)
+        finish()
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a6c2ef47da640a0be2f7c400b5c9e1f72c8af91..efd5e9c201b5a4ec150d71b9b0d0d827526162af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,5 @@
     <string name="logout">Выйти</string>
     <string name="title_activity_main">MainActivity</string>
     <string name="title_activity_custom_button">CustomButton</string>
+    <string name="title_activity_quiz_question">QuizQuestion</string>
 </resources>
\ No newline at end of file