Skip to content

M
Moecube Store
Commit f19f5f0b authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

fix

parent e3ba9477
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
assets/javascripts/decks.coffee
View file @ f19f5f0b
...@@ -145,7 +145,7 @@ class Deck extends Spine.Model ...@@ -145,7 +145,7 @@ class Deck extends Spine.Model
side = decoded >> 29 side = decoded >> 29
count = decoded >> 27 & 0x3 count = decoded >> 27 & 0x3
card_id = decoded & 0x07FFFFFF card_id = decoded & 0x07FFFFFF
card_usages.push {id: "#{result.cid}_#{side}_#{card_id}", card_id: card_id, side: side, count: count} card_usages.push {card_id: card_id, side: side, count: count}
result.card_usages card_usages result.card_usages card_usages
result result
@load: (str, name)-> @load: (str, name)->
...@@ -160,7 +160,7 @@ class Deck extends Spine.Model ...@@ -160,7 +160,7 @@ class Deck extends Spine.Model
if !line or line.charAt(0) == '#' if !line or line.charAt(0) == '#'
continue continue
else if line.substr(0, 5) == '!side' else if line.substr(0, 5) == '!side'
card_usages.push {id: "#{result.cid}_#{side}_#{last_id}", card_id: last_id, side: side, count: count} if last_id card_usages.push {id: "#{result.cid}_#{side}_#{last_id}_#{Math.random()}", card_id: last_id, side: side, count: count} if last_id
side = true side = true
last_id = null last_id = null
else else
...@@ -169,12 +169,12 @@ class Deck extends Spine.Model ...@@ -169,12 +169,12 @@ class Deck extends Spine.Model
if card_id == last_id if card_id == last_id
count++ count++
else else
card_usages.push {id: "#{result.cid}_#{side}_#{last_id}", card_id: last_id, side: side, count: count} if last_id card_usages.push {id: "#{result.cid}_#{side}_#{last_id}_#{Math.random()}", card_id: last_id, side: side, count: count} if last_id
last_id = card_id last_id = card_id
count = 1 count = 1
else else
throw '无效卡组' throw '无效卡组'
card_usages.push {id: "#{result.cid}_#{side}_#{last_id}", card_id: last_id, side: side, count: count} if last_id card_usages.push {id: "#{result.cid}_#{side}_#{last_id}_#{Math.random()}", card_id: last_id, side: side, count: count} if last_id
result.card_usages card_usages result.card_usages card_usages
result result
......
assets/javascripts/decks.js
View file @ f19f5f0b
...@@ -363,7 +363,6 @@ ...@@ -363,7 +363,6 @@
count = decoded >> 27 & 0x3; count = decoded >> 27 & 0x3;
card_id = decoded & 0x07FFFFFF; card_id = decoded & 0x07FFFFFF;
card_usages.push({ card_usages.push({
id: "" + result.cid + "_" + side + "_" + card_id,
card_id: card_id, card_id: card_id,
side: side, side: side,
count: count count: count
...@@ -392,7 +391,7 @@ ...@@ -392,7 +391,7 @@
} else if (line.substr(0, 5) === '!side') { } else if (line.substr(0, 5) === '!side') {
if (last_id) { if (last_id) {
card_usages.push({ card_usages.push({
id: "" + result.cid + "_" + side + "_" + last_id, id: "" + result.cid + "_" + side + "_" + last_id + "_" + (Math.random()),
card_id: last_id, card_id: last_id,
side: side, side: side,
count: count count: count
...@@ -408,7 +407,7 @@ ...@@ -408,7 +407,7 @@
} else { } else {
if (last_id) { if (last_id) {
card_usages.push({ card_usages.push({
id: "" + result.cid + "_" + side + "_" + last_id, id: "" + result.cid + "_" + side + "_" + last_id + "_" + (Math.random()),
card_id: last_id, card_id: last_id,
side: side, side: side,
count: count count: count
...@@ -424,7 +423,7 @@ ...@@ -424,7 +423,7 @@
} }
if (last_id) { if (last_id) {
card_usages.push({ card_usages.push({
id: "" + result.cid + "_" + side + "_" + last_id, id: "" + result.cid + "_" + side + "_" + last_id + "_" + (Math.random()),
card_id: last_id, card_id: last_id,
side: side, side: side,
count: count count: count
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment