OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...
authorttwilb <ttwilb@users.sourceforge.jp>
Wed, 14 Aug 2013 13:39:53 +0000 (22:39 +0900)
committerttwilb <ttwilb@users.sourceforge.jp>
Wed, 14 Aug 2013 13:39:53 +0000 (22:39 +0900)
Conflicts:
www/corelib/classes/CharacterClass.js

1  2 
www/corelib/classes/CharacterClass.js

@@@ -5,9 -5,8 +5,9 @@@ var CharacterClass = function(ownerStag
        //\83L\83\83\83\89\93Æ\8e©\82Ì\8b@\94\\81i\82½\82Æ\82¦\82Î\8dU\8c\82\82â\91\8a\8eè\82ª\93\96\82½\82Á\82Ä\82«\82½\82Æ\82«\82Ì\82 \82½\82è\94»\92è\82È\82Ç)
                
        this.interval = 15;
-       this.imageState = -1;
+       this.imageState = 0;
 -      //imageState == 0:\92Ê\8fí\8fó\91Ô\81i\95û\8cü\82É\8aÖ\8cW\82È\82µ\81B\89æ\91\9c\82Í\82·\82×\82Ä\8d\8cü\82«\82Å\97p\88Ó\82·\82é\81B\81j
 +      //imageState == 1:\8d\89E\95à\8ds\92\86\82Ü\82½\82Í\8d\89E\95û\8cü\82É\8cü\82¢\82Ä\92â\8e~\92\86\81i\95û\8cü\82É\8aÖ\8cW\82È\82µ\81B\89æ\91\9c\82Í\82·\82×\82Ä\8d\8cü\82«\82Å\97p\88Ó\82·\82é\81B\81j
 +      
        this.imageIndex = 0;
        this.imageList = [];
        for(var i = 0; i < args.length; i++)