Skip to content

Commit 7663391

Browse files
author
qingzhang10
committed
优化卡牌位置等
1 parent b6d40cf commit 7663391

File tree

12 files changed

+41
-63
lines changed

12 files changed

+41
-63
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎SpiderCard.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,13 @@
353353
CODE_SIGN_ENTITLEMENTS = SpiderCard/SpiderCard.entitlements;
354354
CODE_SIGN_STYLE = Automatic;
355355
COMBINE_HIDPI_IMAGES = YES;
356+
CURRENT_PROJECT_VERSION = 202107312300;
356357
INFOPLIST_FILE = SpiderCard/Info.plist;
357358
LD_RUNPATH_SEARCH_PATHS = (
358359
"$(inherited)",
359360
"@executable_path/../Frameworks",
360361
);
362+
MARKETING_VERSION = 1.0.0;
361363
PRODUCT_BUNDLE_IDENTIFIER = com.tsing.SpiderCard;
362364
PRODUCT_NAME = "蜘蛛纸牌";
363365
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -374,11 +376,13 @@
374376
CODE_SIGN_ENTITLEMENTS = SpiderCard/SpiderCard.entitlements;
375377
CODE_SIGN_STYLE = Automatic;
376378
COMBINE_HIDPI_IMAGES = YES;
379+
CURRENT_PROJECT_VERSION = 202107312300;
377380
INFOPLIST_FILE = SpiderCard/Info.plist;
378381
LD_RUNPATH_SEARCH_PATHS = (
379382
"$(inherited)",
380383
"@executable_path/../Frameworks",
381384
);
385+
MARKETING_VERSION = 1.0.0;
382386
PRODUCT_BUNDLE_IDENTIFIER = com.tsing.SpiderCard;
383387
PRODUCT_NAME = "蜘蛛纸牌";
384388
SWIFT_VERSION = 5.0;

‎SpiderCard.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate‎

9.63 KB
Binary file not shown.

‎SpiderCard/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSMinimumSystemVersion</key>
2424
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2525
<key>NSMainStoryboardFile</key>

