LiuQilin 8 rokov pred
rodič
commit
16d151805c

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resources/Prefab/Object/Player.prefab


BIN
Assets/Resources/Prefab/PrefabUI/C_EnterGameA.prefab


BIN
Assets/Resources/Prefab/PrefabUI/Canvas.prefab


+ 18 - 0
Assets/Resources/XML/Config/PlayerConfig.xml

@@ -0,0 +1,18 @@
+<PlayerConfig>
+  <Coin></Coin>
+  <Level></Level>
+  <Person></Person>
+  <Diamond></Diamond>
+  <QuitTime></QuitTime>
+  <CoinPerson></CoinPerson>
+
+  <技能>
+    <人潮涌动 Status="" Level=""/>
+  </技能>
+
+  <ProcessorList>
+  </ProcessorList>
+
+  <CoolList>
+  </CoolList>
+</PlayerConfig>

+ 3 - 3
Assets/Resources/Prefab/PrefabUI/C_EnterGameA.prefab.meta → Assets/Resources/XML/Config/PlayerConfig.xml.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: c76262d47cfd93f41b077aa697150dd6
-timeCreated: 1486707045
+guid: 50171b234d04e534580d2cccfdf235da
+timeCreated: 1489126665
 licenseType: Pro
-NativeFormatImporter:
+TextScriptImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 6 - 2
Assets/Script/Manage/ManaData.cs

@@ -94,7 +94,7 @@ public class ManaData : MonoBehaviour
     {
         Initializer.RegistValue += RegistValue;
         Initializer.RegistReference += RegistReference;
-
+        
         #region 获取技能信息
 
         SkillList = new List<Skill>();
@@ -255,6 +255,11 @@ public class ManaData : MonoBehaviour
 
     }
 
+    private void OnApplicationQuit()
+    {
+        Data.SavePlayerConfig();
+    }
+
 
     public static void UpdateSkillStatus()
     {
@@ -279,7 +284,6 @@ public class ManaData : MonoBehaviour
         }
     }
 
-
     public static bool Pay(double amt, Current current)
     {
         amt = (int) amt;

+ 38 - 17
Assets/Script/Manage/ManaGarden.cs

@@ -214,14 +214,21 @@ public class ManaGarden : MonoBehaviour
 
     public static void PlaceFlower()
     {
-        Flower flower = ManaReso.GetFlower(SeleId, true, SeleFlowerTra);
+        FlowerInfo flowerInfo = FlowerDic[SeleId];
 
-        PlantFlowerList.Add(flower);
+        if (flowerInfo.Plant > 0)
+        {
+            ManaMessage.Show("已经种植过了", 1);
+        }
+        else
+        {
+            flowerInfo.Text.SetActive(true); //FlowerItem
+            flowerInfo.Plant++;
 
-        FlowerInfo flowerInfo = FlowerDic[SeleId];
+            Flower flower = ManaReso.GetFlower(SeleId, true, SeleFlowerTra);
 
-        flowerInfo.Text.SetActive(true); //FlowerItem
-        flowerInfo.Plant++;
+            PlantFlowerList.Add(flower);
+        }
     }
 
     public static void PlaceFlower(int id)
@@ -247,28 +254,42 @@ public class ManaGarden : MonoBehaviour
 
         FlowerInfo flowerInfo = FlowerDic[id];
 
-        Flower flower = ManaReso.GetFlower(id, true, tra);
+        if (flowerInfo.Plant > 0)
+        {
+            ManaMessage.Show("已经种植过了", 1);
+        }
+        else
+        {
+            flowerInfo.Text.SetActive(true); //FlowerItem
+            flowerInfo.Plant++;
 
-        flower.Id = id;
-        flower.PosTra = tra;
+            Flower flower = ManaReso.GetFlower(id, true, tra);
 
-        PlantFlowerList.Add(flower);
+            flower.Id = id;
+            flower.PosTra = tra;
 
-        flowerInfo.Text.SetActive(true); //FlowerItem
-        flowerInfo.Plant++;
+            PlantFlowerList.Add(flower);
 
-        tra.SetCollider(false); //空地Collider
+            tra.SetCollider(false); //空地Collider
+        }
     }
 
     public static void PlaceFlower(int id, Transform tra)
     {
-        Flower flower = ManaReso.GetFlower(id, true, tra);
+        FlowerInfo flowerInfo = FlowerDic[id];
 
-        PlantFlowerList.Add(flower);
+        if (flowerInfo.Plant > 0)
+        {
+            ManaMessage.Show("已经种植过了", 1);
+        }
+        else
+        {
+            flowerInfo.Text.SetActive(true); //FlowerItem
+            flowerInfo.Plant++;
 
-        FlowerInfo flowerInfo = FlowerDic[id];
+            Flower flower = ManaReso.GetFlower(id, true, tra);
 
-        flowerInfo.Text.SetActive(true); //FlowerItem
-        flowerInfo.Plant++;
+            PlantFlowerList.Add(flower);
+        }
     }
 }

