Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev

Gameton-06/Assets/Gameton/Resources/GameData/MonsterSkills.json

@@ -1,18 +1,16 @@
 [
   {
     "skillId": 0,
-    "skillName": "IceBlast",
-    "damage": 50,
-    "cooldown": 5,
-    "range": 5,
-    "prefabName": "IceBlast"
+    "skillName": null,
+    "damage": 0,
+    "cooldown": 0,
+    "range": 0
   },
   {
     "skillId": 1,
-    "skillName": "SmallFire",
-    "damage": 50,
-    "cooldown": 5,
-    "range": 5,
-    "prefabName": "smallFire"
+    "skillName": "DragonBreath",
+    "damage": 1.5,
+    "cooldown": 10,
+    "range": 5
   }
 ]

Gameton-06/Assets/Gameton/Resources/GameData/monster.json

@@ -1,47 +1,122 @@
 [
-  {
-    "id": 0,
-    "name": "blueDragon",
-    "level": 1,
-    "hp": 10,
-    "attackPower": 35,
-    "defencePower": 36,
-    "monsterSkillID": 0,
-    "monsterSkillIDTwo": 1,
-    "patrolRange": 1,
-    "detectionRange": 1,
-    "chaseRange": 1,
-    "moveSpeed": 1,
-    "attackRange": 1
-  },
   {
     "id": 1,
-    "name": "greenDragon",
+    "name": "PurplePumpkin",
     "level": 1,
-    "hp": 10,
-    "attackPower": 35,
-    "defencePower": 36,
+    "hp": 30,
+    "attackPower": 30,
+    "defencePower": 15,
     "monsterSkillID": 0,
-    "monsterSkillIDTwo": 1,
-    "patrolRange": 1,
-    "detectionRange": 1,
-    "chaseRange": 1,
-    "moveSpeed": 1,
-    "attackRange": 1
+    "Gold": 1,
+    "Exp": 2,
+    "Score": 10
   },
   {
     "id": 2,
-    "name": "redDragon",
-    "level": 1,
-    "hp": 10,
+    "name": "YellowPumpkin",
+    "level": 2,
+    "hp": 60,
     "attackPower": 35,
-    "defencePower": 36,
+    "defencePower": 20,
     "monsterSkillID": 0,
-    "monsterSkillIDTwo": 1,
-    "patrolRange": 1,
-    "detectionRange": 1,
-    "chaseRange": 1,
-    "moveSpeed": 1,
-    "attackRange": 1
+    "Gold": 1,
+    "Exp": 3,
+    "Score": 10
+  },
+  {
+    "id": 3,
+    "name": "GreenRex",
+    "level": 3,
+    "hp": 1200,
+    "attackPower": 70,
+    "defencePower": 40,
+    "monsterSkillID": 1,
+    "Gold": 15,
+    "Exp": 50,
+    "Score": 100
+  },
+  {
+    "id": 4,
+    "name": "GreenPumpkin",
+    "level": 4,
+    "hp": 175,
+    "attackPower": 43,
+    "defencePower": 25,
+    "monsterSkillID": 0,
+    "Gold": 2,
+    "Exp": 5,
+    "Score": 20
+  },
+  {
+    "id": 5,
+    "name": "RedOgre",
+    "level": 5,
+    "hp": 200,
+    "attackPower": 46,
+    "defencePower": 25,
+    "monsterSkillID": 0,
+    "Gold": 3,
+    "Exp": 7,
+    "Score": 20
+  },
+  {
+    "id": 6,
+    "name": "BlueRex",
+    "level": 6,
+    "hp": 5000,
+    "attackPower": 112,
+    "defencePower": 51,
+    "monsterSkillID": 1,
+    "Gold": 50,
+    "Exp": 150,
+    "Score": 200
+  },
+  {
+    "id": 7,
+    "name": "GreenOgre",
+    "level": 7,
+    "hp": 300,
+    "attackPower": 55,
+    "defencePower": 30,
+    "monsterSkillID": 0,
+    "Gold": 4,
+    "Exp": 8,
+    "Score": 40
+  },
+  {
+    "id": 8,
+    "name": "GreenTroll",
+    "level": 8,
+    "hp": 400,
+    "attackPower": 57,
+    "defencePower": 30,
+    "monsterSkillID": 0,
+    "Gold": 6,
+    "Exp": 10,
+    "Score": 50
+  },
+  {
+    "id": 9,
+    "name": "RedRex",
+    "level": 9,
+    "hp": 10000,
+    "attackPower": 65,
+    "defencePower": 35,
+    "monsterSkillID": 1,
+    "Gold": 125,
+    "Exp": 250,
+    "Score": 400
+  },
+  {
+    "id": 10,
+    "name": "RedDragon",
+    "level": 10,
+    "hp": 20000,
+    "attackPower": 180,
+    "defencePower": 130,
+    "monsterSkillID": 1,
+    "Gold": 300,
+    "Exp": 600,
+    "Score": 1000
   }
 ]