Merge remote-tracking branch 'github/master'
This commit is contained in:
		
						commit
						b2eda857b1
					
				| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
    "texts": [
 | 
					    "texts": [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro collected one more piece of sword!",
 | 
					            "content": "Hiro collected one more sword shard!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "loadSprite",
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Congrats! You can choose buff to gain from completing this level!",
 | 
					            "content": "Congrats! You can choose a buff to gain from completing this level!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,7 +44,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Press Z or space to jump, double-click to double-jump",
 | 
					            "content": "Press Z or space to jump, you can jump an extra time while in the air",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					@ -113,7 +113,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Use the number key to select buff.",
 | 
					            "content": "Use the number keys to select buffs.",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					@ -186,6 +186,25 @@
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            ]
 | 
					            ]
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            "speaker": "",
 | 
				
			||||||
 | 
					            "content": "Snakes can fall from the sky at any moment, and apply poison when they hit you.",
 | 
				
			||||||
 | 
					            "actions": [
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
 | 
					                    "key": "enemies",
 | 
				
			||||||
 | 
					                    "path": "shattered_sword_assets/images/forest_story1.png",
 | 
				
			||||||
 | 
					                    "positon": [
 | 
				
			||||||
 | 
					                        300,
 | 
				
			||||||
 | 
					                        150
 | 
				
			||||||
 | 
					                    ],
 | 
				
			||||||
 | 
					                    "scale": [
 | 
				
			||||||
 | 
					                        3,
 | 
				
			||||||
 | 
					                        3
 | 
				
			||||||
 | 
					                    ]
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Besides the enemies, watch out for the gaps.",
 | 
					            "content": "Besides the enemies, watch out for the gaps.",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
    "texts": [
 | 
					    "texts": [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro collected one more piece of sword!",
 | 
					            "content": "Hiro collected one more sword shard!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "loadSprite",
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Congrats! You can choose buff to gain from completing this level!",
 | 
					            "content": "Congrats! You can choose a buff to gain from completing this level!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
    "texts": [
 | 
					    "texts": [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro collected one more piece of sword!",
 | 
					            "content": "Hiro collected one more sword shard!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "loadSprite",
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Congrats! You can choose buff to gain from completing this level!",
 | 
					            "content": "Congrats! You can choose a buff to gain from completing this level!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "There're bulls and slimes in the great wall. Hint: the bull will dash when attack.",
 | 
					            "content": "There're bulls and slimes on the great wall. Hint: The bulls like to charge at you!.",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
    "texts": [
 | 
					    "texts": [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro collected one more piece of sword!",
 | 
					            "content": "Hiro collected one more sword piece!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "loadSprite",
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Congrats! You can choose buff to gain from completing this level!",
 | 
					            "content": "Congrats! You can choose a buff to gain from completing this level!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "We're now in a snow mountain. There're archers and slimes in the mountain.",
 | 
					            "content": "We're now in a snow mountain. There're archers and slimes on the mountain.",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
    "texts": [
 | 
					    "texts": [
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro collected one more piece of sword!",
 | 
					            "content": "Hiro collected one more sword piece!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "loadSprite",
 | 
					                    "type": "loadSprite",
 | 
				
			||||||
| 
						 | 
					@ -44,7 +44,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "You can choose buff to gain from completing this level!",
 | 
					            "content": "You can choose a buff to gain from completing this level!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hiro is now in a multi-level store. There're monsters and slimes in the store.",
 | 
					            "content": "Hiro is now in a multi-level store. There're monsters in the store.",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					@ -44,7 +44,7 @@
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "speaker": "",
 | 
					            "speaker": "",
 | 
				
			||||||
            "content": "Hint: the monster camouflaged into walls!",
 | 
					            "content": "Hint: The monsters camouflage into the walls and can teleport to you!",
 | 
				
			||||||
            "actions": [
 | 
					            "actions": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "type": "hideSprite",
 | 
					                    "type": "hideSprite",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,122 +1,144 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    "name" : "Assassin",
 | 
					   "name" : "Assassin",
 | 
				
			||||||
    "spriteSheetImage": "Assassin.png",
 | 
					   "spriteSheetImage": "Assassin.png",
 | 
				
			||||||
    "spriteWidth": 64,
 | 
					   "spriteWidth": 64,
 | 
				
			||||||
    "spriteHeight": 64,
 | 
					   "spriteHeight": 64,
 | 
				
			||||||
    "columns": 13,
 | 
					   "columns": 16,
 | 
				
			||||||
    "rows": 1,
 | 
					   "rows": 1,
 | 
				
			||||||
    "durationType": "time",
 | 
					   "durationType": "time",
 | 
				
			||||||
    "animations": [
 | 
					   "animations": [
 | 
				
			||||||
       {
 | 
					      {
 | 
				
			||||||
          "name": "IDLE",
 | 
					         "name": "IDLE",
 | 
				
			||||||
          "repeat": true,
 | 
					         "repeat": true,
 | 
				
			||||||
          "frames": [
 | 
					         "frames": [
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 0,
 | 
					               "index": 0,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 1,
 | 
					               "index": 1,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 2,
 | 
					               "index": 2,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 1,
 | 
					               "index": 1,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             }
 | 
					            }
 | 
				
			||||||
          ]
 | 
					         ]
 | 
				
			||||||
       },
 | 
					      },
 | 
				
			||||||
       {
 | 
					      {
 | 
				
			||||||
          "name": "CHARGE",
 | 
					         "name": "CHARGE",
 | 
				
			||||||
          "repeat": false,
 | 
					         "repeat": false,
 | 
				
			||||||
          "frames": [
 | 
					         "frames": [
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 3,
 | 
					               "index": 3,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 4,
 | 
					               "index": 4,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 5,
 | 
					               "index": 5,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             }
 | 
					            }
 | 
				
			||||||
          ]
 | 
					         ]
 | 
				
			||||||
       },
 | 
					      },
 | 
				
			||||||
       {
 | 
					      {
 | 
				
			||||||
          "name": "ATTACK",
 | 
					         "name": "ATTACK",
 | 
				
			||||||
          "repeat": false,
 | 
					         "repeat": false,
 | 
				
			||||||
          "frames": [
 | 
					         "frames": [
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 6,
 | 
					               "index": 6,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 7,
 | 
					               "index": 7,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 8,
 | 
					               "index": 8,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 9,
 | 
					               "index": 9,
 | 
				
			||||||
                "duration": 10
 | 
					               "duration": 10
 | 
				
			||||||
             }
 | 
					            }
 | 
				
			||||||
          ]
 | 
					         ]
 | 
				
			||||||
       },
 | 
					      },
 | 
				
			||||||
       {
 | 
					      {
 | 
				
			||||||
          "name": "HURT",
 | 
					         "name": "HURT",
 | 
				
			||||||
          "repeat": false,
 | 
					         "repeat": false,
 | 
				
			||||||
          "frames": [
 | 
					         "frames": [
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 10,
 | 
					               "index": 10,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 11,
 | 
					               "index": 11,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 10,
 | 
					               "index": 10,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 11,
 | 
					               "index": 11,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 10,
 | 
					               "index": 10,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 11,
 | 
					               "index": 11,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 10,
 | 
					               "index": 10,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             },
 | 
					            },
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 11,
 | 
					               "index": 11,
 | 
				
			||||||
                "duration": 5
 | 
					               "duration": 5
 | 
				
			||||||
             }
 | 
					            }
 | 
				
			||||||
          ]
 | 
					         ]
 | 
				
			||||||
       },
 | 
					      },
 | 
				
			||||||
       {
 | 
					      {
 | 
				
			||||||
          "name": "DEAD",
 | 
					         "name": "DEAD",
 | 
				
			||||||
          "repeat": true,
 | 
					         "repeat": true,
 | 
				
			||||||
          "frames": [
 | 
					         "frames": [
 | 
				
			||||||
             {
 | 
					            {
 | 
				
			||||||
                "index": 12,
 | 
					               "index": 12,
 | 
				
			||||||
                "duration": 20
 | 
					               "duration": 20
 | 
				
			||||||
             }
 | 
					            }
 | 
				
			||||||
          ]
 | 
					         ]
 | 
				
			||||||
       }
 | 
					      },
 | 
				
			||||||
 | 
					      {
 | 
				
			||||||
 | 
					         "name": "WALK",
 | 
				
			||||||
 | 
					         "repeat": true,
 | 
				
			||||||
 | 
					         "frames": [
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					               "index": 13,
 | 
				
			||||||
 | 
					               "duration": 15
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					               "index": 14,
 | 
				
			||||||
 | 
					               "duration": 15
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					               "index": 13,
 | 
				
			||||||
 | 
					               "duration": 15
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					               "index": 15,
 | 
				
			||||||
 | 
					               "duration": 15
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					         ]
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 8.1 KiB  | 
		Loading…
	
		Reference in New Issue
	
	Block a user