Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client

Assets/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d674de123d0cce345804c7513b5faeb5
+folderAsset: yes
+timeCreated: 1489996021
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/EditorSpriteAsste.cs

@@ -0,0 +1,86 @@
+using UnityEditor;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+[CustomEditor(typeof(SpriteAsset))]
+public class EditorSpriteAsste : Editor
+{
+	#region 变量
+
+    private Vector2 ScrollPos;
+    private SpriteAsset Script;
+
+    #endregion
+
+	private void OnEnable()
+	{
+	    Script = (SpriteAsset) target;
+	}
+
+    public override void OnInspectorGUI()
+    {
+        base.OnInspectorGUI();
+
+        if (GUILayout.Button("GetSpriteInfo"))
+        {
+            GetSpriteInfo();
+        }
+
+        ScrollPos = GUILayout.BeginScrollView(ScrollPos);
+
+        if (Script.SpriteInfoList != null)
+        {
+            for (int i = 0; i < Script.SpriteInfoList.Count; i++)
+            {
+                SpriteInfo spriteInfo = Script.SpriteInfoList[i];
+
+                GUILayout.BeginHorizontal();
+
+                EditorGUILayout.ObjectField("", spriteInfo.Sprite, typeof(Sprite), false);
+                
+                GUILayout.BeginVertical();
+
+                EditorGUILayout.LabelField("ID : " + spriteInfo.ID);
+                EditorGUILayout.LabelField("Name : " + spriteInfo.Name);
+                EditorGUILayout.LabelField("Rect : " + spriteInfo.Rect);
+                EditorGUILayout.LabelField("Pivot : " + spriteInfo.Pivot);
+                EditorGUILayout.LabelField("");
+
+                GUILayout.EndVertical();
+
+                GUILayout.EndHorizontal();
+            }
+        }
+
+        GUILayout.EndScrollView();
+    }
+
+
+    private void GetSpriteInfo()
+    {
+        Script.SpriteInfoList = new List<SpriteInfo>();
+
+        string path = AssetDatabase.GetAssetPath(Script.Texture);
+
+        Object[] objects = AssetDatabase.LoadAllAssetsAtPath(path);
+
+        for (int i = 0; i < objects.Length; i++)
+        {
+            if (objects[i] is Sprite)
+            {
+                Sprite sprite = (Sprite) objects[i];
+                SpriteInfo spriteInfo = new SpriteInfo();
+
+                spriteInfo.ID = i;
+                spriteInfo.Rect = sprite.rect;
+                spriteInfo.Pivot = sprite.pivot;
+                spriteInfo.Sprite = sprite;
+                spriteInfo.Name = sprite.name;
+
+                Script.SpriteInfoList.Add(spriteInfo);
+            }
+        }
+    }
+}

Assets/Editor/EditorSpriteAsste.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ee1b23ee55f77e246b93fd1c4e766ac1
+timeCreated: 1489996474
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/ManaData.cs

