Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Parsons committed Jun 18, 2024
1 parent ef93491 commit 16c3454
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 150 deletions.
176 changes: 88 additions & 88 deletions src/classes/MainPlayer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,65 +76,65 @@ export default class MainPlayer extends Player {
this.mainInstanceMap = {}
// this.createMainPlayerInstance({ baseX: x, baseY: y, scene })
}
createMainInstance() {
createInstance() {
super.createInstance()
const baseX = this.x
const baseY = this.y
const scene = this.scene
// 創建一個白色的矩形
const rectangle = scene.add.rectangle(0, 0, 200, 200, 0xffffff)
// 創建文字
const idText = scene.add.text(0, -80, this.id, {
fontSize: '24px',
color: '#000000',
})
const generralText = scene.add.text(0, -40, this.general.name, {
fontSize: '20px',
color: '#000',
})
const roleText = scene.add.text(0, 0, roleMap[this.roleId] || '?', {
fontSize: '20px',
color: '#000',
})
// const hpText = scene.add.text(0, 40, `血量: ${this.hp}`, {
// // 創建一個白色的矩形
// const rectangle = scene.add.rectangle(0, 0, 200, 200, 0xffffff)
// // 創建文字
// const idText = scene.add.text(0, -80, this.id, {
// fontSize: '24px',
// color: '#000000',
// })
// const generralText = scene.add.text(0, -40, this.general.name, {
// fontSize: '20px',
// color: '#000',
// })
const equipmentNames = this.equipments
.filter((equipmentId) => equipmentId)
.map((equipmentId) => {
const equipment = threeKingdomsCards[equipmentId]
return equipment.name
})
.join(', ')
const equipmentText = scene.add.text(0, 70, `裝備: ${equipmentNames}`, {
fontSize: '20px',
color: '#000',
})
// 設置文字位置在矩形中心
const texts = [idText, generralText, roleText, equipmentText]
texts.forEach((text) => {
text.setOrigin(0.5)
})
// 將矩形和文字添加到容器中，以便一起操作
const container = scene.add.container(0, 0, [
rectangle,
idText,
roleText,
generralText,
// hpText,
equipmentText,
])
// const roleText = scene.add.text(0, 0, roleMap[this.roleId] || '?', {
// fontSize: '20px',
// color: '#000',
// })
// // const hpText = scene.add.text(0, 40, `血量: ${this.hp}`, {
// // fontSize: '20px',
// // color: '#000',
// // })
// const equipmentNames = this.equipments
// .filter((equipmentId) => equipmentId)
// .map((equipmentId) => {
// const equipment = threeKingdomsCards[equipmentId]
// return equipment.name
// })
// .join(', ')
// const equipmentText = scene.add.text(0, 70, `裝備: ${equipmentNames}`, {
// fontSize: '20px',
// color: '#000',
// })
// // 設置文字位置在矩形中心
// const texts = [idText, generralText, roleText, equipmentText]
// texts.forEach((text) => {
// text.setOrigin(0.5)
// })
// // 將矩形和文字添加到容器中，以便一起操作
// const container = scene.add.container(0, 0, [
// rectangle,
// idText,
// roleText,
// generralText,
// // hpText,
// equipmentText,
// ])

// 設置容器位置在遊戲場景中心
container.setPosition(baseX, baseY)
this.instance = container
this.scene = scene
// return container
rectangle.setInteractive()
rectangle.on('pointerdown', () => {
this.handleClickPlayer(this)
})
// // 設置容器位置在遊戲場景中心
// container.setPosition(baseX, baseY)
// this.instance = container
// this.scene = scene
// // return container
// rectangle.setInteractive()
// rectangle.on('pointerdown', () => {
// this.handleClickPlayer(this)
// })
// 棄牌按鈕
const checkbtn = scene.add.rectangle(0, 80, 100, 40, 0x00ff00)
checkbtn.setInteractive()
Expand Down Expand Up @@ -406,43 +406,43 @@ export default class MainPlayer extends Player {
})
}
}
updatePlayerData(data: any) {
// 手牌數確認
// if (data.hand.size !== this.hand.size) {
// this.hand.size = data.hand.size
// const handText: Phaser.GameObjects.Text = this.instance.getAt(5)
// handText.setText(`手牌: ${this.hand.size}`)
// this.scene.tweens.add({
// targets: handText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
// }
// 裝備數確認
if (data.equipments.join() !== this.equipments.join()) {
this.equipments = data.equipments
const equipmentNames = this.equipments
.filter((equipmentId) => equipmentId)
.map((equipmentId) => {
const equipment = threeKingdomsCards[equipmentId]
return equipment.name
})
.join(', ')
const equipmentText: Phaser.GameObjects.Text = this.instance.getAt(5)
equipmentText.setText(`裝備: ${equipmentNames}`)
this.scene.tweens.add({
targets: equipmentText,
scale: 1.5,
duration: 150, // 持續時間（毫秒）
ease: 'Power2',
yoyo: true,
repeat: 1,
})
}
}
// updatePlayerData(data: any) {
// // 手牌數確認
// // if (data.hand.size !== this.hand.size) {
// // this.hand.size = data.hand.size
// // const handText: Phaser.GameObjects.Text = this.instance.getAt(5)
// // handText.setText(`手牌: ${this.hand.size}`)
// // this.scene.tweens.add({
// // targets: handText,
// // scale: 1.5,
// // duration: 150, // 持續時間（毫秒）
// // ease: 'Power2',
// // yoyo: true,
// // repeat: 1,
// // })
// // }
// // 裝備數確認
// if (data.equipments.join() !== this.equipments.join()) {
// this.equipments = data.equipments
// const equipmentNames = this.equipments
// .filter((equipmentId) => equipmentId)
// .map((equipmentId) => {
// const equipment = threeKingdomsCards[equipmentId]
// return equipment.name
// })
// .join(', ')
// const equipmentText: Phaser.GameObjects.Text = this.instance.getAt(5)
// equipmentText.setText(`裝備: ${equipmentNames}`)
// this.scene.tweens.add({
// targets: equipmentText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
// }
// }
resetOutofDistance = () => {
this.seats.forEach((player) => {
player.setOutOfDistance(false)
Expand Down
83 changes: 21 additions & 62 deletions src/classes/Player.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,70 +247,29 @@ export default class Player {
}
// 裝備數確認
if (data.equipments.join() !== this.equipments.join()) {
if (data.equipments[0] !== this.equipments[0]) {
this.equipments[0] = data.equipments[0]
this.updateEquipments(0)
}
if (data.equipments[1] !== this.equipments[1]) {
this.equipments[1] = data.equipments[1]
this.updateEquipments(1)
// const armorText: Phaser.GameObjects.Text = this.instance.getAt(7)
// armorText.setText(`${threeKingdomsCards[this.equipments[1]].name}`)
// this.scene.tweens.add({
// targets: armorText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
}
if (data.equipments[2] !== this.equipments[2]) {
this.equipments[2] = data.equipments[2]
this.updateEquipments(2)
// const horsePlusText: Phaser.GameObjects.Text = this.instance.getAt(8)
// horsePlusText.setText(`${threeKingdomsCards[this.equipments[2]].name}`)
// this.scene.tweens.add({
// targets: horsePlusText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
}
if (data.equipments[3] !== this.equipments[3]) {
this.equipments[3] = data.equipments[3]
this.updateEquipments(3)
// const horseMinusText: Phaser.GameObjects.Text = this.instance.getAt(9)
// horseMinusText.setText(`${threeKingdomsCards[this.equipments[3]].name}`)
// this.scene.tweens.add({
// targets: horseMinusText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
for (let i = 0; i < 4; i++) {
if (data.equipments[i] !== this.equipments[i]) {
this.equipments[i] = data.equipments[i]
this.updateEquipments(i)
}
}
// if (data.equipments[0] !== this.equipments[0]) {
// this.equipments[0] = data.equipments[0]
// this.updateEquipments(0)
// }
// if (data.equipments[1] !== this.equipments[1]) {
// this.equipments[1] = data.equipments[1]
// this.updateEquipments(1)
// }
// if (data.equipments[2] !== this.equipments[2]) {
// this.equipments[2] = data.equipments[2]
// this.updateEquipments(2)
// }
// if (data.equipments[3] !== this.equipments[3]) {
// this.equipments[3] = data.equipments[3]
// this.updateEquipments(3)
// }
this.equipments = data.equipments
// const equipmentNames = this.equipments
// .filter((equipmentId) => equipmentId)
// .map((equipmentId) => {
// const equipment = threeKingdomsCards[equipmentId]
// return equipment.name
// })
// .join(', ')
// const equipmentText: Phaser.GameObjects.Text = this.instance.getAt(6)
// equipmentText.setText(`裝備: ${equipmentNames}`)
// this.scene.tweens.add({
// targets: equipmentText,
// scale: 1.5,
// duration: 150, // 持續時間（毫秒）
// ease: 'Power2',
// yoyo: true,
// repeat: 1,
// })
}
}
setOutOfDistance(isOutofDistance: boolean) {
Expand Down

0 comments on commit 16c3454

Please sign in to comment.