+ 1 - 1
Assets/Script/Manage/ManaPlayer.cs

@@ -17,7 +17,7 @@ public class ManaPlayer : MonoBehaviour
 
     private void Awake()
     {
-        Transform tra = ManaReso.Get("Player", Folder.Object, ManaReso.Get("Garden"), true, false);
+        Transform tra = ManaReso.Get("Player", Folder.Object, ManaReso.Get("GardenSr2"), true, false);
 
         tra.AddComponent<Player>();
 

+ 6 - 2
Assets/Script/Manage/ManaReso.cs

@@ -149,9 +149,10 @@ public class ManaReso : MonoBehaviour
 
         #region C_EnterGameA
 
-        AddButtonEvent
+        Button enterGameA = Get<Button>("C_EnterGameA");
+
+        enterGameA.onClick.AddListener
         (
-            "C_EnterGameA",
             () =>
             {
                 Get("GardenGameSr").Forward(TweenType.Position);
@@ -161,6 +162,9 @@ public class ManaReso : MonoBehaviour
             }
         );
 
+        HudTarget hudTarget = enterGameA.AddComponent<HudTarget>();
+        hudTarget.PosTra = Player.ChildDic["EnterGameTraA"];
+
         #endregion
 
         #endregion

+ 1 - 8
Assets/Script/Object/Flower.cs

@@ -50,14 +50,7 @@ public class FlowerInfo
         (
             () =>
             {
-                if (Plant == 0)
-                {
-                    ManaGarden.PlaceFlower(Id);
-                }
-                else
-                {
-                    ManaMessage.Show("已经种植过了",1);
-                }
+                ManaGarden.PlaceFlower(Id);
             }
         );
     }

+ 20 - 1
Assets/Script/Object/Garden.cs

@@ -15,6 +15,7 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
     private float Ratio2;
     private float Ratio3;
     private float Ratio4;
+    private float RatioPlayer;
     private float LeftBorder;
     private float SlideSpeed;
     private float RightBorder;
@@ -22,11 +23,13 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
     private Transform Garden3;
     private Transform Garden4;
     private Transform GardenA;
-    
+    private Transform PlayerTra;
+
     private List<Vector3> VectorList2;
     private List<Vector3> VectorList3;
     private List<Vector3> VectorList4;
     private List<Vector3> VectorListA;
+    private List<Vector3> VectorListPlayer;
 
     #endregion
 
@@ -59,6 +62,7 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
         Ratio2 = 0.25f;
         Ratio3 = 0.5f;
         Ratio4 = 0.75f;
+        RatioPlayer = 0.75f;
         SlideSpeed = 0.1f;
 
         LeftBorder = VectorListA[0].x;
@@ -84,6 +88,7 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
         Garden4 = ManaReso.Get("GardenSr4");
 
         GardenA = ManaReso.Get("GardenSrA");
