Merge branch 'bug-fix-12-05'

src/main/java/com/bomostory/sceneeditmodule/SceneEditActivity.kt

@@ -1079,7 +1079,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.removeAt(actor.positionZ)
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(actor)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1091,7 +1091,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.remove(actor)
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(0, actor)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1102,7 +1102,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
             project.story?.let {
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.removeAt(actor.positionZ)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1261,7 +1261,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.remove(actor)
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(actor)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1273,7 +1273,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.remove(actor)
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(0, actor)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1284,7 +1284,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
             project.story?.let {
                 it.scenes?.let {
                     it[currentSceneIndex].layers[currentLayerIndex].actors.removeAt(actor.positionZ)
-                    setActorPositionZ(it[currentLayerIndex].layers[currentLayerIndex].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                 }
@@ -1451,7 +1451,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                 it.scenes?.let {
                     it[currentSceneIndex].layers[selectLayer].actors.remove(actor)
                     it[currentSceneIndex].layers[selectLayer].actors.add(actor)
-                    setActorPositionZ(it[selectLayer].layers[selectLayer].actors)
+                    setActorPositionZ(it[currentSceneIndex].layers[selectLayer].actors)
                     sceneEditView.scene = it[currentSceneIndex]
                     popupWindow.dismiss()
                     layerManagementDialog.setData(it[currentSceneIndex])

src/main/java/com/bomostory/sceneeditmodule/screen/view/DialogueView.kt

@@ -158,6 +158,8 @@ class DialogueView : EditActorView{
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
                         opacity = actor.opacity
+                        dialogColor = actor.dialogColor
+                        dialogType = actor.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -225,6 +227,8 @@ class DialogueView : EditActorView{
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
                         opacity = actor.opacity
+                        dialogColor = actor.dialogColor
+                        dialogType = actor.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -290,6 +294,8 @@ class DialogueView : EditActorView{
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
                         opacity = actor.opacity
+                        dialogColor = actor.dialogColor
+                        dialogType = actor.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -355,6 +361,8 @@ class DialogueView : EditActorView{
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
                         opacity = actor.opacity
+                        dialogColor = actor.dialogColor
+                        dialogType = actor.dialogType
                     }
                     dialogue = dialogueData
                 }