@@ -171,7 +171,7 @@ public class ManaData : MonoBehaviour
         if (Input.anyKeyDown)
         {
             OpTimer = 0;
-
+            
             if (Main > 0)
             {
                 return;

Assets/Script/Manage/ManaUI.cs

@@ -66,7 +66,17 @@ public class ManaUI : MonoBehaviour
 
         #region B_SignIn
 
-        ManaReso.Get("B_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+        Tween tween = ManaReso.Get("B_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaData.Main++;
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
 
         Transform tra = ManaReso.Get("B_Grid");
 
@@ -87,8 +97,6 @@ public class ManaUI : MonoBehaviour
             "B_Confirm",
             () =>
             {
-                ManaData.Main--;
-
                 ManaReso.Get("B_SignIn").TweenBacCG();
             }
         );
@@ -106,8 +114,6 @@ public class ManaUI : MonoBehaviour
             "C_Manage",
             () =>
             {
-                ManaData.Main++;
-
                 ManaReso.Get("C_Main").TweenBacCG();
                 ManaReso.SetActive("F_Manage", true);
 
@@ -119,7 +125,7 @@ public class ManaUI : MonoBehaviour
 
         #region C_Main
 
-        Tween tween = ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+         ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -131,8 +137,6 @@ public class ManaUI : MonoBehaviour
         (
             () =>
             {
-                ManaData.Main++;
-
                 ManaReso.Get("C_Main").TweenBacCG();
 
                 ManaReso.Get("D_MiniGame").TweenForVec();
@@ -252,8 +256,6 @@ public class ManaUI : MonoBehaviour
             "Da_Quit",
             () =>
             {
-                ManaData.Main--;
-
                 ManaReso.Get("C_Main").TweenForCG();
 
                 ManaReso.Get("D_MiniGame").TweenBacVec();
@@ -319,8 +321,6 @@ public class ManaUI : MonoBehaviour
             "F_Close",
             () =>
             {
-                ManaData.Main--;
-
                 ManaReso.Get("C_Main").TweenForCG();
                 ManaReso.SetActive("F_Manage", false);
 
@@ -453,7 +453,17 @@ public class ManaUI : MonoBehaviour
 
         #region F_Manage
 
-        ManaReso.Get("F_Manage").CreateTweenVec(ManaReso.Get("F_PageTra").position, 0.5f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("F_Manage").CreateTweenVec(ManaReso.Get("F_PageTra").position, 0.5f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaData.Main++;
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
 
         #endregion
 
@@ -574,21 +584,30 @@ public class ManaUI : MonoBehaviour
 
         tween.OnForwardStart += () =>
         {
+            ManaData.Main++;
+
+            ManaReso.Get("C_Main").TweenBacCG();
+
             if (ManaGarden.MyFlowerSpec == 0)
             {
                 ManaReso.SetActive("G_Special", false);
             }
         };
 
-        #endregion
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
 
-        #endregion
+            #endregion
 
-        #region H
+            #endregion
 
-        #region H_Prev
+            #region H
 
-        ManaReso.AddButtonEvent
+            #region H_Prev
+
+            ManaReso.AddButtonEvent
         (
             "H_Prev",
             () =>
@@ -661,7 +680,19 @@ public class ManaUI : MonoBehaviour
 
         ManaReso.Get("H_FlowerCard").AddComponent<FlowerCard>().RegistValue();
 
-        ManaReso.Get("H_FlowerCard").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("H_FlowerCard").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
+
+        tween.OnForwardStart += () =>
+        {
+            ManaData.Main++;
+            
+            ManaReso.Get("C_Main").TweenBacCG();
+        };
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
 
         #endregion
 

Assets/Script/Object/Garden.cs

@@ -134,6 +134,8 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
 
         tween.OnForwardStart += () =>
         {
+            ManaData.Main++;
+
             ManaReso.SetActive("C_MiniGame", false);
         };
 
@@ -152,6 +154,8 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
 
         tween.OnBackwardStart += () =>
         {
+            ManaData.Main--;
+
             ManaReso.SetActive("Player", true);
             ManaReso.SetActive("Cloud1", true);
             ManaReso.SetActive("Cloud2", true);

Assets/SpriteAsset.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class SpriteInfo
+{
+    #region 变量
+
+    public int ID;
+    public string Name;
+    public Rect Rect;
+    public Sprite Sprite;
+    public Vector2 Pivot;
+
+    #endregion
+}
+
+public class SpriteAsset : MonoBehaviour
+{
+    public Texture2D Texture;
+    public List<SpriteInfo> SpriteInfoList;
+}

Assets/SpriteAsset.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a15a847c940ffa147a29de72d9b1e386
+timeCreated: 1489996035
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/金币钻石.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 64ace2edec65be1458f4f6c09ae97699
+timeCreated: 1489995976
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: "\u91D1\u5E01"
+    21300002: "\u94BB\u77F3"
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: tvOS
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "\u91D1\u5E01"
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 536.5
+        height: 127
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 536
+        y: 0
+        width: 536.5
+        height: 127
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MyLovelyGarden.txt

@@ -1,3 +1,5 @@
+FlowerCard与Flower会弹出C_Main 自己写一个检测触碰类?
+
 进行到ManaData
 
 图文混排