+        PlayerTra = ManaReso.Get("Player");
 
         VectorList2 = new List<Vector3>()
         {
@@ -108,6 +113,12 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
             ManaReso.Get("TraA1").position,
             ManaReso.Get("TraB1").position,
         };
+
+        VectorListPlayer = new List<Vector3>()
+        {
+            Player.ChildDic["PlayerTra1"].position,
+            Player.ChildDic["PlayerTra2"].position,
+        };
     }
 
 
@@ -126,6 +137,7 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
                     float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
 
                     GardenA.Translate(GardenA.right * tempX, Space.World);
+                    PlayerTra.Translate(PlayerTra.right * tempX * RatioPlayer, Space.World);
 
                     Garden2.Translate(Garden2.right * tempX * Ratio2, Space.World);
                     Garden3.Translate(Garden3.right * tempX * Ratio3, Space.World);
@@ -151,6 +163,7 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
                     float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
 
                     GardenA.Translate(GardenA.right * tempX, Space.World);
+                    PlayerTra.Translate(PlayerTra.right * tempX * RatioPlayer, Space.World);
 
                     Garden2.Translate(Garden2.right * tempX * Ratio2, Space.World);
                     Garden3.Translate(Garden3.right * tempX * Ratio3, Space.World);
@@ -208,7 +221,9 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
         Garden2.Move(VectorList2[Page], 0.25f, Curve.EaseOutQuad);
         Garden3.Move(VectorList3[Page], 0.25f, Curve.EaseOutQuad);
         Garden4.Move(VectorList4[Page], 0.25f, Curve.EaseOutQuad);
+
         GardenA.Move(VectorListA[Page], 0.25f, Curve.EaseOutQuad);
+        PlayerTra.Move(VectorListPlayer[Page], 0.25f, Curve.EaseOutQuad);
     }
 
     private void PrevPage()
@@ -220,7 +235,9 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
         Garden2.Move(VectorList2[Page], 0.5f, Curve.EaseOutQuad);
         Garden3.Move(VectorList3[Page], 0.5f, Curve.EaseOutQuad);
         Garden4.Move(VectorList4[Page], 0.5f, Curve.EaseOutQuad);
+
         GardenA.Move(VectorListA[Page], 0.5f, Curve.EaseOutQuad);
+        PlayerTra.Move(VectorListPlayer[Page], 0.5f, Curve.EaseOutQuad);
     }
 
     private void NextPage()
@@ -232,6 +249,8 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
         Garden2.Move(VectorList2[Page], 0.5f, Curve.EaseOutQuad);
         Garden3.Move(VectorList3[Page], 0.5f, Curve.EaseOutQuad);
         Garden4.Move(VectorList4[Page], 0.5f, Curve.EaseOutQuad);
+
         GardenA.Move(VectorListA[Page], 0.5f, Curve.EaseOutQuad);
+        PlayerTra.Move(VectorListPlayer[Page], 0.5f, Curve.EaseOutQuad);
     }
 }

+ 2 - 3
Assets/Script/Object/Player.cs

@@ -23,7 +23,8 @@ public class Player : MonoBehaviour
     private List<Sprite> DressList;
     private List<Sprite> MouseList;
     private List<Sprite> HeadWearList;
-    private Dictionary<string, Transform> ChildDic;
+
+    public static Dictionary<string, Transform> ChildDic;
 
     #endregion
 
@@ -96,8 +97,6 @@ public class Player : MonoBehaviour
         #endregion
 
         #endregion
-
-        ManaReso.Get("C_EnterGameA", Folder.PrefabUI, Camera.main.WorldToScreenPoint(ChildDic["GameBtnTraA"].position), Quaternion.identity, ManaReso.Get("C_Main"));
     }
 
 

+ 6 - 0
Assets/Script/Tool/Data.cs

@@ -37,4 +37,10 @@ public class Data : MonoBehaviour
 
         return xmlNodeLists;
     }
+
+
+    public static void SavePlayerConfig()
+    {
+        
+    }
 }