pull/28/head
Your Name 10 months ago
parent 49021e8deb
commit dce73b3fd3

@ -21,13 +21,13 @@ struct ArkitDoushiQiApp: App {
@StateObject private var languageSettings = LanguageSettings(selectedLanguage: .English)
var body: some Scene {
WindowGroup {
/*
MainMenu(playButtonText: "Play", registeredGamesButtonText: "Registered Games")
.environmentObject(LanguageSettings(selectedLanguage: .French)
)
.environmentObject(languageSettings)
.preferredColorScheme(isDarkMode ? .dark : .light)*/
ContentArkit()
.preferredColorScheme(isDarkMode ? .dark : .light)
//ContentArkit()
}
}
}

@ -8,6 +8,7 @@
import Foundation
import SpriteKit
import DouShouQiModel
import SwiftUI
class GameScene: SKScene {
var isGameOver = false
@ -15,9 +16,9 @@ class GameScene: SKScene {
var game: Game = try! Game(withRules: ClassicRules(), andPlayer1: HumanPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!)
var player1Name: String
var player1Image: UIImage
var player1Image: Image
var player2Name: String
var player2Image: UIImage
var player2Image: Image
var pieces: [Owner: [Animal: SpriteMoople]] = [
.player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red),
@ -42,17 +43,17 @@ class GameScene: SKScene {
required init?(coder aDecoder: NSCoder) {
self.player1Name = ""
self.player1Image = UIImage()
self.player1Image = Image("profil")
self.player2Name = ""
self.player2Image = UIImage()
self.player2Image = Image("profil")
super.init(coder: aDecoder)
}
override init(size: CGSize) {
self.player1Name = ""
self.player1Image = UIImage()
self.player1Image = Image("profil")
self.player2Name = ""
self.player2Image = UIImage()
self.player2Image = Image("profil")
super.init(size: size)
// -- -- //
scaleMode = .aspectFit
@ -72,7 +73,7 @@ class GameScene: SKScene {
}
init(size: CGSize, player1Name: String, player1Image: UIImage, player2Name: String, player2Image: UIImage) {
init(size: CGSize, player1Name: String, player1Image: Image, player2Name: String, player2Image: Image) {
self.player1Name = player1Name
self.player1Image = player1Image
self.player2Name = player2Name

@ -10,19 +10,13 @@ import SpriteKit
import DouShouQiModel
struct GameView: View {
var player1Name: String
var player1Name: String = "toto"
var player1Image: UIImage
var player2Name: String
var player2Name: String = "toto"
var player2Image: UIImage
var gameScene: GameScene {
let scene = GameScene(size: CGSize(width: 940, height: 740),
player1Name: player1Name,
player1Image: player1Image,
player2Name: player2Name,
player2Image: player2Image)
return scene
}
var gameScene: GameScene = GameScene(size: CGSize(width: 940, height: 740),player1Name:"TOTO",player1Image: Image("profil"),player2Name:"toto2",player2Image: Image("profil"))
@State var msg: String = ""
@ -50,14 +44,15 @@ struct GameView: View {
try! await player.chooseMove(in: board, with: gameScene.game.rules)
}
}
print("Start ?")
try! await gameScene.game.start()
print("After satrt")
}
VStack {
HStack {
VStack {
Image(uiImage: player1Image)
Image("profil")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 125, height: 125)
@ -70,7 +65,7 @@ struct GameView: View {
}
Spacer()
VStack {
Image(uiImage: player2Image)
Image("profil")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 125, height: 125)
@ -92,6 +87,14 @@ struct GameView: View {
}
}
init(playerName1:String,image1:UIImage,player2Name:String,image2:UIImage){
//self.player1Name = playerName1
self.player1Image = image1
//self.player2Name = player2Name
self.player2Image = image2
}
// ------ Listener -------- //
func startGame() {
@ -154,7 +157,7 @@ struct GameView: View {
// ------------------------- //
}
/*
struct GameView_Previews: PreviewProvider {
static var previews: some View {
GameView(
@ -165,3 +168,4 @@ struct GameView_Previews: PreviewProvider {
)
}
}
*/

@ -68,7 +68,6 @@ class SpriteMoople : SKNode {
refGameScene!.removeChildren(in: refGameScene!.deplacementPossible)
if let localisation = localisation {
print(localisation)
if (localisation.x > 450 || localisation.x < -450 || localisation.y < -350 || localisation.y > 350){
print("Hors limite !")
self.position = returnPositionByCellPos(cellX:Int(self.cellPosition.x),cellY:Int(self.cellPosition.y))

@ -42,7 +42,7 @@ struct GameParametersMenuView: View, KeyboardReadable {
if !isKeyboardVisible {
ButtonComponent(title: "Lancer la partie") {
GameView(player1Name: playerName1, player1Image: playerImage1, player2Name: playerName2, player2Image: playerImage2)
GameView(playerName1: playerName1, image1: playerImage1, player2Name: playerName2, image2: playerImage2)
}
.padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32))
}

Loading…
Cancel
Save