‎SpiderCard/manager/Action.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class Wash: Action {
243243
for j in 0...5 {
244244
let card = all[j + i * 6]
245245
if j < 5 {
246-
// card.mode = false
246+
card.mode = false
247247
}
248248
poker.deskArea[i].append(card)
249249
}
@@ -253,7 +253,7 @@ class Wash: Action {
253253
for j in 0...4 {
254254
let card = all[j + (i-4) * 5]
255255
if j < 4 {
256-
// card.mode = false
256+
card.mode = false
257257
}
258258
poker.deskArea[i].append(card)
259259
}
@@ -263,7 +263,7 @@ class Wash: Action {
263263
for i in 0...4 {
264264
for j in 0...9 {
265265
let card = all[j + i * 10]
266-
// card.mode = false
266+
card.mode = false
267267
poker.waitingArea[i].append(card)
268268
}
269269
}

‎SpiderCard/manager/Const.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@ import Foundation
1010
class Const {
1111
static let CARD_WIDTH: CGFloat = 71.0
1212
static let CARD_HEIGHT: CGFloat = 96.0
13+
14+
static let LEFT_MARGIN: CGFloat = 20.0
15+
static let RIGHT_MARGIN: CGFloat = 20.0
16+
static let TOP_MARGIN: CGFloat = 20.0
17+
static let BOTTOM_MARGIN: CGFloat = 20.0
1318
}

‎SpiderCard/ui/CardView.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ class CardView: NSImageView {
1717
// Drawing code here.
1818
}
1919

20-
var _tag = 0
21-
22-
override var tag: Int {
23-
get {
24-
return _tag
25-
}
26-
set {
27-
_tag = newValue
28-
}
29-
}
30-
3120
override init(frame frameRect: NSRect) {
3221
super.init(frame: frameRect)
3322
}

‎SpiderCard/ui/DeskAreaView.swift‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,12 @@ protocol DeskAreaViewDelegate: class {
1313

1414
class DeskAreaView: NSView {
1515

16-
var cardScale: CGFloat = 1.0
17-
let kPadding: CGFloat = 10.0
1816
let kInnerMargin: CGFloat = 20.0
1917

2018
var cards: Array<Array<Card>>?
2119

2220
weak var delegate: DeskAreaViewDelegate?
2321

24-
var cardWidth: CGFloat {
25-
return cardScale * 71.0
26-
}
27-
28-
var cardHeight: CGFloat {
29-
return cardScale * 96.0
30-
}
31-
3222
var columnFrames: Array<NSRect> = []
3323
var selectedInfo: (columnIndex: Int, cardIndex: Int)?
3424
var deskCardViews: Array<Array<CardView>> = []
@@ -65,36 +55,35 @@ class DeskAreaView: NSView {
6555
for subview in self.subviews {
6656
subview.removeFromSuperview()
6757
}
68-
69-
let columnWidth = (frame.size.width - CGFloat(2 * kPadding + 9 * kInnerMargin)) / 10.0
58+
59+
let margin = (frame.size.width - 10 * Const.CARD_WIDTH - Const.LEFT_MARGIN - Const.RIGHT_MARGIN) / 9.0
7060
let columnHeight = frame.size.height
71-
var columnX = CGFloat(kPadding)
61+
var columnX = CGFloat(Const.LEFT_MARGIN)
7262
let columnY = CGFloat(0)
7363

74-
cardScale = columnWidth / 71.0
75-
7664
for column in cards {
77-
let frame = CGRect.init(x: columnX, y: columnY, width: columnWidth, height: columnHeight)
65+
let frame = CGRect.init(x: columnX, y: columnY, width: Const.CARD_WIDTH, height: columnHeight)
7866
let emptyImageView = NSImageView.init(image: NSImage.init(named: "empty")!)
79-
emptyImageView.frame = CGRect.init(x: columnX, y: columnHeight - cardHeight, width: cardWidth, height: cardHeight)
67+
emptyImageView.frame = CGRect.init(x: columnX, y: columnHeight - Const.CARD_WIDTH,
68+
width: Const.CARD_WIDTH, height: Const.CARD_HEIGHT)
8069
self.addSubview(emptyImageView)
8170

8271
setupColumnCard(frame: frame, cards: column)
8372
columnFrames.append(frame)
84-
columnX += (kInnerMargin + columnWidth)
73+
columnX += (margin + Const.CARD_WIDTH)
8574
}
8675
}
8776

8877
func setupColumnCard(frame: NSRect, cards: Array<Card>) {
8978
let x: CGFloat = frame.origin.x
90-
var y: CGFloat = frame.height - cardHeight
79+
var y: CGFloat = frame.height - Const.CARD_HEIGHT
9180
var frames: Array<NSRect> = []
9281
var views: Array<CardView> = []
9382
for (index, card) in cards.enumerated() {
9483
let imageView = CardView.init(card: card)
9584
imageView.layer?.zPosition = CGFloat(index)
9685
var margin: CGFloat = 15.0
97-
let frame = CGRect.init(x: x, y: y, width: cardWidth, height: cardHeight)
86+
let frame = CGRect.init(x: x, y: y, width: Const.CARD_WIDTH, height: Const.CARD_HEIGHT)
9887
frames.append(frame)
9988
views.append(imageView)
10089
imageView.setFrame(frame: frame)
@@ -164,7 +153,7 @@ class DeskAreaView: NSView {
164153

165154
let lastCard = lastCardViewOf(columnIndex: columnIndex)
166155
let lastFrame = lastCard?.frame
167-
var origin = CGPoint.init(x: columnFrames[columnIndex].origin.x, y: columnFrames[columnIndex].height - cardHeight)
156+
var origin = CGPoint.init(x: columnFrames[columnIndex].origin.x, y: columnFrames[columnIndex].height - Const.CARD_HEIGHT)
168157
if lastFrame != nil {
169158
origin = CGPoint.init(x: lastFrame!.origin.x, y: lastFrame!.origin.y - 20)
170159
}

‎SpiderCard/ui/FinishedAreaView.swift‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ class FinishedAreaView: NSView {
1313

1414
let kPadding: CGFloat = 10.0
1515
let kInnerMargin: CGFloat = 20.0
16-
17-
var cardScale: CGFloat = 1.0
1816

1917
override func draw(_ dirtyRect: NSRect) {
2018
super.draw(dirtyRect)
@@ -31,8 +29,8 @@ class FinishedAreaView: NSView {
3129
subview.removeFromSuperview()
3230
}
3331

34-
let columnWidth = cardScale * Const.CARD_WIDTH
35-
let columnHeight = cardScale * Const.CARD_HEIGHT
32+
let columnWidth = Const.CARD_WIDTH
33+
let columnHeight = Const.CARD_HEIGHT
3634

3735
var columnX = CGFloat(0)
3836
let columnY = CGFloat(0)
@@ -49,12 +47,11 @@ class FinishedAreaView: NSView {
4947
}
5048
}
5149

52-
init(cardScale: CGFloat, cards: Array<Array<Card>>) {
50+
init(cards: Array<Array<Card>>) {
5351
self.finishedCards = cards
54-
self.cardScale = cardScale
5552

56-
let columnWidth = cardScale * Const.CARD_WIDTH
57-
let columnHeight = cardScale * Const.CARD_HEIGHT
53+
let columnWidth = Const.CARD_WIDTH
54+
let columnHeight = Const.CARD_HEIGHT
5855

5956
let width = columnWidth + CGFloat(7) * kInnerMargin
6057
let height = columnHeight

‎SpiderCard/ui/MainViewController.swift‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import Cocoa
99

1010
class MainViewController: NSViewController, WaitingAreaViewDelegate, DeskAreaViewDelegate {
1111

12-
1312
var deskAreaView: DeskAreaView?
1413
var waitingAreaView: WaitingAreaView?
1514
var scoreAreaView: ScoreAreaView?
@@ -83,22 +82,20 @@ class MainViewController: NSViewController, WaitingAreaViewDelegate, DeskAreaVie
8382

8483
var frame = self.view.bounds
8584
frame.size.height = frame.height * 0.7
86-
frame.origin.y = frame.origin.y + self.view.bounds.height - frame.height
85+
frame.origin.y = frame.origin.y + self.view.bounds.height - frame.height - Const.TOP_MARGIN
8786
deskAreaView = DeskAreaView.init(frame: frame,
8887
cards: GameManager.instance().deskAreaCards)
8988
deskAreaView?.delegate = self
9089

91-
waitingAreaView = WaitingAreaView.init(cardScale: deskAreaView!.cardScale,
92-
cards: GameManager.instance().waittingAreaCards)
93-
waitingAreaView?.setFrameOrigin(CGPoint.init(x: self.view.bounds.width - waitingAreaView!.bounds.width,
94-
y: waitingAreaView!.bounds.origin.y))
90+
waitingAreaView = WaitingAreaView.init(cards: GameManager.instance().waittingAreaCards)
91+
waitingAreaView?.setFrameOrigin(CGPoint.init(x: self.view.bounds.width - waitingAreaView!.bounds.width - 20,
92+
y: waitingAreaView!.bounds.origin.y + Const.BOTTOM_MARGIN))
9593
waitingAreaView?.delegate = self
9694

97-
scoreAreaView = ScoreAreaView.init(frame: CGRect.init(x: self.view.bounds.midX - 100, y: 0, width: 200, height: 100))
95+
scoreAreaView = ScoreAreaView.init(frame: CGRect.init(x: self.view.bounds.midX - 100, y: Const.BOTTOM_MARGIN, width: 200, height: 100))
9896

99-
finishedAreaView = FinishedAreaView.init(cardScale: deskAreaView!.cardScale,
100-
cards: GameManager.instance().finishedAreaCards)
101-
finishedAreaView?.setFrameOrigin(CGPoint.init(x: 0, y: 0))
97+
finishedAreaView = FinishedAreaView.init(cards: GameManager.instance().finishedAreaCards)
98+
finishedAreaView?.setFrameOrigin(CGPoint.init(x: 20, y: Const.BOTTOM_MARGIN))
10299

103100
self.view.addSubview(deskAreaView!)
104101
self.view.addSubview(waitingAreaView!)

0 commit comments

Comments
 (0)