From 4d2e1f18e57640327b23c47108fa1781df62142b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E7=BF=94=E5=96=BB?= <402261094@mail.fju.edu.tw>
Date: Fri, 21 Oct 2016 01:19:07 +0800
Subject: [PATCH] Add enemy_Lv and enemy_id to the battle system

---
 Battle_LandingPage.js | 10 ++++++++--
 Battle_PetBox.js      |  6 ++++++
 MultiMap.js           | 14 +++++++++++++-
 NavMap.js             |  4 ++--
 battle.js             |  8 ++++++--
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/Battle_LandingPage.js b/Battle_LandingPage.js
index 378d7b6..7fe3129 100644
--- a/Battle_LandingPage.js
+++ b/Battle_LandingPage.js
@@ -18,6 +18,8 @@ var Battle_LandingPage = React.createClass({
       effect: "lightSpeedIn",
       Monster_Img: 'http://s33.postimg.org/em1erq3cv/image.png',
       enemy: '獨眼怪',
+      enemy_Lv: 0,
+      enemy_id: 0,
     }
   },
   componentWillMount(){
@@ -69,7 +71,9 @@ var Battle_LandingPage = React.createClass({
     //從這裡拿到NewMap拿過來的參數
      this.setState({
             Monster_Img: this.props.Monster_Img,
-            enemy: this.props.Monster_name
+            enemy: this.props.Monster_name,
+            enemy_Lv: this.props.Monster_Lv,
+            enemy_id: this.props.Monster_id,
         });
 
 
@@ -82,7 +86,9 @@ var Battle_LandingPage = React.createClass({
                 component: Battle_PetBox,
                 params: {
                     Monster_Img: this.state.Monster_Img,
-                    enemy: this.state.enemy
+                    enemy: this.state.enemy,
+                    enemy_Lv: this.state.enemy_Lv,
+                    enemy_id: this.state.enemy_id
                  }   
             })
         }
diff --git a/Battle_PetBox.js b/Battle_PetBox.js
index a2da851..3c7a869 100644
--- a/Battle_PetBox.js
+++ b/Battle_PetBox.js
@@ -135,6 +135,8 @@ var Battle_PetBox = React.createClass({
     return {
       Monster_Img: null,
       enemy: null,
+      enemy_Lv: null,
+      enemy_id: null,
       key_id: null,
       id: null,
       Lv: null,
@@ -160,6 +162,8 @@ var Battle_PetBox = React.createClass({
      this.setState({
             Monster_Img: this.props.Monster_Img,
             enemy: this.props.enemy,
+            enemy_Lv: this.props.enemy_Lv,
+            enemy_id: this.props.enemy_id,
             
         });
 
@@ -250,6 +254,8 @@ var Battle_PetBox = React.createClass({
                 params: {
                     Monster_Img: this.state.Monster_Img,
                     enemy: this.state.enemy,
+                    enemy_Lv: this.state.enemy_Lv,
+                    enemy_id: this.state.enemy_id,
                     Lv: this.state.Lv,
                     Hp: this.state.Hp,
                     Atk: this.state.Atk,
diff --git a/MultiMap.js b/MultiMap.js
index 5b69c1b..e54c69e 100644
--- a/MultiMap.js
+++ b/MultiMap.js
@@ -773,23 +773,33 @@ var MultiMap = React.createClass({
       let x = Math.floor(Math.random() * 4);//Math.random()值範圍0 ~ 0.99999
       let Img = '';
       let Name = '';
+      let Lv = 5;
+      let id = 0;
       console.log('x = '+x);
       switch(x){
-        case 1: 
+        case 1:
+          id = 10; 
           Name = '小煤礦';
           Img = 'https://s19.postimg.org/t2np4v277/006.png';
+          Lv = 10;
           break;
         case 2:
+          id = 1;
           Name = '小野菇';
           Img = 'https://s19.postimg.org/4r9ak28rn/500.png';
+          Lv = 20;
           break;  
         case 3:
+          id = 7;
           Name = '小葉麻糬';
           Img = 'https://s19.postimg.org/6x3lekc83/000.png';
+          Lv = 30;
           break;
         default:
+          id = 4;
           Name = '小魔眼';
           Img = 'https://s19.postimg.org/hpacl56g3/image.png';
+          Lv = 40;
           break;
     }
 
@@ -801,6 +811,8 @@ var MultiMap = React.createClass({
                 params: {
                     Monster_Img: Img,
                     Monster_name: Name,
+                    Monster_Lv: Lv,
+                    Monster_id: id,
                     getResult:(result) => {
                         this.setState({result: result})
                     }
diff --git a/NavMap.js b/NavMap.js
index ff10bcc..6394249 100644
--- a/NavMap.js
+++ b/NavMap.js
@@ -11,8 +11,8 @@ import MultiMap from './MultiMap';
 
 export default class NavMap extends React.Component {
     render() {
-        let defaultName = 'NewMap';
-        let defaultComponent = NewMap;
+        let defaultName = 'MultiMap';
+        let defaultComponent = MultiMap;
         return (
         <Navigator
           initialRoute={{ name: defaultName, component: defaultComponent }}
diff --git a/battle.js b/battle.js
index d910e9b..89652dc 100644
--- a/battle.js
+++ b/battle.js
@@ -48,6 +48,8 @@ var battle = React.createClass({
       enemy_skill_1: 0.3,
       enemy_skill_2: 0.1,
       enemy: '小葉麻糬',
+      enemy_Lv: null,
+      enemy_id: null,
       Monster_Img: 'https://s19.postimg.org/6x3lekc83/000.png',
       you: null,
       id: null,
@@ -83,10 +85,12 @@ var battle = React.createClass({
         skill_2_check_3: true, 
       });
     }
-    //從這裡拿到Battle_PetBoxt傳過來的參數
+    //從這裡拿到Battle_PetBox傳過來的參數
      this.setState({
             Monster_Img: this.props.Monster_Img,
             enemy: this.props.enemy,
+            enemy_Lv: this.props.enemy_Lv,
+            enemy_id: this.props.enemy_id,
             id: this.props.id,
             Lv: this.props.Lv,
             current_HP: this.props.current_HP,
@@ -490,7 +494,7 @@ var battle = React.createClass({
                   <View style={{flex: 2,flexDirection: 'row',alignItems:'center',
                     justifyContent:'space-around'}}>
                     <Text style={styles.welcome_4}>{this.state.enemy}</Text>
-                    <Text style={styles.welcome_3}>Lv 10</Text>
+                    <Text style={styles.welcome_3}>{'Lv '+this.state.enemy_Lv}</Text>
                   </View>
                   <View style={{flex: 2,flexDirection:'row',alignItems:'center',
                     justifyContent:'center',marginBottom:10,marginTop:10,}}>