Fixed #411.
This commit is contained in:
parent
953c9064f5
commit
77f923752f
4 changed files with 13 additions and 13 deletions
app
lib/surface
views
|
@ -65,13 +65,13 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
|
|||
@age = 0
|
||||
@displayObject = new createjs.Container()
|
||||
if @thangType.get('actions')
|
||||
@onThangTypeLoaded()
|
||||
@setupSprite()
|
||||
else
|
||||
@stillLoading = true
|
||||
@thangType.fetch()
|
||||
@thangType.once 'sync', @onThangTypeLoaded, @
|
||||
@thangType.once 'sync', @setupSprite, @
|
||||
|
||||
onThangTypeLoaded: ->
|
||||
setupSprite: ->
|
||||
@stillLoading = false
|
||||
@actions = @thangType.getActions()
|
||||
@buildFromSpriteSheet @buildSpriteSheet()
|
||||
|
@ -101,6 +101,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
|
|||
# temp, until these are re-exported with perspective
|
||||
if @options.camera and @thangType.get('name') in ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle']
|
||||
sprite.scaleY *= @options.camera.y2x
|
||||
@displayObject.removeChild(@imageObject) if @imageObject
|
||||
@imageObject = sprite
|
||||
@displayObject.addChild(sprite)
|
||||
@addHealthBar()
|
||||
|
|
|
@ -24,7 +24,7 @@ module.exports = class WizardSprite extends IndieSprite
|
|||
|
||||
constructor: (thangType, options) ->
|
||||
if options?.isSelf
|
||||
options.colorConfig = me.get('wizard')?.colorConfig or {}
|
||||
options.colorConfig = _.cloneDeep(me.get('wizard')?.colorConfig) or {}
|
||||
super thangType, options
|
||||
@isSelf = options.isSelf
|
||||
@targetPos = @thang.pos
|
||||
|
@ -59,7 +59,12 @@ module.exports = class WizardSprite extends IndieSprite
|
|||
onMeSynced: (e) ->
|
||||
return unless @isSelf
|
||||
@setNameLabel me.displayName() if @displayObject.visible # not if we hid the wiz
|
||||
@setColorHue me.get('wizardColor1')
|
||||
newColorConfig = me.get('wizard')?.colorConfig or {}
|
||||
shouldUpdate = not _.isEqual(newColorConfig, @options.colorConfig)
|
||||
@options.colorConfig = _.cloneDeep(newColorConfig)
|
||||
if shouldUpdate
|
||||
@setupSprite()
|
||||
@playAction(@currentAction)
|
||||
|
||||
onSpriteSelected: (e) ->
|
||||
return unless @isSelf
|
||||
|
|
|
@ -85,8 +85,6 @@ module.exports = class WizardSettingsView extends CocoView
|
|||
initStage: ->
|
||||
@stage = new createjs.Stage(@$el.find('canvas')[0])
|
||||
@updateMovieClip()
|
||||
createjs.Ticker.setFPS 20
|
||||
createjs.Ticker.addEventListener("tick", @stage)
|
||||
|
||||
updateMovieClip: ->
|
||||
return unless @wizardThangType.loaded
|
||||
|
@ -106,8 +104,4 @@ module.exports = class WizardSettingsView extends CocoView
|
|||
@movieClip.regX = reg.x
|
||||
@movieClip.regY = reg.y
|
||||
@stage.addChild @movieClip
|
||||
@stage.update()
|
||||
|
||||
destroy: ->
|
||||
@stage?.removeAllEventListeners()
|
||||
super()
|
||||
@stage.update()
|
|
@ -198,7 +198,7 @@ module.exports = class PlayLevelView extends View
|
|||
|
||||
afterInsert: ->
|
||||
super()
|
||||
# @showWizardSettingsModal() if not me.get('name')
|
||||
@showWizardSettingsModal() if not me.get('name')
|
||||
|
||||
# callbacks
|
||||
|
||||
|
|
Reference in a new issue