commit 5ec4ad9d32cc05e40019334fef9545b814593e12 Author: admin Date: Mon Feb 22 17:53:59 2016 +0900 2/17版のpictcodeを移植 diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php index 15b9d76..0f51375 100644 --- a/app/Controller/AppController.php +++ b/app/Controller/AppController.php @@ -41,8 +41,26 @@ class AppController extends Controller { public $components = array( 'DebugKit.Toolbar', 'Session', - /* + 'Flash', 'Auth' => array( + 'loginRedirect' => array( + 'controller' => 'users', + 'action' => 'index' + ), + 'logoutRedirect' => array( + 'controller' => 'users', + 'action' => 'login', + 'home' + ), + 'authenticate' => array( + 'Form' => array( + 'fields' => array( + 'username' => 'login_id', //Default is 'username' in the userModel + 'password' => 'password' //Default is 'password' in the userModel + ), + 'passwordHasher' => 'Blowfish' + ) + ), 'flash' => array( 'element' => 'alert', 'key' => 'auth', @@ -52,6 +70,5 @@ class AppController extends Controller { ) ) ) - */ ); } diff --git a/app/Controller/PictcodeController.php b/app/Controller/PictcodeController.php index 5fa03ea..338517e 100644 --- a/app/Controller/PictcodeController.php +++ b/app/Controller/PictcodeController.php @@ -39,6 +39,10 @@ class PictcodeController extends AppController { public $uses = array(''); public $layout = 'top'; + function beforeFilter(){ + $this->Auth->allow(); + } + /** * index */ diff --git a/app/Controller/TopController.php b/app/Controller/TopController.php index 98db7e1..8583dca 100644 --- a/app/Controller/TopController.php +++ b/app/Controller/TopController.php @@ -40,6 +40,9 @@ class TopController extends AppController { public $uses = array('ContactValidate'); public $layout = 'top'; + function beforeFilter(){ + $this->Auth->allow(); + } /** * index */ diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php new file mode 100644 index 0000000..d41f772 --- /dev/null +++ b/app/Controller/UsersController.php @@ -0,0 +1,142 @@ +User->recursive = 0; + $this->set('users', $this->Paginator->paginate()); + } + +/** + * view method + * + * @throws NotFoundException + * @param string $id + * @return void + */ + public function view($id = null) { + if (!$this->User->exists($id)) { + throw new NotFoundException(__('Invalid user')); + } + $options = array('conditions' => array('User.' . $this->User->primaryKey => $id)); + $this->set('user', $this->User->find('first', $options)); + } + +/** + * add method + * + * @return void + */ + public function add() { + if ($this->request->is('post')) { + $this->User->create(); + if ($this->User->save($this->request->data)) { + $this->Flash->success(__('The user has been saved.')); + return $this->redirect(array('action' => 'index')); + } else { + $this->Flash->error(__('The user could not be saved. Please, try again.')); + } + } + } + +/** + * edit method + * + * @throws NotFoundException + * @param string $id + * @return void + */ + public function edit($id = null) { + if (!$this->User->exists($id)) { + throw new NotFoundException(__('Invalid user')); + } + if ($this->request->is(array('post', 'put'))) { + if ($this->User->save($this->request->data)) { + $this->Flash->success(__('The user has been saved.')); + return $this->redirect(array('action' => 'index')); + } else { + $this->Flash->error(__('The user could not be saved. Please, try again.')); + } + } else { + $options = array('conditions' => array('User.' . $this->User->primaryKey => $id)); + $this->request->data = $this->User->find('first', $options); + } + } + +/** + * delete method + * + * @throws NotFoundException + * @param string $id + * @return void + */ + public function delete($id = null) { + $this->User->id = $id; + if (!$this->User->exists()) { + throw new NotFoundException(__('Invalid user')); + } + $this->request->allowMethod('post', 'delete'); + if ($this->User->delete()) { + $this->Flash->success(__('The user has been deleted.')); + } else { + $this->Flash->error(__('The user could not be deleted. Please, try again.')); + } + return $this->redirect(array('action' => 'index')); + } + +/** + * login method + * + * @throws NotFoundException + * @param string $id + * @return void + */ + public function login() { + //var_dump(Security::hash( "123", 'blowfish')); + if($this->Auth->user()){ + $this->redirect($this->Auth->redirectUrl()); + } + if ($this->request->is('post')) { + if ($this->Auth->login()) { + $this->redirect($this->Auth->redirectUrl()); + } else { + $this->Flash->error(__('login error')); + } + } + } +/** + * logout method + * + * @throws NotFoundException + * @param string $id + * @return void + */ + public function logout() { + $this->redirect($this->Auth->logout()); + } +} diff --git a/app/View/pictcode/index.ctp b/app/View/pictcode/index.ctp index 57b5d78..5f76549 100644 --- a/app/View/pictcode/index.ctp +++ b/app/View/pictcode/index.ctp @@ -3,7 +3,8 @@ -PictCode- - + + @@ -17,7 +18,7 @@ - +
@@ -81,8 +82,14 @@ - @@ -147,3 +154,4 @@ + diff --git a/app/View/users/login.ctp b/app/View/users/login.ctp new file mode 100644 index 0000000..c0d6b9f --- /dev/null +++ b/app/View/users/login.ctp @@ -0,0 +1,33 @@ +
+
+
+
+
+ログイン +
+
+
+
+
+
+Flash->render('auth'); ?> +Form->create('User',array( + 'inputDefaults' => array( + 'div' => 'form-group', + 'wrapInput' => false, + 'class' => 'form-control' + ), + 'class' => 'well')); ?> +
+ + + + Form->input('login_id',array( 'type' => 'text')); + echo $this->Form->input('password'); + ?> +
+Session->Flash(); ?> +Form->submit('ログイン',array('class'=>'btn btn-info')); ?> +Form->end(); ?> +
+element('footer');?> diff --git a/app/webroot/fonts/glyphicons-halflings-regular.eot b/app/webroot/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/app/webroot/fonts/glyphicons-halflings-regular.eot differ diff --git a/app/webroot/fonts/glyphicons-halflings-regular.svg b/app/webroot/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/app/webroot/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/webroot/fonts/glyphicons-halflings-regular.ttf b/app/webroot/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/app/webroot/fonts/glyphicons-halflings-regular.ttf differ diff --git a/app/webroot/fonts/glyphicons-halflings-regular.woff b/app/webroot/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/app/webroot/fonts/glyphicons-halflings-regular.woff differ diff --git a/app/webroot/fonts/glyphicons-halflings-regular.woff2 b/app/webroot/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/app/webroot/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_010.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_010.png new file mode 100644 index 0000000..014c17c Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_010.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_020.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_020.png new file mode 100644 index 0000000..2be9881 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_020.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_030.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_030.png new file mode 100644 index 0000000..83eeb72 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_030.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_040.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_040.png new file mode 100644 index 0000000..5e1b34f Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_airplane_040.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_010.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_010.png new file mode 100644 index 0000000..d64fea5 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_010.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_020.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_020.png new file mode 100644 index 0000000..4474da2 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_020.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_030.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_030.png new file mode 100644 index 0000000..0c3f5a7 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_030.png differ diff --git a/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_040.png b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_040.png new file mode 100644 index 0000000..ba64f8b Binary files /dev/null and b/app/webroot/img/pictcode/sprite/airplane/001_char_img_bomb_040.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_010.png new file mode 100644 index 0000000..e27a27b Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_020.png new file mode 100644 index 0000000..86059d4 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_020.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_030.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_030.png new file mode 100644 index 0000000..a06ed01 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_cat_030.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_010.png new file mode 100644 index 0000000..8f54344 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_020.png new file mode 100644 index 0000000..e697fd4 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_020.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_030.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_030.png new file mode 100644 index 0000000..6d573c2 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_030.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_040.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_040.png new file mode 100644 index 0000000..b0e5668 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_040.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_050.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_050.png new file mode 100644 index 0000000..6327180 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_050.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_060.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_060.png new file mode 100644 index 0000000..fee855a Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dog_060.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_010.png new file mode 100644 index 0000000..dfe600a Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_020.png new file mode 100644 index 0000000..6cc9de3 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_dolphin_020.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_010.png new file mode 100644 index 0000000..4fdb4f9 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_020.png new file mode 100644 index 0000000..fa583b2 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_020.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_030.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_030.png new file mode 100644 index 0000000..eff39a2 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_030.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_040.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_040.png new file mode 100644 index 0000000..86b0709 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mole_040.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_010.png new file mode 100644 index 0000000..1ae26c8 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_020.png new file mode 100644 index 0000000..8bd044b Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_020.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_030.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_030.png new file mode 100644 index 0000000..4022593 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_mouse_030.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_010.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_010.png new file mode 100644 index 0000000..ed102ff Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_010.png differ diff --git a/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_020.png b/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_020.png new file mode 100644 index 0000000..904eef2 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/animal/001_char_img_whale_020.png differ diff --git a/app/webroot/img/pictcode/sprite/artifact/001_char_img_pipe_010.png b/app/webroot/img/pictcode/sprite/artifact/001_char_img_pipe_010.png new file mode 100644 index 0000000..6416675 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/artifact/001_char_img_pipe_010.png differ diff --git a/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_010.png b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_010.png new file mode 100644 index 0000000..c39794b Binary files /dev/null and b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_010.png differ diff --git a/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_020.png b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_020.png new file mode 100644 index 0000000..9e14e25 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_020.png differ diff --git a/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_030.png b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_030.png new file mode 100644 index 0000000..021ae19 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_030.png differ diff --git a/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_040.png b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_040.png new file mode 100644 index 0000000..ee13ed6 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/background/001_char_bg_bg_040.png differ diff --git a/app/webroot/img/pictcode/sprite/board/001_char_img_display_010.png b/app/webroot/img/pictcode/sprite/board/001_char_img_display_010.png new file mode 100644 index 0000000..e461d7b Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/001_char_img_display_010.png differ diff --git a/app/webroot/img/pictcode/sprite/board/001_char_img_display_020.png b/app/webroot/img/pictcode/sprite/board/001_char_img_display_020.png new file mode 100644 index 0000000..5c64640 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/001_char_img_display_020.png differ diff --git a/app/webroot/img/pictcode/sprite/board/001_char_img_display_030.png b/app/webroot/img/pictcode/sprite/board/001_char_img_display_030.png new file mode 100644 index 0000000..02b4b69 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/001_char_img_display_030.png differ diff --git a/app/webroot/img/pictcode/sprite/board/arrow1.png b/app/webroot/img/pictcode/sprite/board/arrow1.png new file mode 100644 index 0000000..4d080b3 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/arrow1.png differ diff --git a/app/webroot/img/pictcode/sprite/board/game_clear.png b/app/webroot/img/pictcode/sprite/board/game_clear.png new file mode 100644 index 0000000..d144bc6 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/game_clear.png differ diff --git a/app/webroot/img/pictcode/sprite/board/game_over.png b/app/webroot/img/pictcode/sprite/board/game_over.png new file mode 100644 index 0000000..6699863 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/game_over.png differ diff --git a/app/webroot/img/pictcode/sprite/board/transparent_board.png b/app/webroot/img/pictcode/sprite/board/transparent_board.png new file mode 100644 index 0000000..1165857 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/board/transparent_board.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_010.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_010.png new file mode 100644 index 0000000..46795d5 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_010.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_020.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_020.png new file mode 100644 index 0000000..dd8c31e Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_020.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_030.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_030.png new file mode 100644 index 0000000..e85775a Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_030.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_040.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_040.png new file mode 100644 index 0000000..df2ad62 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_040.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_050.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_050.png new file mode 100644 index 0000000..528fbcc Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_050.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_bus_060.png b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_060.png new file mode 100644 index 0000000..9a29eb0 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_bus_060.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_010.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_010.png new file mode 100644 index 0000000..110aa73 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_010.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_020.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_020.png new file mode 100644 index 0000000..2456baa Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_020.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_030.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_030.png new file mode 100644 index 0000000..74bd11d Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_030.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_040.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_040.png new file mode 100644 index 0000000..5dab691 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_040.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_050.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_050.png new file mode 100644 index 0000000..7921c4f Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_050.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_060.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_060.png new file mode 100644 index 0000000..9c450a1 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_060.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_070.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_070.png new file mode 100644 index 0000000..6aef1d5 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_070.png differ diff --git a/app/webroot/img/pictcode/sprite/car/001_char_img_car_080.png b/app/webroot/img/pictcode/sprite/car/001_char_img_car_080.png new file mode 100644 index 0000000..693d894 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/001_char_img_car_080.png differ diff --git a/app/webroot/img/pictcode/sprite/car/car03.png b/app/webroot/img/pictcode/sprite/car/car03.png new file mode 100644 index 0000000..07b2f59 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/car/car03.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_010.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_010.png new file mode 100644 index 0000000..bb60910 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_010.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_020.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_020.png new file mode 100644 index 0000000..8837cbe Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_020.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_030.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_030.png new file mode 100644 index 0000000..3c10eb0 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_030.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_040.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_040.png new file mode 100644 index 0000000..c8f0d0d Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_040.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_050.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_050.png new file mode 100644 index 0000000..d223eea Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_050.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_060.png b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_060.png new file mode 100644 index 0000000..4443af1 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/001_char_img_fish_060.png differ diff --git a/app/webroot/img/pictcode/sprite/fish/shell.png b/app/webroot/img/pictcode/sprite/fish/shell.png new file mode 100644 index 0000000..0098bf1 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/fish/shell.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_010.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_010.png new file mode 100644 index 0000000..b40fcef Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_010.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_020.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_020.png new file mode 100644 index 0000000..6ad689f Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_020.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_030.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_030.png new file mode 100644 index 0000000..3f35b0f Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_030.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_040.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_040.png new file mode 100644 index 0000000..9b68a52 Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_040.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_050.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_050.png new file mode 100644 index 0000000..8f4418d Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_050.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_060.png b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_060.png new file mode 100644 index 0000000..bfe770a Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/001_char_img_inst_060.png differ diff --git a/app/webroot/img/pictcode/sprite/instrument/music_note.png b/app/webroot/img/pictcode/sprite/instrument/music_note.png new file mode 100644 index 0000000..ca752bf Binary files /dev/null and b/app/webroot/img/pictcode/sprite/instrument/music_note.png differ diff --git a/app/webroot/img/pictcode/ui/blk_branch_001.png b/app/webroot/img/pictcode/ui/blk_branch_001.png index 17696b5..9009f68 100644 Binary files a/app/webroot/img/pictcode/ui/blk_branch_001.png and b/app/webroot/img/pictcode/ui/blk_branch_001.png differ diff --git a/app/webroot/img/pictcode/ui/blk_branch_002.png b/app/webroot/img/pictcode/ui/blk_branch_002.png index d1413f5..babf35e 100644 Binary files a/app/webroot/img/pictcode/ui/blk_branch_002.png and b/app/webroot/img/pictcode/ui/blk_branch_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_branch_003.png b/app/webroot/img/pictcode/ui/blk_branch_003.png index 8bb9d79..8a2d4cb 100644 Binary files a/app/webroot/img/pictcode/ui/blk_branch_003.png and b/app/webroot/img/pictcode/ui/blk_branch_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_branch_004.png b/app/webroot/img/pictcode/ui/blk_branch_004.png index c94ba0a..9f411cc 100644 Binary files a/app/webroot/img/pictcode/ui/blk_branch_004.png and b/app/webroot/img/pictcode/ui/blk_branch_004.png differ diff --git a/app/webroot/img/pictcode/ui/blk_branch_005.png b/app/webroot/img/pictcode/ui/blk_branch_005.png index 8303044..895443b 100644 Binary files a/app/webroot/img/pictcode/ui/blk_branch_005.png and b/app/webroot/img/pictcode/ui/blk_branch_005.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_001.png b/app/webroot/img/pictcode/ui/blk_data_001.png index f3e963d..36f0024 100644 Binary files a/app/webroot/img/pictcode/ui/blk_data_001.png and b/app/webroot/img/pictcode/ui/blk_data_001.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_002.png b/app/webroot/img/pictcode/ui/blk_data_002.png new file mode 100644 index 0000000..e24f7b7 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_003.png b/app/webroot/img/pictcode/ui/blk_data_003.png new file mode 100644 index 0000000..d560af0 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_004.png b/app/webroot/img/pictcode/ui/blk_data_004.png new file mode 100644 index 0000000..8043d20 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_004.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_005.png b/app/webroot/img/pictcode/ui/blk_data_005.png new file mode 100644 index 0000000..0575466 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_005.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_006.png b/app/webroot/img/pictcode/ui/blk_data_006.png new file mode 100644 index 0000000..90c4d2e Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_006.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_007.png b/app/webroot/img/pictcode/ui/blk_data_007.png new file mode 100644 index 0000000..9388dd2 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_007.png differ diff --git a/app/webroot/img/pictcode/ui/blk_data_008.png b/app/webroot/img/pictcode/ui/blk_data_008.png new file mode 100644 index 0000000..6902f24 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_data_008.png differ diff --git a/app/webroot/img/pictcode/ui/blk_function_002.png b/app/webroot/img/pictcode/ui/blk_function_002.png new file mode 100644 index 0000000..bf3e051 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_function_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_function_003.png b/app/webroot/img/pictcode/ui/blk_function_003.png new file mode 100644 index 0000000..5f0ebf7 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_function_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_gmctrl_001.png b/app/webroot/img/pictcode/ui/blk_gmctrl_001.png index 9574151..8d7ff22 100644 Binary files a/app/webroot/img/pictcode/ui/blk_gmctrl_001.png and b/app/webroot/img/pictcode/ui/blk_gmctrl_001.png differ diff --git a/app/webroot/img/pictcode/ui/blk_gmctrl_002.png b/app/webroot/img/pictcode/ui/blk_gmctrl_002.png index 80fabe2..5077a78 100644 Binary files a/app/webroot/img/pictcode/ui/blk_gmctrl_002.png and b/app/webroot/img/pictcode/ui/blk_gmctrl_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_gmctrl_003.png b/app/webroot/img/pictcode/ui/blk_gmctrl_003.png new file mode 100644 index 0000000..5b4e774 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_gmctrl_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_gmctrl_004.png b/app/webroot/img/pictcode/ui/blk_gmctrl_004.png new file mode 100644 index 0000000..ecae9a3 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_gmctrl_004.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_001.png b/app/webroot/img/pictcode/ui/blk_motion_001.png index 1c1f25e..7ba7610 100644 Binary files a/app/webroot/img/pictcode/ui/blk_motion_001.png and b/app/webroot/img/pictcode/ui/blk_motion_001.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_002.png b/app/webroot/img/pictcode/ui/blk_motion_002.png index 3a44acc..e0c8557 100644 Binary files a/app/webroot/img/pictcode/ui/blk_motion_002.png and b/app/webroot/img/pictcode/ui/blk_motion_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_003.png b/app/webroot/img/pictcode/ui/blk_motion_003.png index fb15af9..6a8efbb 100644 Binary files a/app/webroot/img/pictcode/ui/blk_motion_003.png and b/app/webroot/img/pictcode/ui/blk_motion_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_004.png b/app/webroot/img/pictcode/ui/blk_motion_004.png index 6cb062e..5141dca 100644 Binary files a/app/webroot/img/pictcode/ui/blk_motion_004.png and b/app/webroot/img/pictcode/ui/blk_motion_004.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_005.png b/app/webroot/img/pictcode/ui/blk_motion_005.png index 36e0eed..f51e38c 100644 Binary files a/app/webroot/img/pictcode/ui/blk_motion_005.png and b/app/webroot/img/pictcode/ui/blk_motion_005.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_006.png b/app/webroot/img/pictcode/ui/blk_motion_006.png new file mode 100644 index 0000000..7949e28 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_motion_006.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_007.png b/app/webroot/img/pictcode/ui/blk_motion_007.png new file mode 100644 index 0000000..7491de8 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_motion_007.png differ diff --git a/app/webroot/img/pictcode/ui/blk_motion_008.png b/app/webroot/img/pictcode/ui/blk_motion_008.png new file mode 100644 index 0000000..153abf7 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_motion_008.png differ diff --git a/app/webroot/img/pictcode/ui/blk_sprctrl_001.png b/app/webroot/img/pictcode/ui/blk_sprctrl_001.png new file mode 100644 index 0000000..183ccbf Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_sprctrl_001.png differ diff --git a/app/webroot/img/pictcode/ui/blk_sprctrl_002.png b/app/webroot/img/pictcode/ui/blk_sprctrl_002.png new file mode 100644 index 0000000..211d127 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_sprctrl_002.png differ diff --git a/app/webroot/img/pictcode/ui/blk_sprctrl_003.png b/app/webroot/img/pictcode/ui/blk_sprctrl_003.png new file mode 100644 index 0000000..f4f9730 Binary files /dev/null and b/app/webroot/img/pictcode/ui/blk_sprctrl_003.png differ diff --git a/app/webroot/img/pictcode/ui/blk_timectrl_002.png b/app/webroot/img/pictcode/ui/blk_timectrl_002.png index 98e2af0..05d8de2 100644 Binary files a/app/webroot/img/pictcode/ui/blk_timectrl_002.png and b/app/webroot/img/pictcode/ui/blk_timectrl_002.png differ diff --git a/app/webroot/img/pictcode/ui/btn_modal_008.png b/app/webroot/img/pictcode/ui/btn_modal_008.png index 46bac16..8ff5999 100644 Binary files a/app/webroot/img/pictcode/ui/btn_modal_008.png and b/app/webroot/img/pictcode/ui/btn_modal_008.png differ diff --git a/app/webroot/img/pictcode/ui/ctgry_blk_003.png b/app/webroot/img/pictcode/ui/ctgry_blk_003.png index 13381a7..e8f0b39 100644 Binary files a/app/webroot/img/pictcode/ui/ctgry_blk_003.png and b/app/webroot/img/pictcode/ui/ctgry_blk_003.png differ diff --git a/app/webroot/img/pictcode/ui/ctgry_blk_005.png b/app/webroot/img/pictcode/ui/ctgry_blk_005.png index 829c509..3e3428f 100644 Binary files a/app/webroot/img/pictcode/ui/ctgry_blk_005.png and b/app/webroot/img/pictcode/ui/ctgry_blk_005.png differ diff --git a/app/webroot/img/pictcode/ui/ctgry_spr_006.png b/app/webroot/img/pictcode/ui/ctgry_spr_006.png new file mode 100644 index 0000000..7aa3465 Binary files /dev/null and b/app/webroot/img/pictcode/ui/ctgry_spr_006.png differ diff --git a/app/webroot/img/pictcode/ui/ctgry_spr_007.png b/app/webroot/img/pictcode/ui/ctgry_spr_007.png new file mode 100644 index 0000000..9a5fb4e Binary files /dev/null and b/app/webroot/img/pictcode/ui/ctgry_spr_007.png differ diff --git a/app/webroot/img/pictcode/ui/ctgry_spr_008.png b/app/webroot/img/pictcode/ui/ctgry_spr_008.png new file mode 100644 index 0000000..aa9c965 Binary files /dev/null and b/app/webroot/img/pictcode/ui/ctgry_spr_008.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_002.png b/app/webroot/img/pictcode/ui/icon_blk_002.png index 295b4b3..50bd608 100644 Binary files a/app/webroot/img/pictcode/ui/icon_blk_002.png and b/app/webroot/img/pictcode/ui/icon_blk_002.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_004.png b/app/webroot/img/pictcode/ui/icon_blk_004.png index 09feced..5044664 100644 Binary files a/app/webroot/img/pictcode/ui/icon_blk_004.png and b/app/webroot/img/pictcode/ui/icon_blk_004.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_005.png b/app/webroot/img/pictcode/ui/icon_blk_005.png index c8fd71b..24d4401 100644 Binary files a/app/webroot/img/pictcode/ui/icon_blk_005.png and b/app/webroot/img/pictcode/ui/icon_blk_005.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_006.png b/app/webroot/img/pictcode/ui/icon_blk_006.png index 6073c15..68cd807 100644 Binary files a/app/webroot/img/pictcode/ui/icon_blk_006.png and b/app/webroot/img/pictcode/ui/icon_blk_006.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_007.png b/app/webroot/img/pictcode/ui/icon_blk_007.png index bce13b5..3a70ae8 100644 Binary files a/app/webroot/img/pictcode/ui/icon_blk_007.png and b/app/webroot/img/pictcode/ui/icon_blk_007.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_010.png b/app/webroot/img/pictcode/ui/icon_blk_010.png new file mode 100644 index 0000000..9f5e1a5 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_010.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_011.png b/app/webroot/img/pictcode/ui/icon_blk_011.png new file mode 100644 index 0000000..04eb5c3 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_011.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_012.png b/app/webroot/img/pictcode/ui/icon_blk_012.png new file mode 100644 index 0000000..119a22a Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_012.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_013.png b/app/webroot/img/pictcode/ui/icon_blk_013.png new file mode 100644 index 0000000..edc0f3e Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_013.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_014.png b/app/webroot/img/pictcode/ui/icon_blk_014.png new file mode 100644 index 0000000..7beaa26 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_014.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_015.png b/app/webroot/img/pictcode/ui/icon_blk_015.png new file mode 100644 index 0000000..7beaa26 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_015.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_016.png b/app/webroot/img/pictcode/ui/icon_blk_016.png new file mode 100644 index 0000000..85034d3 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_016.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_017.png b/app/webroot/img/pictcode/ui/icon_blk_017.png new file mode 100644 index 0000000..7bd0664 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_017.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_018.png b/app/webroot/img/pictcode/ui/icon_blk_018.png new file mode 100644 index 0000000..16578aa Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_018.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_019.png b/app/webroot/img/pictcode/ui/icon_blk_019.png new file mode 100644 index 0000000..dca1adf Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_019.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_020.png b/app/webroot/img/pictcode/ui/icon_blk_020.png new file mode 100644 index 0000000..d8171b3 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_020.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_021.png b/app/webroot/img/pictcode/ui/icon_blk_021.png new file mode 100644 index 0000000..610bbe5 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_021.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_022.png b/app/webroot/img/pictcode/ui/icon_blk_022.png new file mode 100644 index 0000000..3fbfa09 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_022.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_023.png b/app/webroot/img/pictcode/ui/icon_blk_023.png new file mode 100644 index 0000000..a79ef48 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_023.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_024.png b/app/webroot/img/pictcode/ui/icon_blk_024.png new file mode 100644 index 0000000..d618345 Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_024.png differ diff --git a/app/webroot/img/pictcode/ui/icon_blk_025.png b/app/webroot/img/pictcode/ui/icon_blk_025.png new file mode 100644 index 0000000..216af7b Binary files /dev/null and b/app/webroot/img/pictcode/ui/icon_blk_025.png differ diff --git a/app/webroot/img/pictcode/ui/preview_001.png b/app/webroot/img/pictcode/ui/preview_001.png index e697fd4..2013561 100644 Binary files a/app/webroot/img/pictcode/ui/preview_001.png and b/app/webroot/img/pictcode/ui/preview_001.png differ diff --git a/app/webroot/img/pictcode/ui/sound_001.png b/app/webroot/img/pictcode/ui/sound_001.png new file mode 100644 index 0000000..66924df Binary files /dev/null and b/app/webroot/img/pictcode/ui/sound_001.png differ diff --git a/app/webroot/img/pictcode/ui/sound_002.png b/app/webroot/img/pictcode/ui/sound_002.png new file mode 100644 index 0000000..18b3730 Binary files /dev/null and b/app/webroot/img/pictcode/ui/sound_002.png differ diff --git a/app/webroot/img/pictcode/ui/sound_003.png b/app/webroot/img/pictcode/ui/sound_003.png new file mode 100644 index 0000000..5947fd7 Binary files /dev/null and b/app/webroot/img/pictcode/ui/sound_003.png differ diff --git a/app/webroot/img/pictcode/ui/sound_004.png b/app/webroot/img/pictcode/ui/sound_004.png new file mode 100644 index 0000000..7b27836 Binary files /dev/null and b/app/webroot/img/pictcode/ui/sound_004.png differ diff --git a/app/webroot/img/pictcode/ui/sound_005.png b/app/webroot/img/pictcode/ui/sound_005.png new file mode 100644 index 0000000..13fc65e Binary files /dev/null and b/app/webroot/img/pictcode/ui/sound_005.png differ diff --git a/app/webroot/js/pictcode/app.js b/app/webroot/js/pictcode/app.js index 0a4fd9d..41089c5 100644 --- a/app/webroot/js/pictcode/app.js +++ b/app/webroot/js/pictcode/app.js @@ -14,9 +14,19 @@ define(function(require, exports, module) { //（必要か？） require('screen_adjuster'); - document.addEventListener("touchmove", function(evt) { - evt.preventDefault(); - }, false); + document.getElementById("preload").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("ui_editor").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_ui_sprite").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_ui_tag").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_ui_function").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_ui_collision").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_coding_block").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_coding_vector").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_coding_scalar").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_coding_function").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("modal_coding_tag").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("coding-tab").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); + document.getElementById("play-tab").addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); var isJSONLoaded = false; var isImagesLoaded = false; @@ -56,19 +66,19 @@ define(function(require, exports, module) { //最初に開くタブ switcher.openCodingTab(); - //UI + //Coding (function () { - uIManager.initialize(codingManager.getFunctions, dataObj.sprites); + codingManager.initialize(dataObj.blocks, uIManager.removeFunctionFromSprite); }()); - //Coding + //UI (function () { - codingManager.initialize(dataObj.blocks, uIManager.removeFunctionFromSprite); + uIManager.initialize(codingManager.getFunctions, dataObj.sprites); }()); //実行 (function () { - playManager.initialize(codingManager.findBlock, uIManager.sprites, codingManager.findFunctionWithId); + playManager.initialize(uIManager.sprites, codingManager.findFunctionWithId); }()); } }); \ No newline at end of file diff --git a/app/webroot/js/pictcode/block_action.js b/app/webroot/js/pictcode/block_action.js index 7f72909..e92a608 100644 --- a/app/webroot/js/pictcode/block_action.js +++ b/app/webroot/js/pictcode/block_action.js @@ -1,4 +1,322 @@ -define(function(){ +define(['sprite_manager', 'block_manager', 'sound_manager'], function(spriteManager, blockManager, soundManager){ + + var currentSprites; + var currentVariables; + var detaTime; + var getIdentifiedTrigger; + var resetApp; + + function startAction(curSprts, curVrs, deltaT, gtIdTrg, rstApp){ + currentSprites = curSprts; + currentVariables = curVrs; + deltaTime = deltaT; + getIdentifiedTrigger = gtIdTrg; + resetApp = rstApp; + //start_appブロック + var startAppBlocks = blockManager.getStartAppBlocks(); + _.each(startAppBlocks, function(strtAppBlks){ + var ghostSprite = { + type:"ghost", + position:{x:0, y:0}, + aspectRatio:1.0, + scale:1.0, + angle:0, + opacity:1.0, + mirrored:false, + animating:false, + animationCount:0, + tag:0, + tapFuncIdx:null, + startFuncIdx:null, + collision:[{tag:1, funcIdx:null}, {tag:2, funcIdx:null}, {tag:3, funcIdx:null}], + reactions: {}, + }; + currentSprites.push(ghostSprite); + setBlock(ghostSprite, strtAppBlks, getIdentifiedTrigger("start_app")); + }); + } + + function setBlock(sprite, block, trigger){ + //各ブロックのアクション + var action = behaviors[block.name]; + if (action) { + action = action(); + }else{ + action = null; + }; + //スプライトと紐づけられたアクションとブロック + var reaction = sprite.reactions[trigger]; + if (reaction) { + reaction.block = block; + reaction.action = action; + }else{ + reaction = {block:block, action:action}; + sprite.reactions[trigger] = reaction; + }; + //各valueが入力値の場合と変数の場合で場合分け + var value1; + if (!block.value1.isVariable) { + value1 = block.value1.value; + }else{ + value1 = _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value; + }; + var value2; + if (!block.value2.isVariable) { + value2 = block.value2.value; + }else{ + value2 = _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value2.value;}).value2.value; + }; + //カテゴリ、ブロック別の初期化 + switch(block.category){ + //関数 + case "function": + switch(block.name){ + case "start_function": + goNextBlock(sprite, trigger); + break; + + case "return_function": + var funcBlock = blockManager.findFunctionWithId(value1); + if (funcBlock) { + setBlock(sprite, funcBlock, trigger); + }; + break; + + case "fork": + var nextBlock1 = blockManager.findBlock(block.bottomLinks[0].id); + var nextBlock2 = blockManager.findBlock(block.bottomLinks[1].id); + if (nextBlock1) { + setBlock(sprite, nextBlock1, trigger); + }; + if (nextBlock2) { + setBlock(sprite, nextBlock2, getIdentifiedTrigger("fork")); + }; + break; + } + break; + + //動きの制御 + case "movement": + switch(block.name){ + case "move": + case "rotate_left": + case "rotate_right": + reaction.action.initialize(deltaTime, value1, value2); + break; + case "zoom": + reaction.action.initialize(deltaTime, value1, sprite.scale, value2); + break; + case "opacity": + reaction.action.initialize(deltaTime, value1, sprite.opacity, value2); + break; + case "self_duplicate": + var copiedSprite = spriteManager.copySprite(sprite, currentSprites, false); + copiedSprite.reactions = {}; + var funcBlock = blockManager.findFunctionWithId(value1); + if (funcBlock) { + setBlock(copiedSprite, funcBlock, getIdentifiedTrigger("self_duplicate")); + }; + goNextBlock(sprite, trigger); + break; + case "self_kill": + for (var i = 0; i < currentSprites.length; i++) { + var spr = currentSprites[i]; + if (spr == sprite) { + currentSprites.splice(i, 1); + break; + }; + }; + break; + case "mirror": + sprite.mirrored = !sprite.mirrored; + goNextBlock(sprite, trigger); + break; + + } + break; + + //分岐 + case "branch": + var isTrue = false; + switch(block.name){ + case "branch_equal": + isTrue = (value1 == value2); + break; + case "branch_larger": + isTrue = (value1 > value2); + break; + case "branch_smaller": + isTrue = (value1 < value2); + break; + case "branch_eqlarger": + isTrue = (value1 >= value2); + break; + case "branch_eqsmaller": + isTrue = (value1 <= value2); + break; + } + var nextBlock; + if (isTrue) { + nextBlock = blockManager.findBlock(block.bottomLinks[0].id); + }else{ + nextBlock = blockManager.findBlock(block.bottomLinks[1].id); + } + if (nextBlock) { + setBlock(sprite, nextBlock, trigger); + }; + break; + + //データ + case "data": + switch(block.name){ + case "add_random": + var rand = Math.floor(Math.random()*(value2+0.1)*10)/10.0; + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value += rand; + break; + case "var_add": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value += value2; + break; + case "var_substract": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value -= value2; + break; + case "var_multiplicate": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value *= value2; + break; + case "var_divide": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value /= value2; + break; + case "var_rest": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value %= value2; + break; + case "var_substitute": + _.find(currentVariables, function (varBlock) {return varBlock.value1.value == block.value1.value;}).value2.value = value2; + break; + } + goNextBlock(sprite, trigger); + break; + + //時間の制御 + case "time_control": + switch(block.name){ + case "set_timer": + //タイマーの独自トリガーの場合と、最初に呼ばれた時の分岐 + if (trigger.indexOf("set_timer") !== -1) { + var funcBlock = blockManager.findFunctionWithId(value2); + reaction.action.initialize(deltaTime, value1, funcBlock); + }else{ + setBlock(sprite, block, getIdentifiedTrigger("set_timer")); + goNextBlock(sprite, trigger); + }; + break; + case "wait": + reaction.action.initialize(deltaTime, value1); + break; + } + break; + + //アプリの制御 + case "app_control": + switch(block.name){ + case "start_app": + goNextBlock(sprite, trigger); + break; + case "finish_app": + resetApp(); + break; + case "tap_enable": + if (value1) { + sprite.tappable = true; + }else{ + sprite.tappable = false; + }; + goNextBlock(sprite, trigger); + break; + case "swipe_enable": + if (value1) { + sprite.swipeable = true; + }else{ + sprite.swipeable = false; + }; + goNextBlock(sprite, trigger); + break; + } + break; + + //サウンド + case "sound": + switch(block.name){ + case "play_sound": + if (block.value1.value) { + soundManager.playSound(block.value2.value, true); + }else{ + soundManager.playSound(block.value2.value, false); + }; + break; + } + goNextBlock(sprite, trigger); + break; + + //スプライトの制御 + case "sprite_control": + switch(block.name){ + case "func_on_tag": + _.each(currentSprites, function(curSpr){ + if (curSpr.tag == value1) { + var funcBlock = blockManager.findFunctionWithId(value2); + if (funcBlock) { + curSpr.reactions = {}; + setBlock(curSpr, funcBlock, getIdentifiedTrigger("func_on_tag")); + } + }; + }); + goNextBlock(sprite, trigger); + break; + case "duplicate": + _.each(currentSprites, function(curSpr){ + if (curSpr.tag == value1 && !curSpr.isCopied) { + var copiedSprite = spriteManager.copySprite(curSpr, currentSprites, false); + copiedSprite.position.x = sprite.position.x; + copiedSprite.position.y = sprite.position.y; + copiedSprite.isCopied = true; + var funcBlock = blockManager.findFunctionWithId(value2); + if (funcBlock) { + setBlock(copiedSprite, funcBlock, getIdentifiedTrigger("duplicate")); + }; + }; + }); + goNextBlock(sprite, trigger); + break; + case "display": + _.each(currentSprites, function(curSpr){ + if (curSpr.tag == value1) { + curSpr.text = Math.floor(value2); + }; + }); + goNextBlock(sprite, trigger); + break; + } + break; + } + } + + function findNextBlock(block){ + var id = block.bottomLinks[0].id; + if (id != null) { + return blockManager.findBlock(id); + }else{ + return null; + }; + } + + function goNextBlock(sprite, trigger){ + var block = sprite.reactions[trigger].block; + var nextBlock = findNextBlock(block); + if (nextBlock) { + setBlock(sprite, nextBlock, trigger); + }else{ + sprite.reactions[trigger] = {block:null, action:null}; + }; + } var behaviors ={ //移動 @@ -11,15 +329,19 @@ define(function(){ var initialize = function(det, drtn, vector){ passedTime = 0; //所要時間をミリ秒に変換 - drtn *= 1000; - dx = vector.x/drtn*det; - dy = vector.y/drtn*det; - duration = drtn; dt = det; + duration = drtn * 1000; + if (drtn > 0) { + dx = vector.x/duration*det; + dy = vector.y/duration*det; + }else{ + dx = vector.x; + dy = vector.y; + }; } //単位時間ごとの動き - var behave = function(sprite, trigger, goNextBlock){ + var behave = function(sprite, trigger){ sprite.position.x += dx; sprite.position.y += dy; passedTime += dt; @@ -34,24 +356,28 @@ define(function(){ }; }, - rotate_left:function(){ + rotate_right:function(){ var passedTime = 0; //角度、単位時間 var duration, da, dt; var initialize = function(det, drtn, angle){ passedTime = 0; + dt = det; duration = drtn * 1000; //単位時間あたりの回転角度 - da = angle / (drtn/det); - dt = det; + if (drtn > 0) { + da = angle * Math.PI/180 / (duration/det); + }else{ + da = angle * Math.PI/180; + }; } - var behave = function(sprite, trigger, goNextBlock){ + var behave = function(sprite, trigger){ sprite.angle += da; passedTime += dt; if (passedTime >= duration) { - goNextBlock(sprite, trigger); + goNextBlock(sprite, trigger); }; } @@ -61,24 +387,28 @@ define(function(){ }; }, - rotate_right:function(){ + rotate_left:function(){ var passedTime = 0; //角度、単位時間 var duration, da, dt; var initialize = function(det, drtn, angle){ passedTime = 0; + dt = det; duration = drtn * 1000; //単位時間あたりの回転角度 - da = angle / (drtn/det); - dt = det; + if (drtn > 0) { + da = angle * Math.PI/180 / (duration/det); + }else{ + da = angle * Math.PI/180; + }; } - var behave = function(sprite, trigger, goNextBlock){ + var behave = function(sprite, trigger){ sprite.angle -= da; passedTime += dt; if (passedTime >= duration) { - goNextBlock(sprite, trigger); + goNextBlock(sprite, trigger); }; } @@ -93,19 +423,23 @@ define(function(){ //角度、単位時間 var duration, ds, dt; - var initialize = function(det, drtn, scale){ + var initialize = function(det, drtn, iniScale, finalScale){ passedTime = 0; + dt = det; duration = drtn * 1000; //単位時間あたりのスケール変化量 - ds = scale / (drtn/det); - dt = det; + if (drtn > 0) { + ds = (finalScale-iniScale) / (duration/det); + }else{ + ds = finalScale-iniScale; + }; } - var behave = function(sprite, trigger, goNextBlock){ + var behave = function(sprite, trigger){ sprite.scale += ds; passedTime += dt; if (passedTime >= duration) { - goNextBlock(sprite, trigger); + goNextBlock(sprite, trigger); }; } @@ -118,21 +452,26 @@ define(function(){ opacity:function(){ var passedTime = 0; //角度、単位時間 - var duration, dopct, dt; + var duration, dp, dt; - var initialize = function(det, drtn, opacity){ + var initialize = function(det, drtn, iniOpacity, finalOpacity){ passedTime = 0; + dt = det; duration = drtn * 1000; //単位時間あたりのスケール変化量 - dopct = opacity / (drtn/det); - dt = det; + if (drtn > 0) { + dp = (finalOpacity-iniOpacity) / (duration/det); + }else{ + dp = finalOpacity-iniOpacity; + }; } - var behave = function(sprite, trigger, goNextBlock){ - sprite.opacity += dopct; + var behave = function(sprite, trigger){ + sprite.opacity += dp; passedTime += dt; if (passedTime >= duration) { - goNextBlock(sprite, trigger); + if (sprite.opacity > 0.95) {sprite.opacity = 1.0}; + goNextBlock(sprite, trigger); }; } @@ -142,24 +481,26 @@ define(function(){ }; }, - mirror:function(){ + set_timer:function(){ var passedTime = 0; - //角度、単位時間 - var duration, direction, dt; + var interval, dt; + var funcBlock; - var initialize = function(det, drtn, mirror){ + var initialize = function(det, intvl, fnkBlk){ passedTime = 0; - duration = drtn * 1000; - //単位時間あたりのスケール変化量 - direction = mirror; + interval = intvl * 1000; + if (interval <= 100) { + interval = 100; + } dt = det; + funcBlock = fnkBlk; } - var behave = function(sprite, trigger, goNextBlock){ - sprite.mirrored = direction; + var behave = function(sprite, trigger){ passedTime += dt; - if (passedTime >= duration) { - goNextBlock(sprite, trigger); + if (passedTime >= interval) { + setBlock(sprite, funcBlock, getIdentifiedTrigger("timer")); + passedTime = 0; }; } @@ -179,7 +520,7 @@ define(function(){ dt = det; } - var behave = function(sprite, trigger, goNextBlock){ + var behave = function(sprite, trigger){ passedTime += dt; if (passedTime >= duration) { goNextBlock(sprite, trigger); @@ -194,6 +535,8 @@ define(function(){ }; return { + startAction:startAction, + setBlock:setBlock, behaviors:behaviors }; }); diff --git a/app/webroot/js/pictcode/block_data.js b/app/webroot/js/pictcode/block_data.js index 40a42cc..245907b 100644 --- a/app/webroot/js/pictcode/block_data.js +++ b/app/webroot/js/pictcode/block_data.js @@ -10,10 +10,6 @@ define(function(){ iconImageKey:"ctgry_blk_001", }, { - name:"loop", - iconImageKey:"ctgry_blk_003", - }, - { name:"branch", iconImageKey:"ctgry_blk_004", }, @@ -26,13 +22,17 @@ define(function(){ iconImageKey:"ctgry_blk_008", }, { - name:"game_control", + name:"app_control", iconImageKey:"ctgry_blk_006", }, { name:"sound", iconImageKey:"ctgry_blk_007", - } + }, + { + name:"sprite_control", + iconImageKey:"ctgry_blk_003", + }, ]; var VALUETYPE = { @@ -43,9 +43,10 @@ define(function(){ FUNCTION: 4, SOUND_SELECTOR: 5, VARIABLE: 6, - VARIABLE_SELECTOR: 7, + TAG_SELECTOR: 7, } + //各ブロックのベース var baseBlock = { position: {x:0.0, y:0.0}, size: {width:4.26, height:1.0}, @@ -63,6 +64,7 @@ define(function(){ value: 0, valueSize: 0.629, valuePosition: {x:2.514, y:0.386}, + canInput: true, isVariable: false, canBeVariable: false, }, @@ -77,6 +79,7 @@ define(function(){ value: 0, valueSize: 0.629, valuePosition: {x:3.743, y:0.386}, + canInput: true, isVariable:false, canBeVariable:false, }, @@ -84,7 +87,53 @@ define(function(){ //各ブロックの初期データ var blocks = [ + //関数 + { + size: {width:3.057, height:1.0}, + topLink: null, + category: "function", + name: "start_function", + imageKey: "blk_function_001", + value1:{ + valueType: VALUETYPE.FUNCTION, + }, + value2:{ + available: false, + } + }, + + { + size: {width:3.057, height:0.771}, + bottomLinks: null, + category: "function", + name: "return_function", + imageKey: "blk_function_002", + value1:{ + iconImageKey: "icon_blk_003", + valueType: VALUETYPE.FUNC_SELECTOR, + value: 0, + }, + value2:{ + available: false, + } + }, + + { + size: {width:8.814, height:1.0}, + bottomLinks: null, + category: "function", + name: "fork", + imageKey: "blk_function_003", + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + value1:{ + available: false, + }, + value2:{ + available: false, + } + }, + //動きの制御 { category: "movement", name: "move", @@ -103,11 +152,227 @@ define(function(){ { category: "movement", - name: "rotate", + name: "rotate_right", imageKey: "blk_motion_002", + value1:{ + iconImageKey: "icon_blk_002", + value:1.2, //秒 + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_008", + value:90, + canBeVariable:true, + }, + }, + + { + category: "movement", + name: "rotate_left", + imageKey: "blk_motion_003", + value1:{ + iconImageKey: "icon_blk_002", + value:1.2, //秒 + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_009", + value:90, + canBeVariable:true, + }, + }, + + { + category: "movement", + name: "zoom", + imageKey: "blk_motion_005", + value1:{ + iconImageKey: "icon_blk_002", + value:1.2, //秒 + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_010", + value:2.0, + canBeVariable:true, + }, + }, + + { + category: "movement", + name: "opacity", + imageKey: "blk_motion_004", + value1:{ + iconImageKey: "icon_blk_002", + value:1.2, //秒 + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_011", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "movement", + name: "self_duplicate", + imageKey: "blk_motion_006", + size: {width:3.057, height:1.0}, + value1:{ + iconImageKey: "icon_blk_020", + valueType: VALUETYPE.FUNC_SELECTOR, + }, + value2:{ + available:false, + }, + }, + + { + category: "movement", + name: "self_kill", + imageKey: "blk_motion_007", + size: {width:3.057, height:0.771}, + bottomLinks: null, + value1:{ + available:false, + }, + value2:{ + available:false, + }, + }, + + { + category: "movement", + name: "mirror", + imageKey: "blk_motion_008", + size: {width:3.057, height:1.0}, + value1:{ + available:false, + }, + value2:{ + available:false, + }, + }, + + //分岐 + { + category: "branch", + name: "branch_equal", + imageKey: "blk_branch_001", + size: {width:8.814, height:1.0}, + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + + value1:{ + iconImageKey: "icon_blk_014", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:3.19, y:0.386}, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_015", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:5.62, y:0.386}, + canBeVariable: true, + } + }, + + { + category: "branch", + name: "branch_larger", + imageKey: "blk_branch_005", + size: {width:8.814, height:1.0}, + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + + value1:{ + iconImageKey: "icon_blk_014", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:3.19, y:0.386}, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_015", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:5.62, y:0.386}, + canBeVariable: true, + } }, { + category: "branch", + name: "branch_smaller", + imageKey: "blk_branch_003", + size: {width:8.814, height:1.0}, + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + + value1:{ + iconImageKey: "icon_blk_014", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:3.19, y:0.386}, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_015", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:5.62, y:0.386}, + canBeVariable: true, + } + }, + + { + category: "branch", + name: "branch_eqlarger", + imageKey: "blk_branch_004", + size: {width:8.814, height:1.0}, + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + + value1:{ + iconImageKey: "icon_blk_014", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:3.19, y:0.386}, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_015", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:5.62, y:0.386}, + canBeVariable: true, + } + }, + + { + category: "branch", + name: "branch_eqsmaller", + imageKey: "blk_branch_002", + size: {width:8.814, height:1.0}, + bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:7.114, y:0.757}}], + + value1:{ + iconImageKey: "icon_blk_014", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:3.19, y:0.386}, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_015", + valueType: VALUETYPE.SCALAR, + value:0, + valuePosition: {x:5.62, y:0.386}, + canBeVariable: true, + } + }, + + //データ + { category: "data", name: "var_scalar", imageKey: "blk_data_001", @@ -116,38 +381,186 @@ define(function(){ bottomLinks: null, value1:{ - iconImageKey: "icon_blk_007", + iconImageKey: "icon_blk_018", valueType: VALUETYPE.VARIABLE, value:0, }, value2:{ - iconImageKey: "icon_blk_006", + iconImageKey: "icon_blk_019", valueType: VALUETYPE.SCALAR, value:0, } }, { - category: "branch", - name: "branch_larger", - imageKey: "blk_branch_003", - size: {width:7.29, height:1.0}, - bottomLinks: [{id:null, position:{x:1.314, y:0.757}}, {id:null, position:{x:5.571, y:0.757}}], + category: "data", + name: "add_random", + imageKey: "blk_data_002", + value1:{ + iconImageKey: "icon_blk_018", + valueType: VALUETYPE.SCALAR, + value:0, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + { + category: "data", + name: "var_add", + imageKey: "blk_data_003", value1:{ - iconImageKey: "icon_blk_008", + iconImageKey: "icon_blk_018", valueType: VALUETYPE.SCALAR, value:0, + canInput: false, + canBeVariable: true, + isVariable: true, }, value2:{ - iconImageKey: "icon_blk_009", + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "data", + name: "var_substract", + imageKey: "blk_data_004", + value1:{ + iconImageKey: "icon_blk_018", + valueType: VALUETYPE.SCALAR, + value:0, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "data", + name: "var_multiplicate", + imageKey: "blk_data_005", + value1:{ + iconImageKey: "icon_blk_018", valueType: VALUETYPE.SCALAR, value:0, - valuePosition: {x:6.771, y:0.386}, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "data", + name: "var_divide", + imageKey: "blk_data_006", + value1:{ + iconImageKey: "icon_blk_018", + valueType: VALUETYPE.SCALAR, + value:0, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "data", + name: "var_rest", + imageKey: "blk_data_007", + value1:{ + iconImageKey: "icon_blk_018", + valueType: VALUETYPE.SCALAR, + value:0, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + { + category: "data", + name: "var_substitute", + imageKey: "blk_data_008", + value1:{ + iconImageKey: "icon_blk_018", + valueType: VALUETYPE.SCALAR, + value:0, + canInput: false, + canBeVariable: true, + isVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_019", + value:0.5, + canBeVariable:true, + }, + }, + + //時間の制御 + { + category: "time_control", + name: "set_timer", + imageKey: "blk_timectrl_002", + value1:{ + iconImageKey: "icon_blk_024", + valueType: VALUETYPE.SCALAR, + value: 0.5, + canBeVariable: true, + }, + value2:{ + iconImageKey: "icon_blk_013", + valueType: VALUETYPE.FUNC_SELECTOR, + value: 0, } }, { + size: {width:3.057, height:1.0}, + category: "time_control", + name: "wait", + imageKey: "blk_timectrl_001", + value1:{ + iconImageKey: "icon_blk_024", + valueType: VALUETYPE.SCALAR, + value: 0.5, + canBeVariable: true, + }, + value2:{ + available: false, + } + }, + + //サウンド + { category: "sound", name: "play_sound", imageKey: "blk_sound_002", @@ -161,24 +574,20 @@ define(function(){ value2:{ iconImageKey: "icon_blk_005", valueType: VALUETYPE.SOUND_SELECTOR, - value: null, + value: 0, + valuePosition: {x:4.829, y:0.386}, }, }, + //アプリの制御 { - category: "movement", - name: "zoom", - imageKey: "blk_motion_005", - }, - - { + category: "app_control", + name: "start_app", + imageKey: "blk_gmctrl_001", size: {width:3.057, height:1.0}, topLink: null, - category: "function", - name: "start_function", - imageKey: "blk_function_001", value1:{ - valueType: VALUETYPE.FUNCTION, + available: false, }, value2:{ available: false, @@ -186,14 +595,13 @@ define(function(){ }, { + category: "app_control", + name: "finish_app", + imageKey: "blk_gmctrl_002", size: {width:3.057, height:0.771}, bottomLinks: null, - category: "function", - name: "return_function", - imageKey: "blk_functoin_002", value1:{ - iconImageKey: "icon_blk_003", - valueType: VALUETYPE.FUNC_SELECTOR, + available: false, }, value2:{ available: false, @@ -201,36 +609,89 @@ define(function(){ }, { + category: "app_control", + name: "tap_enable", + imageKey: "blk_gmctrl_003", size: {width:3.057, height:1.0}, - category: "time_control", - name: "wait", - imageKey: "blk_timectrl_001", + value1:{ - iconImageKey: "icon_blk_002", - valueType: VALUETYPE.SCALAR, - value: 0.5, - canBeVariable: true, + iconImageKey: "icon_blk_006", + valueType: VALUETYPE.CHECK, + value: true, }, value2:{ available: false, - } + }, }, { + category: "app_control", + name: "swipe_enable", + imageKey: "blk_gmctrl_004", size: {width:3.057, height:1.0}, - category: "game_control", - name: "stop_time", - imageKey: "blk_gmctrl_001", + value1:{ - available: false, + iconImageKey: "icon_blk_006", + valueType: VALUETYPE.CHECK, + value: true, }, value2:{ available: false, - } + }, }, + //スプライトの制御 + { + category: "sprite_control", + name: "func_on_tag", + imageKey: "blk_sprctrl_001", + value1:{ + iconImageKey: "icon_blk_023", + valueType: VALUETYPE.TAG_SELECTOR, + value: 0, + }, + value2:{ + iconImageKey: "icon_blk_013", + valueType: VALUETYPE.FUNC_SELECTOR, + value: 0, + } + }, + + { + category: "sprite_control", + name: "duplicate", + imageKey: "blk_sprctrl_002", + value1:{ + iconImageKey: "icon_blk_023", + valueType: VALUETYPE.TAG_SELECTOR, + value: 0, + }, + value2:{ + iconImageKey: "icon_blk_013", + valueType: VALUETYPE.FUNC_SELECTOR, + value: 0, + } + }, + + { + category: "sprite_control", + name: "display", + imageKey: "blk_sprctrl_003", + value1:{ + iconImageKey: "icon_blk_023", + valueType: VALUETYPE.TAG_SELECTOR, + value: 0, + }, + value2:{ + iconImageKey: "icon_blk_025", + valueType: VALUETYPE.SCALAR, + value: 0, + canBeVariable: true, + } + }, ]; + //ベースブロックを継承 _.each( blocks, function(block, i){ var extended = $.extend(true, {}, baseBlock, block); blocks[i] = extended; diff --git a/app/webroot/js/pictcode/block_drawer.js b/app/webroot/js/pictcode/block_drawer.js index 0e32088..d863592 100644 --- a/app/webroot/js/pictcode/block_drawer.js +++ b/app/webroot/js/pictcode/block_drawer.js @@ -1,4 +1,4 @@ -define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawer"], function(blockData, imageManager, utility, soundManager, spriteDrawer){ +define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawer", "tag_selector"], function(blockData, imageManager, utility, soundManager, spriteDrawer, tagSelector){ var gbCenterPositionOfCanvas = {x:0, y:0};//グローバル座標系 var maxScroll = 100; @@ -6,6 +6,8 @@ define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawe var dpInpRatio = spriteDrawer.dislayInnerSize.width/spriteDrawer.editorInnerSize.width; + var textBaseLineFactor = 0.05; + //Canvasへの描画 function drawBlocks(canvas, canvasContext, blocks, cBRatio){ @@ -45,57 +47,13 @@ define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawe }); } - //選択強調の描画 - function drawMarker(block, ctx){ - //凸部を除いた高さの割合 - var heightRatio = 1.0; - if (block.bottomLinks) { - heightRatio = block.bottomLinks[0].position.y; - } - var l = block.drawnRect.x; - var t = block.drawnRect.y; - var w = block.drawnRect.width; - var h = block.drawnRect.height * heightRatio; - var originalH = block.drawnRect.height; - var topLink = block.topLink; - var bottomLinks = block.bottomLinks; - - var r = h*0.1; - var linkR = h*0.5; - var pi = Math.PI; - var rightAngle = pi/8; - var leftAngle = pi-rightAngle; - var linkDepth = linkR*Math.sin(rightAngle); - - ctx.save(); - ctx.lineWidth = 6; - ctx.strokeStyle = "#ff0000"; - ctx.beginPath(); - ctx.arc(l + r, t + r, r, - pi, - 0.5 * pi, false); - if (topLink) { - ctx.arc(l + originalH/block.size.height*topLink.position.x, t-linkDepth, linkR, leftAngle, rightAngle, true); - }; - ctx.arc(l + w - r, t + r, r, - 0.5 * pi, 0, false); - ctx.arc(l + w - r, t + h - r, r, 0, 0.5 * pi, false); - if (bottomLinks) { - for (var i = bottomLinks.length - 1; i >= 0; i--) { - var bottomLink = bottomLinks[i]; - ctx.arc(l + originalH*bottomLink.position.x, t-linkDepth + h, linkR, rightAngle, leftAngle, false); - }; - }; - ctx.arc(l + r, t + h - r, r, 0.5 * pi, pi, false); - ctx.closePath(); - ctx.stroke(); - ctx.restore(); - } - //ブロック上での描画 function drawOnBlock(block, value, blkPosition, blkHeight, canvasContext){ if (!value.available) {return;}; switch(value.valueType){ case blockData.VALUETYPE.SCALAR: if (value.isVariable) { - drawSelectedVariable(block, value, blkPosition, blkHeight, canvasContext); + drawVariable(block, value, blkPosition, blkHeight, canvasContext); }else{ drawScalar(block, value, blkPosition, blkHeight, canvasContext); }; @@ -117,14 +75,17 @@ define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawe case blockData.VALUETYPE.VARIABLE_SELECTOR: drawVariable(block, value, blkPosition, blkHeight, canvasContext); break; + case blockData.VALUETYPE.TAG_SELECTOR: + drawTag(block, value, blkPosition, blkHeight, canvasContext); + break; } } function drawScalar(block, value, blkPosition, blkHeight, canvasContext){ - var x = (value.valuePosition.x-value.valueSize*0.42)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.18)*blkHeight + blkPosition.y; - var text = value.value.toFixed(1); - var size = value.valueSize * blkHeight*0.4; + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y+value.valueSize*textBaseLineFactor)*blkHeight + blkPosition.y; + var text = (value.value*1).toFixed(1); + var size = value.valueSize * blkHeight*0.5; drawText(text, x, y, size, canvasContext); } @@ -146,73 +107,120 @@ define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawe canvasContext.restore(); var distance = Math.round(Math.sqrt(value.value.x*value.value.x + value.value.y*value.value.y)*dpInpRatio); - var x = (value.valuePosition.x-value.valueSize*0.42)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.18)*blkHeight + blkPosition.y; - var size = value.valueSize * blkHeight*0.4; + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y+value.valueSize*textBaseLineFactor)*blkHeight + blkPosition.y; + var size = value.valueSize * blkHeight*0.5; drawText(distance, x, y, size, canvasContext); } function drawCheck(block, value, blkPosition, blkHeight, canvasContext){ - var x = (value.valuePosition.x-value.valueSize*0.38)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.28)*blkHeight + blkPosition.y; - var check = ""; - if (value.value) { - check = "O"; - }else{ - check = "X"; - }; - var size = value.valueSize * blkHeight*0.8; - drawText(check, x, y, size, canvasContext); + var checkImage; + switch(block.category == "sound"){ + case "app_control": + if (value.value) { + checkImage = imageManager.images.icon_blk_021; + }else{ + checkImage = imageManager.images.icon_blk_022; + }; + default: + if (value.value) { + checkImage = imageManager.images.icon_blk_006; + }else{ + checkImage = imageManager.images.icon_blk_007; + }; + break; + } + var size = value.valueSize * blkHeight*0.7; + var x = (value.valuePosition.x)*blkHeight -size*0.5 + blkPosition.x; + var y = (value.valuePosition.y)*blkHeight -size*0.5 + blkPosition.y; + canvasContext.drawImage(checkImage, x, y, size, size); } function drawFunction(block, value, blkPosition, blkHeight, canvasContext){ - var alphabet = utility.numberToAlphabet(value.value); - var x = (value.valuePosition.x-value.valueSize*0.21)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.22)*blkHeight + blkPosition.y; - var size = value.valueSize * blkHeight*0.5; + var alphabet = utility.numberToLargeAlphabet(value.value); + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y+value.valueSize*textBaseLineFactor)*blkHeight + blkPosition.y; + var size = value.valueSize * blkHeight*0.32; drawText(alphabet, x, y, size, canvasContext); } function drawSound(block, value, blkPosition, blkHeight, canvasContext){ - var x = (value.valuePosition.x-value.valueSize*0.3)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.18)*blkHeight + blkPosition.y; + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y+value.valueSize*textBaseLineFactor)*blkHeight + blkPosition.y; var soundInfo = soundManager.findSoundInfoFromImageKey(value.value); if (!soundInfo) { return; }; - var size = value.valueSize * blkHeight*0.4; + var size = value.valueSize * blkHeight*1.5; drawText(soundInfo.name, x, y, size, canvasContext); } function drawVariable(block, value, blkPosition, blkHeight, canvasContext){ - var alphabet = utility.numberToAlphabet(value.value); - var x = (value.valuePosition.x-value.valueSize*0.21)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.22)*blkHeight + blkPosition.y; + var alphabet = utility.numberToSmallAlphabet(value.value); + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y-value.valueSize*0.025)*blkHeight + blkPosition.y; var size = value.valueSize * blkHeight*0.5; - drawText(alphabet, x, y, size, canvasContext); + var circleX = value.valuePosition.x*blkHeight + blkPosition.x; + var circleY = value.valuePosition.y*blkHeight + blkPosition.y; + var circleR = value.valueSize * blkHeight * 0.35; + drawCircledText(alphabet, x, y, size, circleX, circleY, circleR, canvasContext, "#3cb371"); } - function drawSelectedVariable(block, value, blkPosition, blkHeight, canvasContext){ - var alphabet = utility.numberToAlphabet(value.value); - var x = (value.valuePosition.x-value.valueSize*0.21)*blkHeight + blkPosition.x; - var y = (value.valuePosition.y+value.valueSize*0.22)*blkHeight + blkPosition.y; - var size = value.valueSize * blkHeight*0.5; - drawCircledText(alphabet, x, y, size, canvasContext, "#20b2aa"); + function drawTag(block, value, blkPosition, blkHeight, canvasContext){ + var text = value.value; + var x = (value.valuePosition.x-value.valueSize*0.0)*blkHeight + blkPosition.x; + var y = (value.valuePosition.y+value.valueSize*textBaseLineFactor)*blkHeight + blkPosition.y; + var size = value.valueSize * blkHeight*0.4; + var circleX = value.valuePosition.x*blkHeight + blkPosition.x; + var circleY = value.valuePosition.y*blkHeight + blkPosition.y; + var circleR = value.valueSize * blkHeight * 0.35; + drawCircleFilledText(text, x, y, size, circleX, circleY, circleR, canvasContext, tagSelector.tagColors[value.value]); } function drawText(text, x, y, size, canvasContext){ - canvasContext.font = "bold "+ size + "px " + "sans-serif"; + canvasContext.save(); + canvasContext.textAlign = "center"; + canvasContext.textBaseline = "middle"; + var metrics = canvasContext.measureText(text); + var fotSize = Math.floor(size/metrics.width*14); + if (fotSize > 30) {fotSize = 30}; + canvasContext.font = "bold "+ fotSize + "px " + "sans-serif"; canvasContext.fillStyle = "black"; canvasContext.fillText(text, x, y); + canvasContext.restore(); } - function drawCircledText(text, x, y, size, canvasContext, color){ - // canvasContext.fillStyle = color; - // canvasContext.arc(x+size/2, y+size/2, 10, 0, 2*Math.PI, false); - // canvasContext.fill(); + function drawCircledText(text, x, y, size, circleX, circleY, circleR, canvasContext, color){ + canvasContext.save(); + canvasContext.strokeStyle = color; + canvasContext.lineWidth = 6; + canvasContext.beginPath(); + canvasContext.arc(circleX, circleY, circleR, 0, 2*Math.PI, false); + canvasContext.stroke(); + canvasContext.restore(); + canvasContext.save(); canvasContext.font = "bold "+ size + "px " + "sans-serif"; + canvasContext.textAlign = "center"; + canvasContext.textBaseline = "middle"; + canvasContext.fillStyle = color; + canvasContext.fillText(text, x, y); + canvasContext.restore(); + } + + function drawCircleFilledText(text, x, y, size, circleX, circleY, circleR, canvasContext, color){ + canvasContext.save(); canvasContext.fillStyle = color; + canvasContext.beginPath(); + canvasContext.arc(circleX, circleY, circleR, 0, 2*Math.PI, false); + canvasContext.fill(); + canvasContext.restore(); + canvasContext.save(); + canvasContext.font = "bold "+ size + "px " + "sans-serif"; + canvasContext.textAlign = "center"; + canvasContext.textBaseline = "middle"; + canvasContext.fillStyle = "white"; canvasContext.fillText(text, x, y); + canvasContext.restore(); } //座標系の変換 @@ -281,8 +289,48 @@ define(["block_data", "image_manager", "utility", "sound_manager", "sprite_drawe dBlocks(); } - function startPreview(targetBlock){ + //選択強調の描画 + function drawMarker(block, ctx){ + //凸部を除いた高さの割合 + var heightRatio = 1.0; + if (block.bottomLinks) { + heightRatio = block.bottomLinks[0].position.y; + } + var l = block.drawnRect.x; + var t = block.drawnRect.y; + var w = block.drawnRect.width; + var h = block.drawnRect.height * heightRatio; + var originalH = block.drawnRect.height; + var topLink = block.topLink; + var bottomLinks = block.bottomLinks; + + var r = h*0.1; + var linkR = h*0.5; + var pi = Math.PI; + var rightAngle = pi/8; + var leftAngle = pi-rightAngle; + var linkDepth = linkR*Math.sin(rightAngle); + ctx.save(); + ctx.lineWidth = 6; + ctx.strokeStyle = "#ff0000"; + ctx.beginPath(); + ctx.arc(l + r, t + r, r, - pi, - 0.5 * pi, false); + if (topLink) { + ctx.arc(l + originalH/block.size.height*topLink.position.x, t-linkDepth, linkR, leftAngle, rightAngle, true); + }; + ctx.arc(l + w - r, t + r, r, - 0.5 * pi, 0, false); + ctx.arc(l + w - r, t + h - r, r, 0, 0.5 * pi, false); + if (bottomLinks) { + for (var i = bottomLinks.length - 1; i >= 0; i--) { + var bottomLink = bottomLinks[i]; + ctx.arc(l + originalH*bottomLink.position.x, t-linkDepth + h, linkR, rightAngle, leftAngle, false); + }; + }; + ctx.arc(l + r, t + h - r, r, 0.5 * pi, pi, false); + ctx.closePath(); + ctx.stroke(); + ctx.restore(); } return { diff --git a/app/webroot/js/pictcode/block_manager.js b/app/webroot/js/pictcode/block_manager.js index 7fa4e29..f60b50b 100644 --- a/app/webroot/js/pictcode/block_manager.js +++ b/app/webroot/js/pictcode/block_manager.js @@ -1,4 +1,4 @@ -define(['block_data', 'image_manager', 'block_action', 'utility'], function(blockData, imageManager, blockAction, utility){ +define(['block_data', 'image_manager', 'utility'], function(blockData, imageManager, utility){ var targetBlock; var previousPosition = {}; @@ -12,7 +12,9 @@ define(['block_data', 'image_manager', 'block_action', 'utility'], function(bloc var blockAddCount = 0; function initialize(blks, dBlks, removeFuncFromSpr, didStTgt){ - blocks.concat(blks); + _.each(blks, function(blk){ + blocks.push(blk); + }); drawBlocks = dBlks; removeFunctionFromSprite = removeFuncFromSpr; didSetTarget = didStTgt; @@ -61,7 +63,7 @@ define(['block_data', 'image_manager', 'block_action', 'utility'], function(bloc drawBlocks(); - var iconSize = 25; + var iconSize = 35; var inputButtons = [$("#block_input1"), $("#block_input2")]; var values = [targetBlock.value1, targetBlock.value2]; _.each(inputButtons, function(inputButton, idx){ @@ -119,7 +121,7 @@ define(['block_data', 'image_manager', 'block_action', 'utility'], function(bloc var topLinkY = block.position.y + block.size.height/2 - block.topLink.position.y; if (topLinkX>rangeLeft && topLinkXrangeBottom && topLinkYrangeLeft && bottomLinkXrangeBottom && bottomLinkY
'); + $("#modal-overlay")[0].addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); $("#modal-overlay")[0].style.display = "inline"; $("#modal-overlay").unbind().click(function(){ closeUpModal(modal); @@ -37,6 +38,7 @@ define(["image_manager"], function(imageManager){ $(this).blur() ; if(!$("#modal-overlay")[0]) { $("body").append(''); + $("#modal-overlay")[0].addEventListener("touchmove", function(evt) {evt.preventDefault();}, false); $("#modal-overlay")[0].style.display = "inline"; $("#modal-overlay").unbind().click(function(){ closeDownModal(modal); diff --git a/app/webroot/js/pictcode/play_manager.js b/app/webroot/js/pictcode/play_manager.js index ba142f9..5a22e63 100644 --- a/app/webroot/js/pictcode/play_manager.js +++ b/app/webroot/js/pictcode/play_manager.js @@ -1,14 +1,15 @@ -define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'image_manager', 'sound_manager', 'block_manager'], function(canvasManager, spriteManager, spriteDrawer, blockAction, imageManager, soundManager, blockManager) { +define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_manager', 'block_action', 'image_manager', 'sound_manager', 'sprite_action'], function(canvasManager, spriteManager, spriteDrawer, blockManager, blockAction, imageManager, soundManager, spriteAction) { var canvas; var canvasContext; - var findBlock; var findFunctionWithId; var originalSprites; var currentSprites; + var currentVariables; + var STATE = { DEFAULT : 0, PLAYING : 1, @@ -26,9 +27,8 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im var playButtonContainer; //初期化 - function initialize(findBlk, sprts, fdFnkWthId) { + function initialize(sprts, fdFnkWthId) { - findBlock = findBlk; originalSprites = sprts; findFunctionWithId = fdFnkWthId; @@ -39,30 +39,38 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im if (appState != STATE.PLAYING) {return}; var target = spriteDrawer.getPositionInfo(currentSprites, canvasX, canvasY); if (target.target == "sprite") { - var id = target.sprite.tapFuncIdx; - if (id) { - var funcBlock = findFunctionWithId(id); - if (funcBlock) { - resetReactions(target.sprite); - setBlock(target.sprite, funcBlock, "tap"); + //タップ時の処理 + if (target.sprite.tappable) { + var id = target.sprite.tapFuncIdx; + if (id) { + var funcBlock = findFunctionWithId(id); + if (funcBlock) { + resetReactions(target.sprite); + blockAction.setBlock(target.sprite, funcBlock, "tap"); + }; }; }; + //スワイプ時の処理 + if (target.sprite.swipeable) { + spriteAction.setSwipeTarget(canvasX, canvasY, canvas, spriteDrawer.editorInnerSize, target.sprite); + }; } } function touchMove(canvasX, canvasY){ - + spriteAction.changeSpritesPositionBySwipe(canvasX, canvasY, drawSprites); } function touchEnd(canvasX, canvasY){ - + spriteAction.finishSwipe(); } //キャンバスの初期化 var screenWidth = document.documentElement.clientWidth; var headerHeight = $('#header')[0].clientHeight; var footerHeight = $('#footer')[0].clientHeight; - var screenHeight = document.documentElement.clientHeight - headerHeight - footerHeight - 20; + var screenHeight = window.innerHeight - headerHeight - footerHeight-20; + // var screenHeight = document.documentElement.clientHeight - headerHeight - footerHeight - 20; var canvasSize = canvasManager.getCanvasSize(screenWidth, screenHeight); canvas = canvasManager.initializeCanvas(canvasSize.width, canvasSize.height, touchStart, touchMove, touchEnd); $('#play_screen').append(canvas); @@ -103,6 +111,9 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im function didSwitchToPlayTab(){ resetApp(); + if (canvas) { + spriteDrawer.drawSprites(canvas, canvasContext, currentSprites); + }; } function didQuitPlayTab(){ @@ -112,17 +123,21 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im function resetApp(){ clearInterval(timer); + if (canvas) { + spriteDrawer.drawSprites(canvas, canvasContext, currentSprites); + }; + currentSprites = $.extend(true, [], originalSprites); _.each(currentSprites, function(sprite){ resetReactions(sprite); + sprite.tappable = true; + sprite.swipeable = false; }); - if (canvas) { - spriteDrawer.drawSprites(canvas, canvasContext, currentSprites); - }; - appState = STATE.DEFAULT; - triggerCount = 0; + currentVariables = $.extend(true, [], blockManager.getVariables()); + appState = STATE.DEFAULT; + triggerCount = 0; soundManager.stopAllSound(); var apps = $("#app_start")[0]; @@ -136,122 +151,16 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im sprite.reactions = {}; } - function setBlock(sprite, block, trigger){ - //各ブロックのアクション - var action = blockAction.behaviors[block.name]; - if (action) { - action = action(); - }else{ - action = null; - }; - //スプライトと紐づけられたアクションとブロック - var reaction = sprite.reactions[trigger]; - if (reaction) { - reaction.block = block; - reaction.action = action; - }else{ - reaction = {block:block, action:action}; - sprite.reactions[trigger] = reaction; - }; - //各valueが入力値の場合と変数の場合で場合分け - var value1; - if (!block.value1.isVariable) { - value1 = block.value1.value; - }else{ - value1 = blockManager.findVariableWithId(block.value1.value).value2.value; - }; - var value2; - if (!block.value2.isVariable) { - value2 = block.value2.value; - }else{ - value2 = blockManager.findVariableWithId(block.value2.value).value2.value; - }; - //カテゴリ、ブロック別の初期化 - switch(block.category){ - //関数 - case "function": - switch(block.name){ - case "start_function": - goNextBlock(sprite, trigger); - break; - - case "return_function": - var funcBlock = findFunctionWithId(block.value1.value); - if (funcBlock) { - setBlock(sprite, funcBlock, trigger); - }; - break; - } - break; - - //動きの制御ブロックの初期化 - case "movement": - reaction.action.initialize(deltaTime, value1, value2); - break; - - //分岐 - case "branch": - var nextBlock; - switch(block.name){ - case "branch_larger": - if (value1 < value2) { - nextBlock = findBlock(block.bottomLinks[0].id); - }else{ - nextBlock = findBlock(block.bottomLinks[1].id); - } - break; - } - if (nextBlock) { - setBlock(sprite, nextBlock, trigger); - }; - break; - - case "time_control": - reaction.action.initialize(deltaTime, block.value1.value); - break; - - case "sound": - switch(block.name){ - case "play_sound": - if (block.value1.value) { - soundManager.playSound(block.value2.value, true); - }else{ - soundManager.playSound(block.value2.value, false); - }; - break; - } - goNextBlock(sprite, trigger); - break; - } - } - - function findNextBlock(block){ - var id = block.bottomLinks[0].id; - if (id != null) { - return findBlock(id); - }else{ - return null; - }; - } - - function goNextBlock(sprite, trigger){ - var block = sprite.reactions[trigger].block; - var nextBlock = findNextBlock(block); - if (nextBlock) { - setBlock(sprite, nextBlock, trigger); - }else{ - sprite.reactions[trigger] = {block:null, action:null}; - }; - } - $(document).on("click",".app_start_button", function(event) { - //アプリ起動時に関数の実行 + //blockActionの開始 + blockAction.startAction(currentSprites, currentVariables, deltaTime, getIdentifiedTrigger, resetApp); if (appState == STATE.DEFAULT) { + //アプリ起動時に関数の実行 _.each(currentSprites, function(sprite){ if(sprite.startFuncIdx){ var funcBlock = findFunctionWithId(sprite.startFuncIdx); if (funcBlock) { - setBlock(sprite, funcBlock, "start"); + blockAction.setBlock(sprite, funcBlock, "start"); }; } }); @@ -268,6 +177,7 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im }); function doFrame(){ + //アニメーションの間隔調整 var isTimingOfAnimation = false; animationInterval += deltaTime; @@ -277,18 +187,22 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im }; _.each(currentSprites, function(sprite){ //各アクション + if (!sprite || !sprite.reactions) { + return; + }; _.each(sprite.reactions, function(reaction, trigger){ if (reaction.action && reaction.block) { switch(reaction.block.category){ case "movement": case "time_control": - reaction.action.behave(sprite, trigger, goNextBlock); + reaction.action.behave(sprite, trigger); break; }; }; }); //衝突判定 _.each(currentSprites, function(tSpr) { + if (!tSpr) {return;}; for (var i = 0; i < sprite.collision.length; i++) { var collisionSet = sprite.collision[i]; if (tSpr.tag == collisionSet.tag && collisionSet.funcIdx) { @@ -301,7 +215,7 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im var funcBlock = findFunctionWithId(collisionSet.funcIdx); if (funcBlock) { resetReactions(sprite); - setBlock(sprite, funcBlock, getIdentifiedTrigger("collision")); + blockAction.setBlock(sprite, funcBlock, getIdentifiedTrigger("collision")); }; }; }; @@ -313,6 +227,12 @@ define(['canvas_manager', 'sprite_manager', 'sprite_drawer', 'block_action', 'im }; }); //描画 + if (appState == STATE.PLAYING) { + drawSprites(); + }; + } + + function drawSprites(){ if (canvas) { spriteDrawer.drawSprites(canvas, canvasContext, currentSprites); }; diff --git a/app/webroot/js/pictcode/preview_manager.js b/app/webroot/js/pictcode/preview_manager.js index ff26eca..cd254fd 100644 --- a/app/webroot/js/pictcode/preview_manager.js +++ b/app/webroot/js/pictcode/preview_manager.js @@ -1,28 +1,63 @@ -define(['block_data','image_manager', 'sprite_drawer', 'block_manager'], function(blockData, imageManager, spriteDrawer, blockManager){ +define(['block_data', 'image_manager', 'sprite_drawer', 'block_manager'], function(blockData, imageManager, spriteDrawer, blockManager){ var canvas; var canvasContext; var dt = 20;//ミリ秒 var timer; - var dummy; + var dummy = {}; + var initialDummy = {size:125, position:{x:0, y:0}, scale:1.0, angle:0, opacity:1.0, mirrored:false}; + var aspectRatio; + var ACTION_TYPE = { + ROTATE_RIGHT : 0, + ROTATE_LEFT : 1, + ZOOM : 2, + OPACITY : 3, + }; + function initialize(cvs, cvsCtx){ + initialDummy.image = imageManager.images.preview_001; canvas = cvs; canvasContext = cvsCtx; canvasContext.fillStyle = '#4682b4'; - dummy = {image:imageManager.images.preview_001, globalSize:125}; aspectRatio = spriteDrawer.editorInnerSize.height/spriteDrawer.editorInnerSize.width; + initializeDummy(); + initializePreview(); } function startPreview(targetBlock){ stopPreview(); - initializePreview(); + initializeDummy(); switch(targetBlock.name){ case "move": move(targetBlock); break; + case "rotate_right": + action(targetBlock, ACTION_TYPE.ROTATE_RIGHT); + break; + case "rotate_left": + action(targetBlock, ACTION_TYPE.ROTATE_LEFT); + break; + case "zoom": + action(targetBlock, ACTION_TYPE.ZOOM); + break; + case "opacity": + action(targetBlock, ACTION_TYPE.OPACITY); + break; + case "self_duplicate": + selfDuplicate(targetBlock); + break; + case "self_kill": + selfKill(targetBlock); + break; + case "mirror": + mirror(targetBlock); + break; + default: + initializePreview(); + break; } } @@ -33,10 +68,46 @@ define(['block_data','image_manager', 'sprite_drawer', 'block_manager'], functio } function initializePreview(){ - dummy.position = {x:0, y:0}; var cvDummySize = canvas.height*0.25; - var cvGbRatio = cvDummySize / dummy.globalSize; - drawDummy(dummy, cvDummySize, cvGbRatio); + var cvGbRatio = cvDummySize / dummy.size; + drawDummy(cvDummySize, cvGbRatio); + } + + function initializeDummy(){ + dummy.image = initialDummy.image; + dummy.size = initialDummy.size; + dummy.position = {x:initialDummy.position.x, y:initialDummy.position.y}; + dummy.scale = initialDummy.scale; + dummy.angle = initialDummy.angle; + dummy.opacity = initialDummy.opacity; + dummy.mirrored = initialDummy.mirrored; + } + + function drawDummy(cvDummySize, cvGbRatio, isTwined){ + var cvDummyLeft = canvas.width/2 - cvDummySize/2 + dummy.position.x*cvGbRatio; + var cvDummyTop = canvas.height/2 - cvDummySize/2 - dummy.position.y*cvGbRatio; + + canvasContext.clearRect(0, 0, canvas.width, canvas.height); + canvasContext.fillRect(0, 0, canvas.width, canvas.height); + var cvBgSize = {width:spriteDrawer.editorInnerSize.width*cvGbRatio*1.1, height:spriteDrawer.editorInnerSize.height*cvGbRatio*1.1}; + canvasContext.drawImage(imageManager.images.preview_002, canvas.width/2-cvBgSize.width/2, canvas.height/2-cvBgSize.height/2, cvBgSize.width, cvBgSize.height); + canvasContext.save(); + canvasContext.lineWidth = 10; + canvasContext.strokeStyle = "#8b4513"; + canvasContext.strokeRect(0, 0, canvas.width, canvas.height); + canvasContext.translate(canvas.width/2, canvas.height/2); + canvasContext.rotate(dummy.angle); + if (dummy.mirrored) { + canvasContext.transform(-1, 0, 0, 1, 0, 0); + }; + canvasContext.translate(-canvas.width/2, -canvas.height/2); + canvasContext.globalAlpha = dummy.opacity; + canvasContext.drawImage(dummy.image, cvDummyLeft, cvDummyTop, cvDummySize, cvDummySize); + if (isTwined) { + var twinedLeft = canvas.width/2 - cvDummySize/2 - dummy.position.x*cvGbRatio; + canvasContext.drawImage(dummy.image, twinedLeft, cvDummyTop, cvDummySize, cvDummySize); + }; + canvasContext.restore(); } function move(block){ @@ -51,7 +122,7 @@ define(['block_data','image_manager', 'sprite_drawer', 'block_manager'], functio var intervalTime = 0; dummy.position = {x:-block.value2.value.x/2, y:-block.value2.value.y/2}; - var gbDummySize = dummy.globalSize; + var gbDummySize = dummy.size; var gbDistance; var cvsDistance; if (Math.abs(block.value2.value.x) > Math.abs(block.value2.value.y)) { @@ -65,13 +136,20 @@ define(['block_data','image_manager', 'sprite_drawer', 'block_manager'], functio var cvDistance = cvsDistance * gbDistance / (gbDummySize+gbDistance); var cvGbRatio = cvDummySize / gbDummySize; - var gbd = {dx:block.value2.value.x*dt/duration, dy:block.value2.value.y*dt/duration}; + var gbd; + if (block.value1.value > 0) { + gbd = {dx:block.value2.value.x*dt/duration, dy:block.value2.value.y*dt/duration}; + }else{ + gbd = {dx:block.value2.value.x, dy:block.value2.value.y}; + }; timer = setInterval(function(){ if (isInterval) { intervalTime += dt; if (intervalTime == 500) { - drawDummy(dummy, cvDummySize, cvGbRatio); + dummy.position.x = -block.value2.value.x/2; + dummy.position.y = -block.value2.value.y/2; + drawDummy(cvDummySize, cvGbRatio, false); }else if (intervalTime >= 1200) { isInterval = false; passedTime = 0; @@ -83,36 +161,216 @@ define(['block_data','image_manager', 'sprite_drawer', 'block_manager'], functio dummy.position.y += gbd.dy; passedTime += dt; if(passedTime >= duration){ - dummy.position.x = -block.value2.value.x/2; - dummy.position.y = -block.value2.value.y/2; isInterval = true; intervalTime = 0; - return; } - drawDummy(dummy, cvDummySize, cvGbRatio); + drawDummy(cvDummySize, cvGbRatio, false); } , dt); } - function drawDummy(dummy, cvDummySize, cvGbRatio){ - var cvDummyLeft = canvas.width/2 - cvDummySize/2 + dummy.position.x*cvGbRatio; - var cvDummyTop = canvas.height/2 - cvDummySize/2 - dummy.position.y*cvGbRatio; + function action(block, actinType){ + var duration; + if (!block.value1.isVariable) { + duration = block.value1.value * 1000;//ミリ秒 + }else{ + duration = blockManager.findVariableWithId(block.value1.value).value2.value * 1000;//ミリ秒 + }; + var degree; + if (!block.value2.isVariable) { + degree = block.value2.value; + }else{ + degree = blockManager.findVariableWithId(block.value2.value).value2.value; + }; + var passedTime = 0; + var isInterval = false; + var intervalTime = 0; - canvasContext.clearRect(0, 0, canvas.width, canvas.height); - canvasContext.fillRect(0, 0, canvas.width, canvas.height); - var cvBgSize = {width:spriteDrawer.editorInnerSize.width*cvGbRatio*1.1, height:spriteDrawer.editorInnerSize.height*cvGbRatio*1.1}; - canvasContext.drawImage(imageManager.images.preview_002, canvas.width/2-cvBgSize.width/2, canvas.height/2-cvBgSize.height/2, cvBgSize.width, cvBgSize.height); - canvasContext.save(); - canvasContext.lineWidth = 10; - canvasContext.strokeStyle = "#8b4513"; - canvasContext.strokeRect(0, 0, canvas.width, canvas.height); - canvasContext.restore(); - canvasContext.drawImage(dummy.image, cvDummyLeft, cvDummyTop, cvDummySize, cvDummySize); - } + var ds; + var cvDummySize; + switch(actinType){ + case ACTION_TYPE.ROTATE_RIGHT: + if (block.value1.value > 0) { + ds = (degree*Math.PI/180 - dummy.angle) * dt / duration; + }else{ + ds = degree*Math.PI/180 - dummy.angle; + }; + cvDummySize = canvas.height*0.45; + break; + case ACTION_TYPE.ROTATE_LEFT: + if (block.value1.value > 0) { + ds = -(degree*Math.PI/180 - dummy.angle) * dt / duration; + }else{ + ds = -(degree*Math.PI/180 - dummy.angle); + }; + cvDummySize = canvas.height*0.45; + break; + case ACTION_TYPE.ZOOM: + if (block.value1.value > 0) { + ds = (degree - dummy.scale) * dt / duration; + }else{ + ds = (degree - dummy.scale); + }; + cvDummySize = canvas.height*0.25; + break; + case ACTION_TYPE.OPACITY: + if (block.value1.value > 0) { + ds = (degree - dummy.opacity) * dt / duration; + }else{ + ds = degree - dummy.opacity; + }; + cvDummySize = canvas.height*0.45; + break; + } + if (!ds || !cvDummySize) {return;}; + + var cvGbRatio = cvDummySize / dummy.size; + + timer = setInterval(function(){ + if (isInterval) { + intervalTime += dt; + if (intervalTime == 500) { + initializeDummy(); + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + }else if (intervalTime >= 1200) { + isInterval = false; + passedTime = 0; + }; + return; + }; + + switch(actinType){ + case ACTION_TYPE.ROTATE_RIGHT: + case ACTION_TYPE.ROTATE_LEFT: + dummy.angle += ds; + break; + case ACTION_TYPE.ZOOM: + dummy.scale += ds; + break; + case ACTION_TYPE.OPACITY: + dummy.opacity += ds; + break; + } + passedTime += dt; + + if(passedTime >= duration){ + isInterval = true; + intervalTime = 0; + } + + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + } , dt); + } + + function selfDuplicate(block){ + + var passedTime = 0; + var isInterval = false; + var intervalTime = 0; + var duration = 250; + + var cvDummySize= canvas.height*0.45; + var ds = cvDummySize*0.28 * dt / duration; + var cvGbRatio = cvDummySize / dummy.size; + + timer = setInterval(function(){ + if (isInterval) { + intervalTime += dt; + if (intervalTime == 1000) { + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + }else if (intervalTime >= 1700) { + isInterval = false; + passedTime = 0; + }; + return; + }; + + dummy.position.x += ds; + passedTime += dt; + + if(passedTime >= duration){ + initializeDummy(); + isInterval = true; + intervalTime = 0; + return; + } + + drawDummy(cvDummySize*dummy.scale, cvGbRatio, true); + } , dt); + } + + function selfKill(block){ + + var passedTime = 0; + var isInterval = false; + var intervalTime = 0; + var duration = 1700; + + var cvDummySize= canvas.height*0.45; + var cvGbRatio = cvDummySize / dummy.size; + + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + timer = setInterval(function(){ + if (isInterval) { + intervalTime += dt; + if (intervalTime >= duration) { + isInterval = false; + passedTime = 0; + initializeDummy(); + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + }; + return; + }; + + passedTime += dt; + + if(passedTime >= duration){ + isInterval = true; + intervalTime = 0; + dummy.opacity = 0; + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + return; + } + } , dt); + } + + function mirror(block){ + + var passedTime = 0; + var isInterval = false; + var intervalTime = 0; + var duration = 1200; + + var cvDummySize= canvas.height*0.45; + var cvGbRatio = cvDummySize / dummy.size; + + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + timer = setInterval(function(){ + if (isInterval) { + intervalTime += dt; + if (intervalTime >= duration) { + isInterval = false; + passedTime = 0; + initializeDummy(); + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + }; + return; + }; + + passedTime += dt; + + if(passedTime >= duration){ + isInterval = true; + intervalTime = 0; + dummy.mirrored = true; + drawDummy(cvDummySize*dummy.scale, cvGbRatio, false); + return; + } + } , dt); + } return { initialize:initialize, - initializePreview:initializePreview, startPreview:startPreview, stopPreview:stopPreview, }; diff --git a/app/webroot/js/pictcode/require_config.js b/app/webroot/js/pictcode/require_config.js index 5cf84c9..dfaf244 100644 --- a/app/webroot/js/pictcode/require_config.js +++ b/app/webroot/js/pictcode/require_config.js @@ -51,6 +51,12 @@ var require = { "tag_selector": { deps: ['jquery', 'underscore'] }, + "block_actions": { + deps: ['jquery', 'underscore'] + }, + "dummy_apps": { + deps: ['jquery', 'underscore'] + }, //UI "ui_manager": { deps: ['jquery', 'underscore'] @@ -89,9 +95,6 @@ var require = { "block_manager": { deps: ['jquery', 'underscore'] }, - "block_action": { - deps: ['jquery', 'underscore'] - }, "input_manager": { deps: ['jquery', 'underscore'] }, @@ -111,5 +114,11 @@ var require = { "play_manager": { deps: ['jquery', 'underscore'] }, + "block_action": { + deps: ['jquery', 'underscore'] + }, + "sprite_action": { + deps: ['jquery', 'underscore'] + }, } }; \ No newline at end of file diff --git a/app/webroot/js/pictcode/scalar_input.js b/app/webroot/js/pictcode/scalar_input.js index f62a4c8..8d1d372 100644 --- a/app/webroot/js/pictcode/scalar_input.js +++ b/app/webroot/js/pictcode/scalar_input.js @@ -24,7 +24,7 @@ define(["canvas_manager", "block_manager", "image_manager", "modal_manager", "ut didSelectScalar = dSlctSclr; //入力・変数の表示の切り替え - if (value.canBeVariable) { + if (value.canInput && value.canBeVariable) { $("#modal_coding_scalar_input_button")[0].style.display = "inline"; $("#modal_coding_scalar_variable_button")[0].style.display = "inline"; if (value.isVariable) { @@ -33,11 +33,16 @@ define(["canvas_manager", "block_manager", "image_manager", "modal_manager", "ut showInput(); }; $("#modal_coding_scalar")[0].style.paddingTop = "5px"; - }else{ + }else if(value.canInput && !value.canBeVariable){ $("#modal_coding_scalar_input_button")[0].style.display = "none"; $("#modal_coding_scalar_variable_button")[0].style.display = "none"; showInput(); $("#modal_coding_scalar")[0].style.paddingTop = "50px"; + }else{ + $("#modal_coding_scalar_input_button")[0].style.display = "none"; + $("#modal_coding_scalar_variable_button")[0].style.display = "none"; + showVariable(); + $("#modal_coding_scalar")[0].style.paddingTop = "50px"; } //入力の設定 @@ -164,7 +169,7 @@ define(["canvas_manager", "block_manager", "image_manager", "modal_manager", "ut }; canvasContext.font = "italic bold "+ fontSize + "px " + "sans-serif"; var valueString; - valueString = valuePointer.value.toFixed(1); + valueString = (valuePointer.value*1).toFixed(1); canvasContext.fillStyle = "red"; canvasContext.fillText(valueString, cvIndicatorX+cvIndicatorSize*0.08, cvIndicatorY+cvIndicatorSize*0.5); //icon image @@ -243,7 +248,7 @@ define(["canvas_manager", "block_manager", "image_manager", "modal_manager", "ut div1.style.fontWeight = "bold"; div1.style.width = varBlock.value1.valueSize*image.height + "px"; div1.style.height = varBlock.value1.valueSize*image.height + "px"; - var alphabet = utility.numberToAlphabet(varBlock.value1.value); + var alphabet = utility.numberToSmallAlphabet(varBlock.value1.value); div1.innerHTML = alphabet; var div2 = document.createElement('div'); div2.style.position = 'absolute'; diff --git a/app/webroot/js/pictcode/sound_manager.js b/app/webroot/js/pictcode/sound_manager.js index 746eee7..feb8b96 100644 --- a/app/webroot/js/pictcode/sound_manager.js +++ b/app/webroot/js/pictcode/sound_manager.js @@ -2,9 +2,111 @@ define(["utility"], function(utility){ //----------------サウンド----------------// var soundInfos = [ - {name:"jump-cute1", ext:"mp3", category:"se", soundKey:0}, - {name:"nyu1", ext:"mp3", category:"se", soundKey:1}, - {name:"loop_66_Pop", ext:"wav", category:"bgm", soundKey:2}, + //SE + {name:"ACTION1", ext:"mp3", category:"se", soundKey:0}, + {name:"ACTION2", ext:"mp3", category:"se", soundKey:1}, + {name:"ACTION3", ext:"mp3", category:"se", soundKey:2}, + {name:"ACTION4", ext:"mp3", category:"se", soundKey:3}, + {name:"ACTION5", ext:"mp3", category:"se", soundKey:4}, + {name:"ACTION6", ext:"mp3", category:"se", soundKey:5}, + {name:"ACTION7", ext:"mp3", category:"se", soundKey:6}, + {name:"ACTION8", ext:"mp3", category:"se", soundKey:7}, + {name:"ACTION9", ext:"mp3", category:"se", soundKey:8}, + {name:"ACTION10", ext:"mp3", category:"se", soundKey:9}, + {name:"AIRPLANE1", ext:"mp3", category:"se", soundKey:10}, + {name:"AIRPLANE2", ext:"mp3", category:"se", soundKey:11}, + {name:"ALERT1", ext:"mp3", category:"se", soundKey:12}, + {name:"ALERT2", ext:"mp3", category:"se", soundKey:13}, + {name:"ALERT3", ext:"mp3", category:"se", soundKey:14}, + {name:"ALERT4", ext:"mp3", category:"se", soundKey:15}, + {name:"ALERT5", ext:"mp3", category:"se", soundKey:16}, + {name:"ATTACK1", ext:"mp3", category:"se", soundKey:17}, + {name:"ATTACK2", ext:"mp3", category:"se", soundKey:18}, + {name:"ATTACK3", ext:"mp3", category:"se", soundKey:19}, + {name:"ATTACK4", ext:"mp3", category:"se", soundKey:20}, + {name:"ATTACK5", ext:"mp3", category:"se", soundKey:21}, + {name:"ATTACK6", ext:"mp3", category:"se", soundKey:22}, + {name:"ATTACK7", ext:"mp3", category:"se", soundKey:23}, + {name:"ATTACK8", ext:"mp3", category:"se", soundKey:24}, + {name:"ATTACK9", ext:"mp3", category:"se", soundKey:25}, + {name:"ATTACK10", ext:"mp3", category:"se", soundKey:26}, + {name:"ATTACK11", ext:"mp3", category:"se", soundKey:27}, + {name:"ATTACK12", ext:"mp3", category:"se", soundKey:28}, + {name:"ATTACK13", ext:"mp3", category:"se", soundKey:29}, + {name:"ATTACK14", ext:"mp3", category:"se", soundKey:30}, + {name:"BOAT1", ext:"mp3", category:"se", soundKey:31}, + {name:"BOAT2", ext:"mp3", category:"se", soundKey:32}, + {name:"BUS1", ext:"mp3", category:"se", soundKey:33}, + {name:"BYCICLE1", ext:"mp3", category:"se", soundKey:34}, + {name:"BYCICLE2", ext:"mp3", category:"se", soundKey:35}, + {name:"CAR1", ext:"mp3", category:"se", soundKey:36}, + {name:"CAR2", ext:"mp3", category:"se", soundKey:37}, + {name:"CAR3", ext:"mp3", category:"se", soundKey:38}, + {name:"CAR4", ext:"mp3", category:"se", soundKey:39}, + {name:"CAR5", ext:"mp3", category:"se", soundKey:40}, + {name:"CAR6", ext:"mp3", category:"se", soundKey:41}, + {name:"CAT1", ext:"mp3", category:"se", soundKey:42}, + {name:"CAT2", ext:"mp3", category:"se", soundKey:43}, + {name:"CAT3", ext:"mp3", category:"se", soundKey:44}, + {name:"CHEER1", ext:"mp3", category:"se", soundKey:45}, + {name:"CHEER2", ext:"mp3", category:"se", soundKey:46}, + {name:"CHEER3", ext:"mp3", category:"se", soundKey:47}, + {name:"CHIME1", ext:"mp3", category:"se", soundKey:48}, + {name:"CHIME2", ext:"mp3", category:"se", soundKey:49}, + {name:"CHIME3", ext:"mp3", category:"se", soundKey:50}, + {name:"CHIME4", ext:"mp3", category:"se", soundKey:51}, + {name:"CHIME5", ext:"mp3", category:"se", soundKey:52}, + {name:"CHIME6", ext:"mp3", category:"se", soundKey:53}, + {name:"CHIME7", ext:"mp3", category:"se", soundKey:54}, + {name:"CHIME8", ext:"mp3", category:"se", soundKey:55}, + {name:"CORRECT1", ext:"mp3", category:"se", soundKey:56}, + {name:"DOG1", ext:"mp3", category:"se", soundKey:57}, + {name:"DOG2", ext:"mp3", category:"se", soundKey:58}, + {name:"DRUM1", ext:"mp3", category:"se", soundKey:59}, + {name:"DRUM2", ext:"mp3", category:"se", soundKey:60}, + {name:"DRUM3", ext:"mp3", category:"se", soundKey:61}, + {name:"DRUM4", ext:"mp3", category:"se", soundKey:62}, + {name:"FALLING1", ext:"mp3", category:"se", soundKey:63}, + {name:"FALLING2", ext:"mp3", category:"se", soundKey:64}, + {name:"FALLING3", ext:"mp3", category:"se", soundKey:65}, + {name:"FIRE1", ext:"mp3", category:"se", soundKey:66}, + {name:"FIRE2", ext:"mp3", category:"se", soundKey:67}, + {name:"HORN1", ext:"mp3", category:"se", soundKey:68}, + {name:"PIANO1", ext:"mp3", category:"se", soundKey:69}, + {name:"PIANO2", ext:"mp3", category:"se", soundKey:70}, + {name:"PIANO3", ext:"mp3", category:"se", soundKey:71}, + {name:"PIANO4", ext:"mp3", category:"se", soundKey:72}, + {name:"PIANO5", ext:"mp3", category:"se", soundKey:73}, + {name:"PIANO6", ext:"mp3", category:"se", soundKey:74}, + {name:"PIANO7", ext:"mp3", category:"se", soundKey:75}, + {name:"PIANO8", ext:"mp3", category:"se", soundKey:76}, + {name:"QUESTION1", ext:"mp3", category:"se", soundKey:77}, + {name:"QUESTION2", ext:"mp3", category:"se", soundKey:78}, + {name:"QUESTION3", ext:"mp3", category:"se", soundKey:79}, + {name:"QUESTION4", ext:"mp3", category:"se", soundKey:80}, + {name:"SIREN1", ext:"mp3", category:"se", soundKey:81}, + {name:"START1", ext:"mp3", category:"se", soundKey:82}, + {name:"START2", ext:"mp3", category:"se", soundKey:83}, + {name:"SWING1", ext:"mp3", category:"se", soundKey:84}, + {name:"SWING2", ext:"mp3", category:"se", soundKey:85}, + {name:"SWING3", ext:"mp3", category:"se", soundKey:86}, + {name:"WATER1", ext:"mp3", category:"se", soundKey:87}, + + //BGM + {name:"BOSSA1", ext:"wav", category:"bgm", soundKey:1000}, + {name:"FANTASY1", ext:"wav", category:"bgm", soundKey:1001}, + {name:"FANTASY2", ext:"wav", category:"bgm", soundKey:1002}, + {name:"FANTASY3", ext:"wav", category:"bgm", soundKey:1003}, + {name:"FANTASY4", ext:"wav", category:"bgm", soundKey:1004}, + {name:"ORCHESTRA1", ext:"wav", category:"bgm", soundKey:1005}, + {name:"POP1", ext:"wav", category:"bgm", soundKey:1006}, + {name:"POP2", ext:"wav", category:"bgm", soundKey:1007}, + {name:"POP3", ext:"wav", category:"bgm", soundKey:1008}, + {name:"POP4", ext:"wav", category:"bgm", soundKey:1009}, + {name:"ROCK1", ext:"wav", category:"bgm", soundKey:1010}, + {name:"ROCK2", ext:"wav", category:"bgm", soundKey:1011}, + {name:"ROCK3", ext:"wav", category:"bgm", soundKey:1012}, + ]; function findSoundInfoFromImageKey(soundKey){ @@ -26,8 +128,8 @@ define(["utility"], function(utility){ //----------------カテゴリ----------------// var categoryInfos =[ - {name: "se"}, - {name: "bgm"}, + {name: "se", imageKey: "sound_001"}, + {name: "bgm", imageKey: "sound_002"}, ]; //----------------再生----------------// diff --git a/app/webroot/js/pictcode/sound_selector.js b/app/webroot/js/pictcode/sound_selector.js index 0a24b7f..68b20dc 100644 --- a/app/webroot/js/pictcode/sound_selector.js +++ b/app/webroot/js/pictcode/sound_selector.js @@ -10,13 +10,19 @@ define(['modal_manager', 'sound_manager', 'image_manager'], function(modalManage $("#modal_coding_sound_container").html(""); var categoryInfos = soundManager.categoryInfos; _.each( categoryInfos, function(categoryInfo){ + var image = imageManager.images[categoryInfo.imageKey]; + image.style.width = "120px"; + image.style.height = "40px"; var button = document.createElement('button'); button.name = categoryInfo.name; button.className = 'sound_category_button'; + button.style.padding = "0px"; button.style.margin = "5px"; - button.style.width = "128px"; - button.style.height = "56px"; - button.innerHTML = categoryInfo.name; + button.style.width = "120px"; + button.style.height = "40px"; + button.style.border = "0px"; + button.style.background = "transparent"; + button.appendChild(image); categoryContainer.appendChild(button); }); @@ -24,38 +30,42 @@ define(['modal_manager', 'sound_manager', 'image_manager'], function(modalManage $("#modal_coding_sound").css({width:modalSize, height:modalSize, bottom:0, display:"none"}); $("#modal_coding_sound_container")[0].appendChild(categoryContainer); modalManager.showUpModal($("#modal_coding_sound"), null); + + // document.removeEventListener("touchmove", function(evt) { + // evt.preventDefault(); + // }, false); + }; $(document).on("click",".sound_category_button", function(event) { var category = event.currentTarget.name; var buttonContainter = document.createElement('div'); + // buttonContainter.style.minHeight = "101%"; var iconSize = "56px"; var categorizedSoundInfos = soundManager.getCategorizedSoundInfos(category); - _.each( categorizedSoundInfos, function(soundInfo){ - + _.each( categorizedSoundInfos, function(soundInfo, idx){ + var selectButton = document.createElement('button'); selectButton.name = soundInfo.soundKey; - selectButton.className = 'sound_select_button'; - selectButton.style.margin = "5px"; - selectButton.style.width = "128px"; - selectButton.style.height = "56px"; + selectButton.className = 'sound_select_button btn'; selectButton.innerHTML = soundInfo.name; buttonContainter.appendChild(selectButton); var playButton = document.createElement('button'); playButton.name = soundInfo.soundKey; - playButton.className = 'sound_play_button'; - playButton.style.margin = "5px"; - playButton.style.width = iconSize; - playButton.style.height = iconSize; - var playImage = imageManager.images.input_sound_001.cloneNode(false); - playImage.style.width = iconSize; - playImage.style.height = iconSize; - playImage.style.background = "transparent"; - playImage.style.border = "0px"; - playButton.appendChild(playImage); + playButton.id = "sound_play_button" + idx; + playButton.idx = idx; + playButton.className = 'sound_play_button btn'; buttonContainter.appendChild(playButton) + var stopButton = document.createElement('button'); + stopButton.name = soundInfo.soundKey; + stopButton.className = 'sound_stop_button btn'; + stopButton.id = 'sound_stop_button' + idx; + stopButton.idx = idx; + stopButton.style.display = "none"; + buttonContainter.appendChild(stopButton) + buttonContainter.appendChild(document.createElement('br')); }); @@ -67,18 +77,34 @@ define(['modal_manager', 'sound_manager', 'image_manager'], function(modalManage //Modalのバックボタンをタップ時 var backToTop = function(){ modalManager.removeBackButton(); + soundManager.stopAllSound(); $("#modal_coding_sound_container").html(""); $("#modal_coding_sound_container")[0].appendChild(categoryContainer); } $(document).on("click",".sound_play_button", function(event) { var soundKey = event.currentTarget.name; + var idx = event.currentTarget.idx; + $(".sound_play_button").css({display: "inline"}); + $(".sound_stop_button").css({display: "none"}); + $("#sound_play_button" + idx)[0].style.display = "none"; + $("#sound_stop_button" + idx)[0].style.display = "inline"; + soundManager.stopAllSound(); soundManager.playSound(soundKey); }); + $(document).on("click",".sound_stop_button", function(event) { + var soundKey = event.currentTarget.name; + var idx = event.currentTarget.idx; + $("#sound_play_button" + idx)[0].style.display = "inline"; + $("#sound_stop_button" + idx)[0].style.display = "none"; + soundManager.stopAllSound(); + }); + $(document).on("click",".sound_select_button", function(event) { var soundKey = event.currentTarget.name; soundManager.loadSound(soundKey); + soundManager.stopAllSound(); didSelectSound(soundKey); modalManager.closeDownModal($("#modal_coding_sound")); }); diff --git a/app/webroot/js/pictcode/sprite_action.js b/app/webroot/js/pictcode/sprite_action.js new file mode 100644 index 0000000..b6712d1 --- /dev/null +++ b/app/webroot/js/pictcode/sprite_action.js @@ -0,0 +1,59 @@ +define(['sprite_manager', 'sprite_drawer'], function(spriteManager, spriteDrawer){ + + var previousPosition; + var targetSprite; + var isMoving = false; + var ceRatio; + var editorSize; + + function setSwipeTarget(x, y, canvas, edtrSize, tSprite){ + previousPosition= {x:x, y:y}; + targetSprite = tSprite; + isMoving = true; + editorSize = edtrSize; + ceRatio = canvas.width/editorSize.width; + } + + function changeSpritesPositionBySwipe(x, y, drawSprites){ + if (!isMoving) {return}; + + var dx = x-previousPosition.x; + var dy = y-previousPosition.y; + dx /= ceRatio; + dy /= ceRatio; + dy *= -1; + targetSprite.position.x += dx; + targetSprite.position.y += dy; + previousPosition.x = x; + previousPosition.y = y; + + if (targetSprite.x < -editorSize.width/2){ + targetSprite.x = -editorSize.width/2; + isMoving = false; + }; + if(targetSprite.x > editorSize.width/2){ + targetSprite.x = editorSize.width/2; + isMoving = false; + }; + if(targetSprite.y < -editorSize.height/2){ + targetSprite.y = -editorSize.height/2; + isMoving = false; + }; + if(targetSprite.y > editorSize.height/2) { + targetSprite.y = editorSize.height/2 + isMoving = false; + }; + + drawSprites(); + } + + function finishSwipe(){ + isMoving = false; + } + + return { + setSwipeTarget:setSwipeTarget, + changeSpritesPositionBySwipe:changeSpritesPositionBySwipe, + finishSwipe:finishSwipe, + }; +}); diff --git a/app/webroot/js/pictcode/sprite_data.js b/app/webroot/js/pictcode/sprite_data.js index fd214d1..af0a3aa 100644 --- a/app/webroot/js/pictcode/sprite_data.js +++ b/app/webroot/js/pictcode/sprite_data.js @@ -3,14 +3,68 @@ define(["utility"], function(utility){ //----------------Sprite画像----------------// var spriteImageInfos = [ - {imageNames:["car01.png", "car02.png"], category:"vehicle", imageKey:0}, + + //Vehicle + {imageNames:["001_char_img_car_010.png", "001_char_img_car_020.png"], category:"car", imageKey:0}, + {imageNames:["001_char_img_car_030.png", "001_char_img_car_040.png"], category:"car", imageKey:1}, + {imageNames:["001_char_img_car_050.png", "001_char_img_car_060.png"], category:"car", imageKey:2}, + {imageNames:["001_char_img_car_070.png", "001_char_img_car_080.png"], category:"car", imageKey:3}, + {imageNames:["001_char_img_bus_010.png", "001_char_img_bus_020.png"], category:"car", imageKey:4}, + {imageNames:["001_char_img_bus_030.png", "001_char_img_bus_040.png"], category:"car", imageKey:5}, {imageNames:["car03.png"], category:"vehicle", imageKey:1}, - {imageNames:["mogura01.png"], category:"animal", imageKey:2}, - {imageNames:["dolphin01.png", "dolphin02.png"], category:"animal", imageKey:3}, - {imageNames:["whale01.png", "whale02.png"], category:"animal", imageKey:4}, - {imageNames:["dog01.png", "dog02.png"], category:"animal", imageKey:5}, - {imageNames:["nohara.png"], category:"background", imageKey:6}, - {imageNames:["dokan.png"], category:"artifact", imageKey:7}, + + //Animal + {imageNames:["001_char_img_dolphin_010.png", "001_char_img_dolphin_020.png"], category:"animal", imageKey:100}, + {imageNames:["001_char_img_whale_010.png", "001_char_img_whale_020.png"], category:"animal", imageKey:101}, + {imageNames:["001_char_img_dog_010.png"], category:"animal", imageKey:102}, + {imageNames:["001_char_img_dog_020.png", "001_char_img_dog_030.png"], category:"animal", imageKey:103}, + {imageNames:["001_char_img_dog_040.png"], category:"animal", imageKey:104}, + {imageNames:["001_char_img_dog_050.png", "001_char_img_dog_060.png"], category:"animal", imageKey:105}, + {imageNames:["001_char_img_cat_010.png"], category:"animal", imageKey:106}, + {imageNames:["001_char_img_cat_020.png", "001_char_img_cat_030.png"], category:"animal", imageKey:107}, + {imageNames:["001_char_img_mouse_010.png"], category:"animal", imageKey:108}, + {imageNames:["001_char_img_mouse_020.png", "001_char_img_mouse_030.png"], category:"animal", imageKey:109}, + {imageNames:["001_char_img_mole_010.png"], category:"animal", imageKey:110}, + {imageNames:["001_char_img_mole_020.png"], category:"animal", imageKey:111}, + {imageNames:["001_char_img_mole_030.png"], category:"animal", imageKey:112}, + + //Background + {imageNames:["001_char_bg_bg_010.png"], category:"background", imageKey:200}, + {imageNames:["001_char_bg_bg_020.png"], category:"background", imageKey:201}, + {imageNames:["001_char_bg_bg_030.png"], category:"background", imageKey:202}, + {imageNames:["001_char_bg_bg_040.png"], category:"background", imageKey:203}, + + //Artifact + {imageNames:["001_char_img_pipe_010.png"], category:"artifact", imageKey:300}, + + //Airplane + {imageNames:["001_char_img_airplane_010.png"], category:"airplane", imageKey:400}, + {imageNames:["001_char_img_airplane_020.png"], category:"airplane", imageKey:401}, + {imageNames:["001_char_img_airplane_030.png"], category:"airplane", imageKey:402}, + {imageNames:["001_char_img_airplane_040.png"], category:"airplane", imageKey:403}, + {imageNames:["001_char_img_bomb_010.png", "001_char_img_bomb_020.png"], category:"airplane", imageKey:404}, + {imageNames:["001_char_img_bomb_030.png", "001_char_img_bomb_040.png"], category:"airplane", imageKey:405}, + + //Board + {imageNames:["001_char_img_display_010.png"], category:"board", imageKey:500}, + {imageNames:["001_char_img_display_020.png"], category:"board", imageKey:501}, + {imageNames:["001_char_img_display_030.png"], category:"board", imageKey:502}, + {imageNames:["game_clear.png"], category:"board", imageKey:503}, + {imageNames:["game_over.png"], category:"board", imageKey:504}, + {imageNames:["arrow1.png"], category:"board", imageKey:505}, + {imageNames:["transparent_board.png"], category:"board", imageKey:506}, + + //Fish + {imageNames:["001_char_img_fish_010.png", "001_char_img_fish_020.png"], category:"fish", imageKey:600}, + {imageNames:["001_char_img_fish_030.png", "001_char_img_fish_040.png"], category:"fish", imageKey:601}, + {imageNames:["001_char_img_fish_050.png", "001_char_img_fish_060.png"], category:"fish", imageKey:602}, + {imageNames:["shell.png"], category:"fish", imageKey:603}, + + //Instrument + {imageNames:["001_char_img_inst_010.png", "001_char_img_inst_020.png"], category:"instrument", imageKey:700}, + {imageNames:["001_char_img_inst_030.png", "001_char_img_inst_040.png"], category:"instrument", imageKey:701}, + {imageNames:["001_char_img_inst_050.png", "001_char_img_inst_060.png"], category:"instrument", imageKey:702}, + {imageNames:["music_note.png"], category:"instrument", imageKey:703}, ]; function loadSpriteImages(sprts, didLoadImages){ @@ -23,24 +77,27 @@ define(["utility"], function(utility){ return sprite.imageKey == spImgInf.imageKey; }); - if (!spriteImageInfo || spriteImageInfo.images) { - continue; - }; + // if (!spriteImageInfo || spriteImageInfo.images) { + // continue; + // }; isLoading = true; spriteImageInfo.images = []; - loadingCount++; - var lc = 0; + sprite.images = spriteImageInfo.images; + loadingCount += spriteImageInfo.imageNames.length; + // var lc = 0; _.each(spriteImageInfo.imageNames, function(imageName){ - var path = "image/sprite/" + spriteImageInfo.category + "/" + imageName; + //var path = "image/sprite/" + spriteImageInfo.category + "/" + imageName; + var path = "/img/pictcode/sprite/" + spriteImageInfo.category + "/" + imageName; var spImage = new Image(); spImage.src = path; spriteImageInfo.images.push(spImage); spImage.onload = function(){ - lc++; - if (lc >= spriteImageInfo.imageNames.length) { - loadingCount--; - }; + // lc++; + // if (lc >= spriteImageInfo.imageNames.length) { + // loadingCount--; + // }; + loadingCount--; if (loadingCount <= 0) { didLoadImages(); }; @@ -60,7 +117,8 @@ define(["utility"], function(utility){ if (!spriteImageInfo.images) { spriteImageInfo.images = []; _.each(spriteImageInfo.imageNames, function(imageName){ - var path = "image/sprite/" + spriteImageInfo.category + "/" + imageName; + //var path = "image/sprite/" + spriteImageInfo.category + "/" + imageName; + var path = "/img/pictcode/sprite/" + spriteImageInfo.category + "/" + imageName; var spImage = new Image(); spImage.src = path; spImage.width = initSize/2; @@ -98,11 +156,14 @@ define(["utility"], function(utility){ //----------------カテゴリ画像----------------// var categoryInfos =[ - {name: "vehicle", imageKey: "ctgry_spr_004"}, + {name: "car", imageKey: "ctgry_spr_004"}, + {name: "airplane", imageKey: "ctgry_spr_006"}, {name: "animal", imageKey: "ctgry_spr_001"}, + {name: "fish", imageKey: "ctgry_spr_008"}, {name: "background", imageKey: "ctgry_spr_003"}, + {name: "instrument", imageKey: "ctgry_spr_007"}, {name: "artifact", imageKey: "ctgry_spr_002"}, - {name: "forest", imageKey: "ctgry_spr_005"}, + {name: "board", imageKey: "ctgry_spr_005"}, ]; return { @@ -112,4 +173,4 @@ define(["utility"], function(utility){ findSpriteImageInfoFromImageKey:findSpriteImageInfoFromImageKey, categoryInfos:categoryInfos, }; -}); \ No newline at end of file +}); diff --git a/app/webroot/js/pictcode/sprite_drawer.js b/app/webroot/js/pictcode/sprite_drawer.js index 4e33025..1a8de02 100644 --- a/app/webroot/js/pictcode/sprite_drawer.js +++ b/app/webroot/js/pictcode/sprite_drawer.js @@ -45,6 +45,9 @@ define(["image_manager"], function(imageManager){ //スプライト描画 var targetSprite = null; _.each( sprites, function(sprite){ + if(sprite.type == "ghost"){ + return; + }; var edSpriteSize = getSpriteSize(sprite); var edSpriteLeftTop = {x:sprite.position.x-edSpriteSize.width/2, y:sprite.position.y+edSpriteSize.height/2}; var cvSpriteLeftTop; @@ -58,8 +61,7 @@ define(["image_manager"], function(imageManager){ sprite.drawnRect = {x:cvSpriteLeftTop.x, y:cvSpriteLeftTop.y, width:cvSpriteSize.width, height:cvSpriteSize.height}; - // canvasContext.scale(-1,1); - + //スプライトの回転、描画 canvasContext.save(); canvasContext.translate(cvSpriteCenter.x, cvSpriteCenter.y); canvasContext.rotate(sprite.angle); @@ -67,9 +69,23 @@ define(["image_manager"], function(imageManager){ canvasContext.transform(-1, 0, 0, 1, 0, 0); }; canvasContext.translate(-cvSpriteCenter.x, -cvSpriteCenter.y); - canvasContext.drawImage(sprite.images[sprite.animationCount], sprite.drawnRect.x, sprite.drawnRect.y, sprite.drawnRect.width, sprite.drawnRect.height); + canvasContext.globalAlpha = sprite.opacity; + if (sprite.images) { + canvasContext.drawImage(sprite.images[sprite.animationCount], sprite.drawnRect.x, sprite.drawnRect.y, sprite.drawnRect.width, sprite.drawnRect.height); + }; canvasContext.restore(); + if (sprite.text || sprite.text == 0) { + var textSize = Math.round(cvSpriteSize.width*0.25); + canvasContext.save(); + canvasContext.font = "bold "+ textSize + "px " + "sans-serif"; + canvasContext.fillStyle = "black"; + canvasContext.textAlign = "center"; + canvasContext.textBaseline = "middle"; + canvasContext.fillText(sprite.text, cvSpriteCenter.x, cvSpriteCenter.y+cvSpriteSize.height*0.05); + canvasContext.restore(); + }; + if (sprite.isTarget && canvas.isUI) { targetSprite = sprite; //十字線の描画 @@ -103,7 +119,7 @@ define(["image_manager"], function(imageManager){ (edOuterSize.height-edInnerSize.height)/2*ceRatio, canvas.width*edInnerSize.width/edOuterSize.width, canvas.height*edInnerSize.height/edOuterSize.height - ); + ); } canvasContext.restore(); @@ -149,6 +165,7 @@ define(["image_manager"], function(imageManager){ } function getPositionInfo(sprites, x, y){ + var isOnSprite = false; var targetSprite; @@ -157,7 +174,8 @@ define(["image_manager"], function(imageManager){ } for (var i=sprites.length-1; i>=0; i--){ - sprite = sprites[i]; + var sprite = sprites[i]; + if (sprite.type == "ghost") {continue;}; if (sprite.drawnRect.xx && sprite.drawnRect.yy) { isOnSprite = true; targetSprite = sprite; diff --git a/app/webroot/js/pictcode/sprite_list.js b/app/webroot/js/pictcode/sprite_list.js index 22bc2eb..91866aa 100644 --- a/app/webroot/js/pictcode/sprite_list.js +++ b/app/webroot/js/pictcode/sprite_list.js @@ -27,11 +27,12 @@ define(["jquery.touch-punch", "image_manager"],function(jqueryUITouchPunch, imag cell.addEventListener('touchstart', didSelectSprite); cell.addEventListener('mousedown', didSelectSprite); $('#list_table')[0].appendChild(cell); - var cellHeight = cell.clientHeight; + // var cellHeight = cell.clientHeight; + var imageHeight = 40; var image = sprite.images[0]; image = image.cloneNode(false); - image.width = cellHeight/(sprite.aspectRatio + 1)*1.8; - image.height = cellHeight*sprite.aspectRatio/(sprite.aspectRatio + 1)*1.8; + image.width = imageHeight/(sprite.aspectRatio + 1)*1.8; + image.height = imageHeight*sprite.aspectRatio/(sprite.aspectRatio + 1)*1.8; image.style.marginTop = "4px"; cell.appendChild(image); } diff --git a/app/webroot/js/pictcode/sprite_manager.js b/app/webroot/js/pictcode/sprite_manager.js index b04b53c..9857861 100644 --- a/app/webroot/js/pictcode/sprite_manager.js +++ b/app/webroot/js/pictcode/sprite_manager.js @@ -18,7 +18,9 @@ define(["utility"], function(utility){ var initialScale; function initialize(sprts){ - sprites.concat(sprts); + _.each(sprts, function(spr){ + sprites.push(spr); + }) } function createNewSprite(spriteImageInfo, didCreateSprite, editorSize){ @@ -35,6 +37,7 @@ define(["utility"], function(utility){ //新規スプライト var newSprite = { images:spriteImageInfo.images, + imageKey:spriteImageInfo.imageKey, type:spriteType, position:{x:0, y:0}, aspectRatio:aspectRatio, @@ -49,7 +52,7 @@ define(["utility"], function(utility){ startFuncIdx:null, collision:[{tag:1, funcIdx:null}, {tag:2, funcIdx:null}, {tag:3, funcIdx:null}], }; - newSprite.id = findUnusedSpriteId(); + newSprite.id = findUnusedSpriteId(sprites); if (spriteType == "sprite") { newSprite.position.x += 10*spriteAddCount; newSprite.position.y -= 10*spriteAddCount; @@ -61,13 +64,13 @@ define(["utility"], function(utility){ didCreateSprite(newSprite); } - function findUnusedSpriteId(){ + function findUnusedSpriteId(targetSprites){ var unusedId = 0; var notFound = true; while(notFound){ var isUsed = false; - for (var i = 0; i < sprites.length; i++) { - sprite = sprites[i]; + for (var i = 0; i < targetSprites.length; i++) { + sprite = targetSprites[i]; if (sprite.id == unusedId) { isUsed = true; break; @@ -131,12 +134,14 @@ define(["utility"], function(utility){ drawSprites(); } - function copySprite(sprite){ + function copySprite(sprite, targetArray, isUI){ var copiedSprite = $.extend(true, {}, sprite); - copiedSprite.position.x += 10; - copiedSprite.position.y -= 10; - copiedSprite.id = findUnusedSpriteId(); - sprites.push(copiedSprite); + if (isUI) { + copiedSprite.position.x += 10; + copiedSprite.position.y -= 10; + }; + copiedSprite.id = findUnusedSpriteId(targetArray); + targetArray.push(copiedSprite); return copiedSprite; } diff --git a/app/webroot/js/pictcode/tag_selector.js b/app/webroot/js/pictcode/tag_selector.js index 3865ce0..d6f80f3 100644 --- a/app/webroot/js/pictcode/tag_selector.js +++ b/app/webroot/js/pictcode/tag_selector.js @@ -5,15 +5,11 @@ define(["modal_manager", "utility"], function(modalManager, utility){ var container; var colors = ["#1e90ff", "#ff4500", "#008b8b", "#ffa500", "#a52a2a", "#20b2aa", "#483d8b", "#0000ff", "#ff1493", "#808000"]; - function initialize(mdl, cntnr, didSlctTg){ + function showTagsWithModal(mdl, cntnr, didSlctTg){ modal = mdl; container = cntnr; container.html(""); didSelectTag = didSlctTg; - } - - function showTagsWithModal(){ - container.html(""); for (var i = 0; i <= 9; i++) { var button = makeTagElement(i, "button", 50); container[0].appendChild(button); @@ -52,8 +48,8 @@ define(["modal_manager", "utility"], function(modalManager, utility){ }); return { - initialize:initialize, showTagsWithModal:showTagsWithModal, makeTagElement:makeTagElement, + tagColors:colors, }; }); \ No newline at end of file diff --git a/app/webroot/js/pictcode/ui_manager.js b/app/webroot/js/pictcode/ui_manager.js index 406f7e1..19b7256 100644 --- a/app/webroot/js/pictcode/ui_manager.js +++ b/app/webroot/js/pictcode/ui_manager.js @@ -30,7 +30,6 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', //各モジュールの初期化 spriteManager.initialize(loadedSprites); spriteSelector.initialize(didSelectSprite); - spriteList.initialize(spriteManager.sprites, drawSprites, setTargetSprite); //キャンバスのタップ操作の検出 function touchStart(canvasX, canvasY){ @@ -61,7 +60,8 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', var editorWidth = document.documentElement.clientWidth * 0.8; var headerHeight = $('#header')[0].clientHeight; var footerHeight = $('#footer')[0].clientHeight; - var editorHeight = document.documentElement.clientHeight - headerHeight - footerHeight-20; + // var editorHeight = document.documentElement.clientHeight - headerHeight - footerHeight-20; + var editorHeight = window.innerHeight - headerHeight - footerHeight-20; var canvasSize = canvasManager.getCanvasSize(editorWidth, editorHeight); canvas = canvasManager.initializeCanvas(canvasSize.width, canvasSize.height, touchStart, touchMove, touchEnd); canvas.isUI = true; @@ -72,12 +72,6 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', var cvBgImg = imageManager.images.bg_grid_001; canvas.canvasBackgroundImage = cvBgImg; - //Sprite画像読み込み - spriteData.loadSpriteImages(spriteManager.sprites, didLoadSpriteImages); - function didLoadSpriteImages(){ - drawSprites(); - } - //Modalの設定 var modalSize = document.documentElement.clientHeight * 0.6; $("#modal_ui_sprite").css({width:modalSize, height:modalSize, top:-modalSize}); @@ -86,9 +80,15 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', $("#modal_ui_collision").css({width:modalSize, height:modalSize, bottom:0, display:"none"}); //セレクターの設定 - tagSelector.initialize($("#modal_ui_tag"), $("#modal_ui_tag_container"), didSeletTag); functionSelector.initialize(getFunctions); collisionSelector.initialize($("#modal_ui_collision"), $("#modal_ui_collision_container"), didSelectCollision, getFunctions, functionSelector.makeFunctionNodeWithIndex); + + //Sprite画像読み込み + spriteData.loadSpriteImages(spriteManager.sprites, didLoadSpriteImages); + function didLoadSpriteImages(){ + spriteList.initialize(spriteManager.sprites, drawSprites, setTargetSprite); + drawSprites(); + } } function didSwitchToUITab(){ @@ -131,12 +131,12 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', $("#sprite_tag_setting")[0].appendChild(tagNode); var funcNodeSize = 30; - if (targetSprite.tapFuncIdx) { + if (targetSprite.tapFuncIdx || targetSprite.tapFuncIdx === 0) { var funckNode = functionSelector.makeFunctionNodeWithIndex(targetSprite.tapFuncIdx, funcNodeSize); $("#tap_function_setting")[0].appendChild(funckNode); }; - if (targetSprite.startFuncIdx) { + if (targetSprite.startFuncIdx || targetSprite.startFuncIdx === 0) { var funckNode = functionSelector.makeFunctionNodeWithIndex(targetSprite.startFuncIdx, funcNodeSize); $("#start_function_setting")[0].appendChild(funckNode); }; @@ -194,7 +194,7 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', $(document).on("click","#copy_sprite", function(event) { if (!targetSprite) {return}; - var copiedSprite = spriteManager.copySprite(targetSprite); + var copiedSprite = spriteManager.copySprite(targetSprite, spriteManager.sprites, true); spriteList.addSpriteToList(copiedSprite); setTargetSprite(copiedSprite); drawSprites(); @@ -252,17 +252,17 @@ define(['sprite_selector', 'canvas_manager', 'sprite_manager', 'sprite_drawer', } $(document).on("click","#sprite_tag_setting", function(event) { - tagSelector.showTagsWithModal(); + tagSelector.showTagsWithModal($("#modal_ui_tag"), $("#modal_ui_tag_container"), didSeletTag); }); $(document).on("click","#tap_function_setting", function(event) { trigger = TRIGGER.TAP; - functionSelector.show($("#modal_ui_function"), $("#modal_ui_function_container"), didSelectFunction); + functionSelector.show($("#modal_ui_function"), $("#modal_ui_function_container"), didSelectFunction, true); }); $(document).on("click","#start_function_setting", function(event) { trigger = TRIGGER.APPSTART; - functionSelector.show($("#modal_ui_function"), $("#modal_ui_function_container"), didSelectFunction); + functionSelector.show($("#modal_ui_function"), $("#modal_ui_function_container"), didSelectFunction, true); }); $(document).on("click","#sprite_collision_setting", function(event) { diff --git a/app/webroot/js/pictcode/utility.js b/app/webroot/js/pictcode/utility.js index 6897d6b..35b28e4 100644 --- a/app/webroot/js/pictcode/utility.js +++ b/app/webroot/js/pictcode/utility.js @@ -1,9 +1,16 @@ define(function(){ - var alphabets = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]; + var largeAlphabets = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]; + var smallAlphabets = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]; - function numberToAlphabet(number){ - return alphabets[number]; + function numberToLargeAlphabet(number){ + if (number >= largeAlphabets.length) {return null;}; + return largeAlphabets[number]; + } + + function numberToSmallAlphabet(number){ + if (number >= smallAlphabets.length) {return null;}; + return smallAlphabets[number]; } function getImageNaturalSize(image) { @@ -44,7 +51,8 @@ define(function(){ } return { - numberToAlphabet:numberToAlphabet, + numberToLargeAlphabet:numberToLargeAlphabet, + numberToSmallAlphabet:numberToSmallAlphabet, getImageNaturalSize:getImageNaturalSize, bringArrayElementToLast:bringArrayElementToLast, }; diff --git a/app/webroot/sound/bgm/BOSSA1.wav b/app/webroot/sound/bgm/BOSSA1.wav new file mode 100644 index 0000000..7c73cd0 Binary files /dev/null and b/app/webroot/sound/bgm/BOSSA1.wav differ diff --git a/app/webroot/sound/bgm/FANTASY1.wav b/app/webroot/sound/bgm/FANTASY1.wav new file mode 100644 index 0000000..18f4ae3 Binary files /dev/null and b/app/webroot/sound/bgm/FANTASY1.wav differ diff --git a/app/webroot/sound/bgm/FANTASY2.wav b/app/webroot/sound/bgm/FANTASY2.wav new file mode 100644 index 0000000..b9cef4f Binary files /dev/null and b/app/webroot/sound/bgm/FANTASY2.wav differ diff --git a/app/webroot/sound/bgm/FANTASY3.wav b/app/webroot/sound/bgm/FANTASY3.wav new file mode 100644 index 0000000..45b8b35 Binary files /dev/null and b/app/webroot/sound/bgm/FANTASY3.wav differ diff --git a/app/webroot/sound/bgm/FANTASY4.wav b/app/webroot/sound/bgm/FANTASY4.wav new file mode 100644 index 0000000..e98ff19 Binary files /dev/null and b/app/webroot/sound/bgm/FANTASY4.wav differ diff --git a/app/webroot/sound/bgm/ORCHESTRA1.wav b/app/webroot/sound/bgm/ORCHESTRA1.wav new file mode 100644 index 0000000..bc79b42 Binary files /dev/null and b/app/webroot/sound/bgm/ORCHESTRA1.wav differ diff --git a/app/webroot/sound/bgm/POP1.wav b/app/webroot/sound/bgm/POP1.wav new file mode 100644 index 0000000..e11194e Binary files /dev/null and b/app/webroot/sound/bgm/POP1.wav differ diff --git a/app/webroot/sound/bgm/POP2.wav b/app/webroot/sound/bgm/POP2.wav new file mode 100644 index 0000000..1652190 Binary files /dev/null and b/app/webroot/sound/bgm/POP2.wav differ diff --git a/app/webroot/sound/bgm/POP3.wav b/app/webroot/sound/bgm/POP3.wav new file mode 100644 index 0000000..c8715fc Binary files /dev/null and b/app/webroot/sound/bgm/POP3.wav differ diff --git a/app/webroot/sound/bgm/POP4.wav b/app/webroot/sound/bgm/POP4.wav new file mode 100644 index 0000000..1221db1 Binary files /dev/null and b/app/webroot/sound/bgm/POP4.wav differ diff --git a/app/webroot/sound/bgm/ROCK1.wav b/app/webroot/sound/bgm/ROCK1.wav new file mode 100644 index 0000000..ab2a802 Binary files /dev/null and b/app/webroot/sound/bgm/ROCK1.wav differ diff --git a/app/webroot/sound/bgm/ROCK2.wav b/app/webroot/sound/bgm/ROCK2.wav new file mode 100644 index 0000000..f540b9f Binary files /dev/null and b/app/webroot/sound/bgm/ROCK2.wav differ diff --git a/app/webroot/sound/bgm/ROCK3.wav b/app/webroot/sound/bgm/ROCK3.wav new file mode 100644 index 0000000..33a52ff Binary files /dev/null and b/app/webroot/sound/bgm/ROCK3.wav differ diff --git a/app/webroot/sound/se/ACTION1.mp3 b/app/webroot/sound/se/ACTION1.mp3 new file mode 100644 index 0000000..f0fdaa2 Binary files /dev/null and b/app/webroot/sound/se/ACTION1.mp3 differ diff --git a/app/webroot/sound/se/ACTION10.mp3 b/app/webroot/sound/se/ACTION10.mp3 new file mode 100644 index 0000000..07f5598 Binary files /dev/null and b/app/webroot/sound/se/ACTION10.mp3 differ diff --git a/app/webroot/sound/se/ACTION2.mp3 b/app/webroot/sound/se/ACTION2.mp3 new file mode 100644 index 0000000..2edb946 Binary files /dev/null and b/app/webroot/sound/se/ACTION2.mp3 differ diff --git a/app/webroot/sound/se/ACTION3.mp3 b/app/webroot/sound/se/ACTION3.mp3 new file mode 100644 index 0000000..754343c Binary files /dev/null and b/app/webroot/sound/se/ACTION3.mp3 differ diff --git a/app/webroot/sound/se/ACTION4.mp3 b/app/webroot/sound/se/ACTION4.mp3 new file mode 100644 index 0000000..f31616c Binary files /dev/null and b/app/webroot/sound/se/ACTION4.mp3 differ diff --git a/app/webroot/sound/se/ACTION5.mp3 b/app/webroot/sound/se/ACTION5.mp3 new file mode 100644 index 0000000..2a58d39 Binary files /dev/null and b/app/webroot/sound/se/ACTION5.mp3 differ diff --git a/app/webroot/sound/se/ACTION6.mp3 b/app/webroot/sound/se/ACTION6.mp3 new file mode 100644 index 0000000..62cfcb8 Binary files /dev/null and b/app/webroot/sound/se/ACTION6.mp3 differ diff --git a/app/webroot/sound/se/ACTION7.mp3 b/app/webroot/sound/se/ACTION7.mp3 new file mode 100644 index 0000000..69a93c1 Binary files /dev/null and b/app/webroot/sound/se/ACTION7.mp3 differ diff --git a/app/webroot/sound/se/ACTION8.mp3 b/app/webroot/sound/se/ACTION8.mp3 new file mode 100644 index 0000000..78887bd Binary files /dev/null and b/app/webroot/sound/se/ACTION8.mp3 differ diff --git a/app/webroot/sound/se/ACTION9.mp3 b/app/webroot/sound/se/ACTION9.mp3 new file mode 100644 index 0000000..ca5c55f Binary files /dev/null and b/app/webroot/sound/se/ACTION9.mp3 differ diff --git a/app/webroot/sound/se/AIRPLANE1.mp3 b/app/webroot/sound/se/AIRPLANE1.mp3 new file mode 100644 index 0000000..28cffbe Binary files /dev/null and b/app/webroot/sound/se/AIRPLANE1.mp3 differ diff --git a/app/webroot/sound/se/AIRPLANE2.mp3 b/app/webroot/sound/se/AIRPLANE2.mp3 new file mode 100644 index 0000000..2906ad3 Binary files /dev/null and b/app/webroot/sound/se/AIRPLANE2.mp3 differ diff --git a/app/webroot/sound/se/ALERT1.mp3 b/app/webroot/sound/se/ALERT1.mp3 new file mode 100644 index 0000000..6a2fb36 Binary files /dev/null and b/app/webroot/sound/se/ALERT1.mp3 differ diff --git a/app/webroot/sound/se/ALERT2.mp3 b/app/webroot/sound/se/ALERT2.mp3 new file mode 100644 index 0000000..2485e07 Binary files /dev/null and b/app/webroot/sound/se/ALERT2.mp3 differ diff --git a/app/webroot/sound/se/ALERT3.mp3 b/app/webroot/sound/se/ALERT3.mp3 new file mode 100644 index 0000000..f997c49 Binary files /dev/null and b/app/webroot/sound/se/ALERT3.mp3 differ diff --git a/app/webroot/sound/se/ALERT4.mp3 b/app/webroot/sound/se/ALERT4.mp3 new file mode 100644 index 0000000..410c6d9 Binary files /dev/null and b/app/webroot/sound/se/ALERT4.mp3 differ diff --git a/app/webroot/sound/se/ALERT5.mp3 b/app/webroot/sound/se/ALERT5.mp3 new file mode 100644 index 0000000..ff3dce5 Binary files /dev/null and b/app/webroot/sound/se/ALERT5.mp3 differ diff --git a/app/webroot/sound/se/ATTACK1.mp3 b/app/webroot/sound/se/ATTACK1.mp3 new file mode 100644 index 0000000..7a5101b Binary files /dev/null and b/app/webroot/sound/se/ATTACK1.mp3 differ diff --git a/app/webroot/sound/se/ATTACK10.mp3 b/app/webroot/sound/se/ATTACK10.mp3 new file mode 100644 index 0000000..2a6f84f Binary files /dev/null and b/app/webroot/sound/se/ATTACK10.mp3 differ diff --git a/app/webroot/sound/se/ATTACK11.mp3 b/app/webroot/sound/se/ATTACK11.mp3 new file mode 100644 index 0000000..d519245 Binary files /dev/null and b/app/webroot/sound/se/ATTACK11.mp3 differ diff --git a/app/webroot/sound/se/ATTACK12.mp3 b/app/webroot/sound/se/ATTACK12.mp3 new file mode 100644 index 0000000..a9cec39 Binary files /dev/null and b/app/webroot/sound/se/ATTACK12.mp3 differ diff --git a/app/webroot/sound/se/ATTACK13.mp3 b/app/webroot/sound/se/ATTACK13.mp3 new file mode 100644 index 0000000..63d4ef2 Binary files /dev/null and b/app/webroot/sound/se/ATTACK13.mp3 differ diff --git a/app/webroot/sound/se/ATTACK14.mp3 b/app/webroot/sound/se/ATTACK14.mp3 new file mode 100644 index 0000000..b6836c7 Binary files /dev/null and b/app/webroot/sound/se/ATTACK14.mp3 differ diff --git a/app/webroot/sound/se/ATTACK2.mp3 b/app/webroot/sound/se/ATTACK2.mp3 new file mode 100644 index 0000000..56c87e5 Binary files /dev/null and b/app/webroot/sound/se/ATTACK2.mp3 differ diff --git a/app/webroot/sound/se/ATTACK3.mp3 b/app/webroot/sound/se/ATTACK3.mp3 new file mode 100644 index 0000000..47dac99 Binary files /dev/null and b/app/webroot/sound/se/ATTACK3.mp3 differ diff --git a/app/webroot/sound/se/ATTACK4.mp3 b/app/webroot/sound/se/ATTACK4.mp3 new file mode 100644 index 0000000..470c4cb Binary files /dev/null and b/app/webroot/sound/se/ATTACK4.mp3 differ diff --git a/app/webroot/sound/se/ATTACK5.mp3 b/app/webroot/sound/se/ATTACK5.mp3 new file mode 100644 index 0000000..67d3e48 Binary files /dev/null and b/app/webroot/sound/se/ATTACK5.mp3 differ diff --git a/app/webroot/sound/se/ATTACK6.mp3 b/app/webroot/sound/se/ATTACK6.mp3 new file mode 100644 index 0000000..73664b9 Binary files /dev/null and b/app/webroot/sound/se/ATTACK6.mp3 differ diff --git a/app/webroot/sound/se/ATTACK7.mp3 b/app/webroot/sound/se/ATTACK7.mp3 new file mode 100644 index 0000000..595062e Binary files /dev/null and b/app/webroot/sound/se/ATTACK7.mp3 differ diff --git a/app/webroot/sound/se/ATTACK8.mp3 b/app/webroot/sound/se/ATTACK8.mp3 new file mode 100644 index 0000000..77a1c25 Binary files /dev/null and b/app/webroot/sound/se/ATTACK8.mp3 differ diff --git a/app/webroot/sound/se/ATTACK9.mp3 b/app/webroot/sound/se/ATTACK9.mp3 new file mode 100644 index 0000000..9b75487 Binary files /dev/null and b/app/webroot/sound/se/ATTACK9.mp3 differ diff --git a/app/webroot/sound/se/BOAT1.mp3 b/app/webroot/sound/se/BOAT1.mp3 new file mode 100644 index 0000000..8c1bb43 Binary files /dev/null and b/app/webroot/sound/se/BOAT1.mp3 differ diff --git a/app/webroot/sound/se/BOAT2.mp3 b/app/webroot/sound/se/BOAT2.mp3 new file mode 100644 index 0000000..f54dfa3 Binary files /dev/null and b/app/webroot/sound/se/BOAT2.mp3 differ diff --git a/app/webroot/sound/se/BUS1.mp3 b/app/webroot/sound/se/BUS1.mp3 new file mode 100644 index 0000000..fed0e5f Binary files /dev/null and b/app/webroot/sound/se/BUS1.mp3 differ diff --git a/app/webroot/sound/se/BYCICLE1.mp3 b/app/webroot/sound/se/BYCICLE1.mp3 new file mode 100644 index 0000000..dcf05c2 Binary files /dev/null and b/app/webroot/sound/se/BYCICLE1.mp3 differ diff --git a/app/webroot/sound/se/BYCICLE2.mp3 b/app/webroot/sound/se/BYCICLE2.mp3 new file mode 100644 index 0000000..a850fb1 Binary files /dev/null and b/app/webroot/sound/se/BYCICLE2.mp3 differ diff --git a/app/webroot/sound/se/CAR1.mp3 b/app/webroot/sound/se/CAR1.mp3 new file mode 100644 index 0000000..19bd596 Binary files /dev/null and b/app/webroot/sound/se/CAR1.mp3 differ diff --git a/app/webroot/sound/se/CAR2.mp3 b/app/webroot/sound/se/CAR2.mp3 new file mode 100644 index 0000000..0a80923 Binary files /dev/null and b/app/webroot/sound/se/CAR2.mp3 differ diff --git a/app/webroot/sound/se/CAR3.mp3 b/app/webroot/sound/se/CAR3.mp3 new file mode 100644 index 0000000..8cf6def Binary files /dev/null and b/app/webroot/sound/se/CAR3.mp3 differ diff --git a/app/webroot/sound/se/CAR4.mp3 b/app/webroot/sound/se/CAR4.mp3 new file mode 100644 index 0000000..9823db3 Binary files /dev/null and b/app/webroot/sound/se/CAR4.mp3 differ diff --git a/app/webroot/sound/se/CAR5.mp3 b/app/webroot/sound/se/CAR5.mp3 new file mode 100644 index 0000000..90308a8 Binary files /dev/null and b/app/webroot/sound/se/CAR5.mp3 differ diff --git a/app/webroot/sound/se/CAR6.mp3 b/app/webroot/sound/se/CAR6.mp3 new file mode 100644 index 0000000..23d7127 Binary files /dev/null and b/app/webroot/sound/se/CAR6.mp3 differ diff --git a/app/webroot/sound/se/CAT1.mp3 b/app/webroot/sound/se/CAT1.mp3 new file mode 100644 index 0000000..6b31379 Binary files /dev/null and b/app/webroot/sound/se/CAT1.mp3 differ diff --git a/app/webroot/sound/se/CAT2.mp3 b/app/webroot/sound/se/CAT2.mp3 new file mode 100644 index 0000000..b503479 Binary files /dev/null and b/app/webroot/sound/se/CAT2.mp3 differ diff --git a/app/webroot/sound/se/CAT3.mp3 b/app/webroot/sound/se/CAT3.mp3 new file mode 100644 index 0000000..5c7a5db Binary files /dev/null and b/app/webroot/sound/se/CAT3.mp3 differ diff --git a/app/webroot/sound/se/CHEER1.mp3 b/app/webroot/sound/se/CHEER1.mp3 new file mode 100644 index 0000000..937412d Binary files /dev/null and b/app/webroot/sound/se/CHEER1.mp3 differ diff --git a/app/webroot/sound/se/CHEER2.mp3 b/app/webroot/sound/se/CHEER2.mp3 new file mode 100644 index 0000000..5965540 Binary files /dev/null and b/app/webroot/sound/se/CHEER2.mp3 differ diff --git a/app/webroot/sound/se/CHEER3.mp3 b/app/webroot/sound/se/CHEER3.mp3 new file mode 100644 index 0000000..1adb827 Binary files /dev/null and b/app/webroot/sound/se/CHEER3.mp3 differ diff --git a/app/webroot/sound/se/CHIME1.mp3 b/app/webroot/sound/se/CHIME1.mp3 new file mode 100644 index 0000000..2261f53 Binary files /dev/null and b/app/webroot/sound/se/CHIME1.mp3 differ diff --git a/app/webroot/sound/se/CHIME2.mp3 b/app/webroot/sound/se/CHIME2.mp3 new file mode 100644 index 0000000..5981a61 Binary files /dev/null and b/app/webroot/sound/se/CHIME2.mp3 differ diff --git a/app/webroot/sound/se/CHIME3.mp3 b/app/webroot/sound/se/CHIME3.mp3 new file mode 100644 index 0000000..f1c142c Binary files /dev/null and b/app/webroot/sound/se/CHIME3.mp3 differ diff --git a/app/webroot/sound/se/CHIME4.mp3 b/app/webroot/sound/se/CHIME4.mp3 new file mode 100644 index 0000000..7462a75 Binary files /dev/null and b/app/webroot/sound/se/CHIME4.mp3 differ diff --git a/app/webroot/sound/se/CHIME5.mp3 b/app/webroot/sound/se/CHIME5.mp3 new file mode 100644 index 0000000..e6ee1da Binary files /dev/null and b/app/webroot/sound/se/CHIME5.mp3 differ diff --git a/app/webroot/sound/se/CHIME6.mp3 b/app/webroot/sound/se/CHIME6.mp3 new file mode 100644 index 0000000..031c9ae Binary files /dev/null and b/app/webroot/sound/se/CHIME6.mp3 differ diff --git a/app/webroot/sound/se/CHIME7.mp3 b/app/webroot/sound/se/CHIME7.mp3 new file mode 100644 index 0000000..089e456 Binary files /dev/null and b/app/webroot/sound/se/CHIME7.mp3 differ diff --git a/app/webroot/sound/se/CHIME8.mp3 b/app/webroot/sound/se/CHIME8.mp3 new file mode 100644 index 0000000..82b5274 Binary files /dev/null and b/app/webroot/sound/se/CHIME8.mp3 differ diff --git a/app/webroot/sound/se/CORRECT1.mp3 b/app/webroot/sound/se/CORRECT1.mp3 new file mode 100644 index 0000000..3e30830 Binary files /dev/null and b/app/webroot/sound/se/CORRECT1.mp3 differ diff --git a/app/webroot/sound/se/DOG1.mp3 b/app/webroot/sound/se/DOG1.mp3 new file mode 100644 index 0000000..781bf90 Binary files /dev/null and b/app/webroot/sound/se/DOG1.mp3 differ diff --git a/app/webroot/sound/se/DOG2.mp3 b/app/webroot/sound/se/DOG2.mp3 new file mode 100644 index 0000000..14b68d7 Binary files /dev/null and b/app/webroot/sound/se/DOG2.mp3 differ diff --git a/app/webroot/sound/se/DRUM1.mp3 b/app/webroot/sound/se/DRUM1.mp3 new file mode 100644 index 0000000..c5b21ba Binary files /dev/null and b/app/webroot/sound/se/DRUM1.mp3 differ diff --git a/app/webroot/sound/se/DRUM2.mp3 b/app/webroot/sound/se/DRUM2.mp3 new file mode 100644 index 0000000..2195d35 Binary files /dev/null and b/app/webroot/sound/se/DRUM2.mp3 differ diff --git a/app/webroot/sound/se/DRUM3.mp3 b/app/webroot/sound/se/DRUM3.mp3 new file mode 100644 index 0000000..5d0a367 Binary files /dev/null and b/app/webroot/sound/se/DRUM3.mp3 differ diff --git a/app/webroot/sound/se/DRUM4.mp3 b/app/webroot/sound/se/DRUM4.mp3 new file mode 100644 index 0000000..b6ae556 Binary files /dev/null and b/app/webroot/sound/se/DRUM4.mp3 differ diff --git a/app/webroot/sound/se/FALLING1.mp3 b/app/webroot/sound/se/FALLING1.mp3 new file mode 100644 index 0000000..f27cbe0 Binary files /dev/null and b/app/webroot/sound/se/FALLING1.mp3 differ diff --git a/app/webroot/sound/se/FALLING2.mp3 b/app/webroot/sound/se/FALLING2.mp3 new file mode 100644 index 0000000..e0d2897 Binary files /dev/null and b/app/webroot/sound/se/FALLING2.mp3 differ diff --git a/app/webroot/sound/se/FALLING3.mp3 b/app/webroot/sound/se/FALLING3.mp3 new file mode 100644 index 0000000..bd44e2c Binary files /dev/null and b/app/webroot/sound/se/FALLING3.mp3 differ diff --git a/app/webroot/sound/se/FIRE1.mp3 b/app/webroot/sound/se/FIRE1.mp3 new file mode 100644 index 0000000..b94c3fe Binary files /dev/null and b/app/webroot/sound/se/FIRE1.mp3 differ diff --git a/app/webroot/sound/se/FIRE2.mp3 b/app/webroot/sound/se/FIRE2.mp3 new file mode 100644 index 0000000..cf53608 Binary files /dev/null and b/app/webroot/sound/se/FIRE2.mp3 differ diff --git a/app/webroot/sound/se/HORN1.mp3 b/app/webroot/sound/se/HORN1.mp3 new file mode 100644 index 0000000..1e2e568 Binary files /dev/null and b/app/webroot/sound/se/HORN1.mp3 differ diff --git a/app/webroot/sound/se/PIANO1.mp3 b/app/webroot/sound/se/PIANO1.mp3 new file mode 100644 index 0000000..d86a23e Binary files /dev/null and b/app/webroot/sound/se/PIANO1.mp3 differ diff --git a/app/webroot/sound/se/PIANO2.mp3 b/app/webroot/sound/se/PIANO2.mp3 new file mode 100644 index 0000000..25b2819 Binary files /dev/null and b/app/webroot/sound/se/PIANO2.mp3 differ diff --git a/app/webroot/sound/se/PIANO3.mp3 b/app/webroot/sound/se/PIANO3.mp3 new file mode 100644 index 0000000..5b386be Binary files /dev/null and b/app/webroot/sound/se/PIANO3.mp3 differ diff --git a/app/webroot/sound/se/PIANO4.mp3 b/app/webroot/sound/se/PIANO4.mp3 new file mode 100644 index 0000000..d1919b6 Binary files /dev/null and b/app/webroot/sound/se/PIANO4.mp3 differ diff --git a/app/webroot/sound/se/PIANO5.mp3 b/app/webroot/sound/se/PIANO5.mp3 new file mode 100644 index 0000000..ac0343d Binary files /dev/null and b/app/webroot/sound/se/PIANO5.mp3 differ diff --git a/app/webroot/sound/se/PIANO6.mp3 b/app/webroot/sound/se/PIANO6.mp3 new file mode 100644 index 0000000..0d9105b Binary files /dev/null and b/app/webroot/sound/se/PIANO6.mp3 differ diff --git a/app/webroot/sound/se/PIANO7.mp3 b/app/webroot/sound/se/PIANO7.mp3 new file mode 100644 index 0000000..5d89827 Binary files /dev/null and b/app/webroot/sound/se/PIANO7.mp3 differ diff --git a/app/webroot/sound/se/PIANO8.mp3 b/app/webroot/sound/se/PIANO8.mp3 new file mode 100644 index 0000000..fdefc3e Binary files /dev/null and b/app/webroot/sound/se/PIANO8.mp3 differ diff --git a/app/webroot/sound/se/QUESTION1.mp3 b/app/webroot/sound/se/QUESTION1.mp3 new file mode 100644 index 0000000..9f1a710 Binary files /dev/null and b/app/webroot/sound/se/QUESTION1.mp3 differ diff --git a/app/webroot/sound/se/QUESTION2.mp3 b/app/webroot/sound/se/QUESTION2.mp3 new file mode 100644 index 0000000..2ed7efc Binary files /dev/null and b/app/webroot/sound/se/QUESTION2.mp3 differ diff --git a/app/webroot/sound/se/QUESTION3.mp3 b/app/webroot/sound/se/QUESTION3.mp3 new file mode 100644 index 0000000..9a559e6 Binary files /dev/null and b/app/webroot/sound/se/QUESTION3.mp3 differ diff --git a/app/webroot/sound/se/QUESTION4.mp3 b/app/webroot/sound/se/QUESTION4.mp3 new file mode 100644 index 0000000..dc69046 Binary files /dev/null and b/app/webroot/sound/se/QUESTION4.mp3 differ diff --git a/app/webroot/sound/se/SIREN1.mp3 b/app/webroot/sound/se/SIREN1.mp3 new file mode 100644 index 0000000..181eb3b Binary files /dev/null and b/app/webroot/sound/se/SIREN1.mp3 differ diff --git a/app/webroot/sound/se/START1.mp3 b/app/webroot/sound/se/START1.mp3 new file mode 100644 index 0000000..c44a5bc Binary files /dev/null and b/app/webroot/sound/se/START1.mp3 differ diff --git a/app/webroot/sound/se/START2.mp3 b/app/webroot/sound/se/START2.mp3 new file mode 100644 index 0000000..cc87e08 Binary files /dev/null and b/app/webroot/sound/se/START2.mp3 differ diff --git a/app/webroot/sound/se/SWING1.mp3 b/app/webroot/sound/se/SWING1.mp3 new file mode 100644 index 0000000..5e45b5c Binary files /dev/null and b/app/webroot/sound/se/SWING1.mp3 differ diff --git a/app/webroot/sound/se/SWING2.mp3 b/app/webroot/sound/se/SWING2.mp3 new file mode 100644 index 0000000..ce2e030 Binary files /dev/null and b/app/webroot/sound/se/SWING2.mp3 differ diff --git a/app/webroot/sound/se/SWING3.mp3 b/app/webroot/sound/se/SWING3.mp3 new file mode 100644 index 0000000..1c8f9aa Binary files /dev/null and b/app/webroot/sound/se/SWING3.mp3 differ diff --git a/app/webroot/sound/se/WATER1.mp3 b/app/webroot/sound/se/WATER1.mp3 new file mode 100644 index 0000000..f074cc2 Binary files /dev/null and b/app/webroot/sound/se/WATER1.mp3 differ