ダイアログの表示
BackgroundManager修正　色々微修正　TODOメモをちまちま作成
pause-class
ダイアログ
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/src/org/genshin/scrollninja/GameMain.java
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Effect.class
	ScrollNinja/bin/org/genshin/scrollninja/Enemy.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyManager.class
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/Item.class
	ScrollNinja/bin/org/genshin/scrollninja/PlayerManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StageEditor.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponManager.class
	ScrollNinja/src/org/genshin/scrollninja/StageEditor.java
レイヤー機能実装
pause
ちまちまTODOメモ作成中
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/FileOperation.class
	ScrollNinja/bin/org/genshin/scrollninja/StageEditor.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObjectManager.class
	ScrollNinja/src/org/genshin/scrollninja/StageEditor.java
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/MainMenu.class
	ScrollNinja/src/org/genshin/scrollninja/GameMain.java
a
pause
文字表示できねー
エネミー移動修正、ステージオブジェクトは直らなかった　エフェクトもまだ途中
Merge remote-tracking branch 'kimura/master'
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Effect.class
	ScrollNinja/bin/org/genshin/scrollninja/Enemy.class
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
Merge remote-tracking branch 'iwakawa/master'

Conflicts:
	ScrollNinja-android/bin/classes/org/genshin/scrollninja/MainActivity.class
	ScrollNinja/bin/org/genshin/scrollninja/Background.class
	ScrollNinja/bin/org/genshin/scrollninja/BackgroundManager.class
	ScrollNinja/bin/org/genshin/scrollninja/CharacterBase.class
	ScrollNinja/bin/org/genshin/scrollninja/Effect.class
	ScrollNinja/bin/org/genshin/scrollninja/EffectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/Enemy.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyDataList$EnemyData.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyDataList.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyManager.class
	ScrollNinja/bin/org/genshin/scrollninja/FileOperation.class
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/Interface.class
	ScrollNinja/bin/org/genshin/scrollninja/Item.class
	ScrollNinja/bin/org/genshin/scrollninja/ItemManager.class
	ScrollNinja/bin/org/genshin/scrollninja/Katana.class
	ScrollNinja/bin/org/genshin/scrollninja/MainMenu.class
	ScrollNinja/bin/org/genshin/scrollninja/ObJectBase.class
	ScrollNinja/bin/org/genshin/scrollninja/PlayerManager.class
	ScrollNinja/bin/org/genshin/scrollninja/ScrollNinja.class
	ScrollNinja/bin/org/genshin/scrollninja/Stage.class
	ScrollNinja/bin/org/genshin/scrollninja/StageDataList$StageData.class
	ScrollNinja/bin/org/genshin/scrollninja/StageEditor.class
	ScrollNinja/bin/org/genshin/scrollninja/StageObject.class
	ScrollNinja/bin/org/genshin/scrollninja/StageObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/Syuriken.class
	ScrollNinja/bin/org/genshin/scrollninja/Weapon.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponBase.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponManager.class
ObjectBaseを継承しているものをobjectパッケージに移動　SyurikenとEffect微修正
ゴミ掃除