temp 3.27

Assets/Resources/Shader/HighLight.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c1d308a23b4ae343b174be6509cc041
+timeCreated: 1490605040
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Shader/HighLight.shader

@@ -0,0 +1,106 @@
+Shader "DashGame/HighLight"
+{
+	Properties
+	{
+		[PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {}
+		_Color("Tint", Color) = (1,1,1,1)
+		[MaterialToggle] PixelSnap("Pixel snap", Float) = 0
+	}
+
+	SubShader
+	{
+		Tags
+		{
+			"Queue" = "Transparent"
+			"IgnoreProjector" = "True"
+			"RenderType" = "Transparent"
+			"PreviewType" = "Plane"
+			"CanUseSpriteAtlas" = "True"
+		}
+
+		Cull Off
+		Lighting Off
+		ZWrite Off
+
+		Pass
+		{
+				Blend SrcAlpha OneMinusSrcAlpha
+
+				CGPROGRAM
+				
+				#pragma vertex vert
+				#pragma fragment frag
+				#pragma target 2.0
+				#pragma multi_compile _ PIXELSNAP_ON
+				#pragma multi_compile _ ETC1_EXTERNAL_ALPHA
+				
+				#include "UnityCG.cginc"
+
+				struct appdata_t
+				{
+					float4 vertex   : POSITION;
+					float4 color    : COLOR;
+					float2 texcoord : TEXCOORD0;
+					UNITY_VERTEX_INPUT_INSTANCE_ID
+				};
+
+				struct v2f
+				{
+					float4 vertex   : SV_POSITION;
+					fixed4 color : COLOR;
+					float2 texcoord  : TEXCOORD0;
+					UNITY_VERTEX_OUTPUT_STEREO
+				};
+
+				fixed4 _Color;
+
+				v2f vert(appdata_t IN)
+				{
+					v2f OUT;
+					UNITY_SETUP_INSTANCE_ID(IN);
+					UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+					OUT.vertex = UnityObjectToClipPos(IN.vertex);
+					OUT.texcoord = IN.texcoord;
+					OUT.color = IN.color * _Color;
+					#ifdef PIXELSNAP_ON
+					OUT.vertex = UnityPixelSnap(OUT.vertex);
+					#endif
+
+					return OUT;
+				}
+
+				sampler2D _MainTex;
+				sampler2D _AlphaTex;
+
+				fixed4 SampleSpriteTexture(float2 uv)
+				{
+					fixed4 color = tex2D(_MainTex, uv);
+
+					#if ETC1_EXTERNAL_ALPHA
+					// get the color from an external texture (usecase: Alpha support for ETC1 on android)
+					color.a = tex2D(_AlphaTex, uv).r;
+					#endif //ETC1_EXTERNAL_ALPHA
+
+					return color;
+				}
+
+				fixed4 frag(v2f IN) : SV_Target
+				{
+					fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color;
+					c.rgb *= c.a;
+	
+					if (c.a == 0) 
+					{
+						discard;
+					}
+					else if(c.a < 1)
+					{
+						c.rgb = fixed3(1, 1, 1);
+					}
+	
+					return c;
+				}
+				ENDCG
+		}
+	}
+}

Assets/Resources/Shader/HighLight.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0328acfec1a1ba74cbfd90fb39cd5f70
+timeCreated: 1490605002
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Temp.meta

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

Assets/Resources/XML/Config/PlayerConfig.xml

@@ -7,7 +7,7 @@
   <QuitTime value="3/24/2017 10:40:04 PM" />
   <CoinPerson value="0" />
   <CircleTimer value="0" />
-  <PlantList FlowerTraA1="1" FlowerTraA2="2" FlowerTraA3="3" FlowerTraA4="4" FlowerTraA5="5" FlowerTraA6="6" FlowerTraA7="7" FlowerTraA8="8" FlowerTraA9="9" />
+  <PlantList SlotA1="1" SlotA2="2" SlotA3="3" SlotA4="4" SlotA5="5" SlotA6="6" SlotA7="7" SlotA8="8" SlotA9="9" />
   <FlowerList ID="1 2 3 4 5 6 7 8 9 10" />
   <SkillList>
     <免费获取金币 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />

Assets/Resources/XML/lan/ChineseSimplified.xml

@@ -17,7 +17,8 @@
     <Fg_BtnLab desc=""><![CDATA[连接服务器]]></Fg_BtnLab>
     <Fg_Lab desc=""><![CDATA[该功能仅在联网时使用]]></Fg_Lab>
     <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
-    <D_BeginLab desc=""><![CDATA[开始]]></D_BeginLab>
+    <D_BeginLab0 desc=""><![CDATA[开始]]></D_BeginLab0>
+    <D_BeginLab1 desc=""><![CDATA[准备]]></D_BeginLab1>
     <D_ScoreTit desc=""><![CDATA[得分:]]></D_ScoreTit>
     <D_StatusLab0 desc=""><![CDATA[未开始]]></D_StatusLab0>
     <D_StatusLab1 desc=""><![CDATA[进行中]]></D_StatusLab1>

Assets/Resources/XML/lan/ChineseTraditional.xml

@@ -17,7 +17,8 @@
     <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
     <Fg_Lab desc=""><![CDATA[]]></Fg_Lab>
     <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
-    <D_BeginLab desc=""><![CDATA[]]></D_BeginLab>
+    <D_BeginLab0 desc=""><![CDATA[]]></D_BeginLab0>
+    <D_BeginLab1 desc=""><![CDATA[]]></D_BeginLab1>
     <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
     <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
     <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>

Assets/Resources/XML/lan/English.xml

@@ -17,7 +17,8 @@
     <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
     <Fg_Lab desc=""><![CDATA[]]></Fg_Lab>
     <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
-    <D_BeginLab desc=""><![CDATA[]]></D_BeginLab>
+    <D_BeginLab0 desc=""><![CDATA[]]></D_BeginLab0>
+    <D_BeginLab1 desc=""><![CDATA[]]></D_BeginLab1>
     <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
     <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
     <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>

Assets/Script/Editor/EditorAuxiliary.cs

@@ -58,6 +58,16 @@ public class EditorAuxiliary : Editor
         {
             //ResetAll();
         }
+
+        if (GUILayout.Button("Temp"))
+        {
+            Vector3 position = Script.GoList[0].GetChild(0).localPosition;
+
+            for (int i = 1; i < Script.GoList.Count; i++)
+            {
+                Script.GoList[i].GetChild(0).localPosition = position;
+            }
+        }
     }
 
 

Assets/Script/Manage/Initializer.cs

@@ -25,11 +25,11 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaAudio>();
 
         gameObject.AddScript<ManaUI>();
-        gameObject.AddScript<ManaData>();
         gameObject.AddScript<ManaGarden>();
 
-        gameObject.AddScript<ManaDebug>();
+        gameObject.AddScript<ManaData>();
         gameObject.AddScript<ManaPlayer>();
+        gameObject.AddScript<ManaDebug>();
         gameObject.AddScript<ManaMiniGame>();
 
         for (int i = 0; i < RegistList.Count; i++)

Assets/Script/Manage/ManaData.cs

@@ -12,6 +12,16 @@ public class ManaData : Regist
 {
     #region 变量
 
+    public static int Slot
+    {
+        get { return _Slot; }
+        set
+        {
+            _Slot = value;
+
+            ManaReso.Get<Garden>("Garden").ValidPage = Mathf.Clamp(Mathf.CeilToInt(_Slot/7f), 1, 2);
+        }
+    }
     public static int Level
     {
         get { return _Level; }
@@ -19,6 +29,13 @@ public class ManaData : Regist
         {
             _Level = value;
 
+            Slot = 7 + Level / 20;
+
+            for (int i = 0; i < Slot; i++)
+            {
+                ManaGarden.SlotList[i].Valid = true;
+            }
+
             ManaDebug.Log(string.Format("已升级 花园等级 : <color=red>{0}</color>", _Level));
 
             for (int i = 0; i < SkillList.Count; i++)
@@ -90,6 +107,8 @@ public class ManaData : Regist
         }
     }
 
+
+    private static int _Slot;
     private static int _Level;
     private static bool _Pause;
     private static float _Person;
@@ -281,7 +300,7 @@ public class ManaData : Regist
 
     public override void RegistValueA()
     {
-        OpTime = 5;
+        OpTime = 90;
         MiniTimer = 0;
         CircleTime = 10;
 
@@ -310,7 +329,7 @@ public class ManaData : Regist
             {
                 int id = int.Parse(strings[i]);
 
-                ManaGarden.FlowerInfoDic[id].Unlock = true;
+                ManaGarden.FlowerInfoList[id].Unlock = true;
             }
         }
 
@@ -320,7 +339,7 @@ public class ManaData : Regist
         {
             int id = int.Parse(attributes[i].Value);
 
-            ManaGarden.PlantFlower(id, ManaReso.Get(attributes[i].Name));
+            ManaGarden.PlantFlower(id, attributes[i].Name);
         }
 
         #endregion

Assets/Script/Manage/ManaGarden.cs

@@ -79,12 +79,12 @@ public class ManaGarden : Regist
     private static int _TotalFlowerSpec;
     private static int _TotalFlowerRegu;
 
-    public static int SeleId;
-    public static Flower SeleFlower;
-    public static Transform SelePosTra;
-    public static List<Flower> PlantList;
-    public static List<Transform> PosTraList;
-    public static Dictionary<int, FlowerInfo> FlowerInfoDic;
+    public static Slot SeleSlot;
+    public static FlowerInfo SeleFlowerInfo;
+
+    public static List<Slot> SlotList;
+    public static List<Slot> PlantList;
+    public static List<FlowerInfo> FlowerInfoList;
 
     #endregion
 
@@ -94,8 +94,8 @@ public class ManaGarden : Regist
 
         #region 生成FlowerItem
 
-        PlantList = new List<Flower>();
-        FlowerInfoDic = new Dictionary<int, FlowerInfo>();
+        PlantList = new List<Slot>();
+        FlowerInfoList = new List<FlowerInfo>();
 
         List<XmlAttributeCollection> attributesList = Data.GetFlowerConfig();
 
@@ -112,7 +112,7 @@ public class ManaGarden : Regist
                 TotalFlowerRegu++;
             }
 
-            FlowerInfoDic.Add(flowerInfo.Id, flowerInfo);
+            FlowerInfoList.Add(flowerInfo);
         }
 
         #endregion
@@ -121,37 +121,33 @@ public class ManaGarden : Regist
 
     public override void RegistValueA()
     {
-        SeleId = 1;
-
-        PosTraList = new List<Transform>()
+        SlotList = new List<Slot>()
         {
-            ManaReso.Get("FlowerTraA1"),
-            ManaReso.Get("FlowerTraA2"),
-            ManaReso.Get("FlowerTraA3"),
-            ManaReso.Get("FlowerTraA4"),
-            ManaReso.Get("FlowerTraA5"),
-            ManaReso.Get("FlowerTraA6"),
-            ManaReso.Get("FlowerTraA7"),
-            ManaReso.Get("FlowerTraA8"),
-            ManaReso.Get("FlowerTraA9"),
-            ManaReso.Get("FlowerTraB1"),
-            ManaReso.Get("FlowerTraB2"),
-            ManaReso.Get("FlowerTraB3"),
-            ManaReso.Get("FlowerTraB4"),
-            ManaReso.Get("FlowerTraB5"),
-            ManaReso.Get("FlowerTraB6"),
-            ManaReso.Get("FlowerTraB7"),
-            ManaReso.Get("FlowerTraB8"),
-            ManaReso.Get("FlowerTraB9"),
+            ManaReso.Get("SlotA1").AddComponent<Slot>(),
+            ManaReso.Get("SlotA2").AddComponent<Slot>(),
+            ManaReso.Get("SlotA3").AddComponent<Slot>(),
+            ManaReso.Get("SlotA4").AddComponent<Slot>(),
+            ManaReso.Get("SlotA5").AddComponent<Slot>(),
+            ManaReso.Get("SlotA6").AddComponent<Slot>(),
+            ManaReso.Get("SlotA7").AddComponent<Slot>(),
+            ManaReso.Get("SlotA8").AddComponent<Slot>(),
+            ManaReso.Get("SlotA9").AddComponent<Slot>(),
+            ManaReso.Get("SlotB1").AddComponent<Slot>(),
+            ManaReso.Get("SlotB2").AddComponent<Slot>(),
+            ManaReso.Get("SlotB3").AddComponent<Slot>(),
+            ManaReso.Get("SlotB4").AddComponent<Slot>(),
+            ManaReso.Get("SlotB5").AddComponent<Slot>(),
+            ManaReso.Get("SlotB6").AddComponent<Slot>(),
+            ManaReso.Get("SlotB7").AddComponent<Slot>(),
+            ManaReso.Get("SlotB8").AddComponent<Slot>(),
+            ManaReso.Get("SlotB9").AddComponent<Slot>(),
         };
     }
 
 
-    public static void SetFlowerCard(int id)
+    public static void SetFlowerCard(FlowerInfo flowerInfo)
     {
-        SeleId = id;
-
-        FlowerInfo flowerInfo = FlowerInfoDic[id];
+        SeleFlowerInfo = flowerInfo;
 
         ManaReso.SetText("H_Lab", flowerInfo.Name);
 
@@ -165,106 +161,87 @@ public class ManaGarden : Regist
 
         image.rectTransform.sizeDelta = newSize;
     }
-        
 
-    public static void RetriveFlower()
+    public static void ShowPlantCard()
     {
-        ManaReso.Save(SeleFlower);
 
-        PlantList.Remove(SeleFlower);
+    }
+
+    public static void ShowRetrieveCard(FlowerInfo flowerInfo)
+    {
+        SeleSlot = flowerInfo.Slot;
+
+        SetFlowerCard(flowerInfo);
+
+        ManaReso.SetActive("H_Grid", false);
+        ManaReso.SetActive("H_Prev", false);
+        ManaReso.SetActive("H_Next", false);
+        ManaReso.SetActive("H_Place", false);
+        ManaReso.SetActive("H_Icon1", true);
+        ManaReso.SetActive("H_Retrieve", true);
 
-        FlowerInfo flowerInfo = FlowerInfoDic[SeleFlower.Id];
+        ManaReso.Get("H_FlowerCard").TweenForCG();
+    }
 
-        flowerInfo.Plant = false;
 
-        SeleFlower.ParTra.SetCollider(true);
+    public static void RetriveFlower()
+    {
+        SeleSlot.Retrieve();
     }
 
     public static void RetriveFlowerAll()
     {
         for (int i = 0; i < PlantList.Count; i++)
         {
-            ManaReso.Save(PlantList[i]);
-            
-            PlantList[i].ParTra.SetCollider(true);
+            PlantList[i].Retrieve();
 
-            PlantList.RemoveAt(i--);
-        }
-
-        foreach (var kv in FlowerInfoDic)
-        {
-            kv.Value.Plant = false;
+            i--;
         }
     }
 
 
     public static void PlantFlower()
     {
-        FlowerInfo flowerInfo = FlowerInfoDic[SeleId];
+        SeleSlot.Plant(SeleFlowerInfo);
+    }
 
+    public static void PlantFlower(FlowerInfo flowerInfo)
+    {
         if (flowerInfo.Plant)
         {
-            ManaDebug.Log("已经种植过了");
+            ShowRetrieveCard(flowerInfo);
         }
         else
         {
-            flowerInfo.Plant = true;
-
-            Flower flower = ManaReso.GetFlower(SeleId, true, SelePosTra);
+            Slot slot = null;
 
-            PlantList.Add(flower);
-        }
-    }
-
-    public static void PlantFlower(int id)
-    {
-        Transform posTra = null;
-
-        for (int i = 0; i < PosTraList.Count; i++)
-        {
-            if (PosTraList[i].childCount == 0)
+            for (int i = 0; i < SlotList.Count; i++)
             {
-                posTra = PosTraList[i];
+                if (SlotList[i].Available)
+                {
+                    slot = SlotList[i];
 
-                break;
+                    break;
+                }
             }
-        }
 
-        if (posTra == null)
-        {
-            ManaDebug.Log("已经没有空地了");
-        }
-        else
-        {
-            FlowerInfo flowerInfo = FlowerInfoDic[id];
-
-            if (flowerInfo.Plant)
+            if (slot == null)
             {
-                ManaDebug.Log("已经种植过了");
+                ManaDebug.Log("已经没有空地了");
             }
             else
             {
-                flowerInfo.Plant = true;
-
-                Flower flower = ManaReso.GetFlower(id, true, posTra);
-
-                PlantList.Add(flower);
-
-                posTra.SetCollider(false);
+                slot.Plant(flowerInfo);
             }
         }
     }
 
-    public static void PlantFlower(int id, Transform posTra)
+    public static void PlantFlower(int id, string parName)
     {
-        FlowerInfo flowerInfo = FlowerInfoDic[id];
-
-        flowerInfo.Plant = true;
-
-        Flower flower = ManaReso.GetFlower(id, true, posTra);
+        Slot slot = ManaReso.Get<Slot>(parName);
 
-        PlantList.Add(flower);
+        FlowerInfo flowerInfo = FlowerInfoList[id];
 
-        posTra.SetCollider(false);
+        slot.Plant(flowerInfo);
     }
 }

Assets/Script/Manage/ManaMiniGame.cs

@@ -29,7 +29,7 @@ public class Award
         CoinFml = attribute[1].Value;
         FlowerFml = attribute[4].Value;
         DiamondFml = attribute[3].Value;
-
+        
         string[] strings = attribute[2].Value.Split(',');
 
         DiamondMin = int.Parse(strings[0]);
@@ -64,8 +64,8 @@ public class Award
 
         ManaData.Coin += coin;
         ManaReso.SetText("Da_CoinLab", coin.ToString());
-
-        float diamondRate = (float) Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaData.Level, 1, Mathf.Infinity).ToString());
+        
+        float diamondRate = (float) Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaData.Level, 1, 1000).ToString());
 
         if (Random.Range(0, 1f) <= diamondRate)
         {
@@ -108,7 +108,7 @@ public class Award
 
                 while (true)
                 {
-                    flowerInfo = ManaGarden.FlowerInfoDic[Random.Range(0, ManaGarden.TotalFlower - 1)];
+                    flowerInfo = ManaGarden.FlowerInfoList[Random.Range(0, ManaGarden.TotalFlower - 1)];
 
                     if (flowerInfo.Unlock)
                     {
@@ -203,13 +203,27 @@ public class ManaMiniGame : Regist
             TimerLab.text = _GameTimer.ToString("0.0");
         }
     }
+    public static float PrepareTimer
+    {
+        get { return _PrepareTimer; }
+        set
+        {
+            _PrepareTimer = value;
+
+            BtnLab.text = PrepareStr + " " + Mathf.CeilToInt(_PrepareTimer);
+        }
+    }
 
     private static int _Score;
     private static bool _Game;
     private static bool _Pause;
     private static bool _Panalty;
     private static float _GameTimer;
+    private static float _PrepareTimer;
+
+    public static string PrepareStr;
 
+    public static Text BtnLab;
     public static Text TimerLab;
     public static Image TimerBk;
     public static Award Award;
@@ -226,6 +240,16 @@ public class ManaMiniGame : Regist
 
     private void FixedUpdate()
     {
+        if (PrepareTimer > 0)
+        {
+            PrepareTimer -= Time.fixedDeltaTime;
+
+            if (PrepareTimer <= 0)
+            {
+                GameBegin();
+            }
+        }
+
         if (!Game || Pause)
         {
             return;
@@ -256,6 +280,8 @@ public class ManaMiniGame : Regist
 
             if (OpTimer <= 0)
             {
+                OpTime -= OpTime * 0.02f;
+
                 OpTimer = OpTime;
 
                 Flower flower = IdleList[Random.Range(0, IdleList.Count)];
@@ -271,6 +297,8 @@ public class ManaMiniGame : Regist
 
     public override void RegistValueA()
     {
+        PrepareStr = Language.GetStr("UI", "D_BeginLab1");
+
         OpTime = 1.5f;
         GameTime = 45;
         PanaltyTime = 1;
@@ -285,6 +313,7 @@ public class ManaMiniGame : Regist
     {
         TimerBk = ManaReso.Get<Image>("D_TimerIcon");
 
+        BtnLab = ManaReso.Get<Text>("D_BeginLab");
         TimerLab = ManaReso.Get<Text>("D_TimerLab");
     }
 
@@ -443,15 +472,15 @@ public class ManaMiniGame : Regist
     {
         OpList = new List<Flower>();
         IdleList = new List<Flower>();
-        IdleList.Add(ManaReso.GetFlower(1, false, ManaReso.Get("MiniTra1")));
-        IdleList.Add(ManaReso.GetFlower(2, false, ManaReso.Get("MiniTra2")));
-        IdleList.Add(ManaReso.GetFlower(3, false, ManaReso.Get("MiniTra3")));
-        IdleList.Add(ManaReso.GetFlower(4, false, ManaReso.Get("MiniTra4")));
-        IdleList.Add(ManaReso.GetFlower(5, false, ManaReso.Get("MiniTra5")));
-        IdleList.Add(ManaReso.GetFlower(6, false, ManaReso.Get("MiniTra6")));
-        IdleList.Add(ManaReso.GetFlower(7, false, ManaReso.Get("MiniTra7")));
-        IdleList.Add(ManaReso.GetFlower(8, false, ManaReso.Get("MiniTra8")));
-        IdleList.Add(ManaReso.GetFlower(9, false, ManaReso.Get("MiniTra9")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[0], ManaReso.Get("SlotMini1")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[1], ManaReso.Get("SlotMini2")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[2], ManaReso.Get("SlotMini3")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[3], ManaReso.Get("SlotMini4")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[4], ManaReso.Get("SlotMini5")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[5], ManaReso.Get("SlotMini6")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[6], ManaReso.Get("SlotMini7")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[7], ManaReso.Get("SlotMini8")));
+        IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoList[8], ManaReso.Get("SlotMini9")));
     }
 
     public static void ResetOperate()

Assets/Script/Manage/ManaReso.cs

@@ -171,9 +171,9 @@ public class ManaReso : MonoBehaviour
     }
 
 
-    public static Flower GetFlower(int id, bool collider, Transform parTra)
+    public static Flower GetFlower(FlowerInfo flowerInfo, Slot slot, bool collider)
     {
-        Transform tra = Get("Flower", Folder.Object, false, parTra, false, ObjType.Flower);
+        Transform tra = Get("Flower", Folder.Object, false, slot.transform, false, ObjType.Flower);
 
         Flower flower = tra.GetComponent<Flower>();
 
@@ -189,14 +189,39 @@ public class ManaReso : MonoBehaviour
             flower.transform.localPosition = flower.LocalPos;
         }
 
-        flower.Id = id;
-        flower.ParTra = parTra;
+        flower.FlowerInfo = flowerInfo;
+        flower.Slot = slot;
 
         flower.SetCollider(collider);
 
         return flower;
     }
 
+    public static Flower GetFlower(FlowerInfo flowerInfo, Transform par)
+    {
+        Transform tra = Get("Flower", Folder.Object, false, par, false, ObjType.Flower);
+
+        Flower flower = tra.GetComponent<Flower>();
+
+        if (flower == null)
+        {
+            flower = tra.AddComponent<Flower>();
+
+            flower.ObjType = ObjType.Flower;
+            flower.LocalPos = flower.transform.localPosition;
+        }
+        else
+        {
+            flower.transform.localPosition = flower.LocalPos;
+        }
+
+        flower.FlowerInfo = flowerInfo;
+
+        flower.SetCollider(false);
+
+        return flower;
+    }
+
     public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene)
     {
         Vector3 pos;

Assets/Script/Manage/ManaUI.cs

@@ -13,14 +13,22 @@ public class Sign
 {
     public int Coin;
     public int Diamond;
+    public Text Lab1;
+    public Text Lab2;
     public Image Icon;
     public Image Mark;
     public List<int> FlowerList;
 
-    public Sign(Transform transform, XmlAttributeCollection attribute)
+    public Sign(Transform tra, XmlAttributeCollection attribute)
     {
-        Icon = transform.GetChild(0).GetComponent<Image>();
-        Mark = transform.GetChild(1).GetComponent<Image>();
+        Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
+
+        Auxiliary.CompileDic(tra, dic);
+
+        Lab1 = dic["Lab1"].GetComponent<Text>();
+        Lab2 = dic["Lab2"].GetComponent<Text>();
+        Icon = dic["Icon1"].GetComponent<Image>();
+        Mark = dic["Icon2"].GetComponent<Image>();
 
         if (!string.IsNullOrEmpty(attribute[1].Value))
         {
@@ -42,6 +50,8 @@ public class Sign
 
             if (FlowerList == null)
             {
+                Lab1.text = Diamond.ToString("0");
+
                 Icon.sprite = ManaReso.Load<Sprite>("钻石", Folder.SpriteUI);
             }
         }
@@ -49,6 +59,8 @@ public class Sign
         if (!string.IsNullOrEmpty(attribute[3].Value))
         {
             Coin = int.Parse(attribute[3].Value);
+            
+            Lab1.text = Coin.ToString("0");
 
             Icon.sprite = ManaReso.Load<Sprite>("金币", Folder.SpriteUI);
         }
@@ -62,9 +74,9 @@ public class Sign
         {
             for (int i = 0; i < FlowerList.Count; i++)
             {
-                if (ManaGarden.FlowerInfoDic[FlowerList[i]].Unlock == false)
+                if (ManaGarden.FlowerInfoList[FlowerList[i]].Unlock == false)
                 {
-                    ManaGarden.FlowerInfoDic[FlowerList[i]].Unlock = true;
+                    ManaGarden.FlowerInfoList[FlowerList[i]].Unlock = true;
 
                     if (ManaData.Sign < 27)
                     {
@@ -297,7 +309,7 @@ public class ManaUI : Regist
             {
                 ManaReso.Get("GardenMini").TweenForVec();
 
-                ManaReso.Get("D_MiniGame").TweenForVec();
+                ManaReso.Get("D_MiniGame").TweenForCG();
             }
         );
 
@@ -313,7 +325,8 @@ public class ManaUI : Regist
 
         ManaReso.SetText("D_QuitLab");
         ManaReso.SetText("D_ScoreTit");
-        ManaReso.SetText("D_BeginLab");
+
+        ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
         ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
 
         ManaReso.SetText("Da_QuitLab");
@@ -356,7 +369,10 @@ public class ManaUI : Regist
         ManaReso.AddButtonEvent
         (
             "D_Begin",
-            ManaMiniGame.GameBegin
+            () =>
+            {
+                ManaMiniGame.PrepareTimer = 3;
+            }
         );
 
         #endregion
@@ -383,7 +399,7 @@ public class ManaUI : Regist
 
         #region D_MiniGame
 
-        tween = ManaReso.Get("D_MiniGame").CreateTweenVec(ManaReso.Get("Canvas").position, 1f, false, true, Curve.EaseOutQuad);
+        tween = ManaReso.Get("D_MiniGame").CreateTweenCG(0, 1, 1f, false, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
@@ -430,7 +446,7 @@ public class ManaUI : Regist
                 ManaReso.Get("C_Main").TweenForCG();
 
                 ManaReso.Get("C_MiniGame").TweenBacCG();
-                ManaReso.Get("D_MiniGame").TweenBacVec();
+                ManaReso.Get("D_MiniGame").TweenBacCG();
 
                 ManaReso.Get("GardenMini").TweenBacVec();
 
@@ -468,7 +484,7 @@ public class ManaUI : Regist
 
                 ManaReso.Get("C_MiniGame").TweenBacCG();
 
-                ManaReso.Get("D_MiniGame").TweenBacVec();
+                ManaReso.Get("D_MiniGame").TweenBacCG();
 
                 ManaReso.Get("GardenMini").TweenBacVec();
 
@@ -765,6 +781,8 @@ public class ManaUI : Regist
 
         tween.OnBackwardFinish += () =>
         {
+            ManaReso.Get("C_Main").TweenForCG();
+
             ManaReso.SetActive("F_Manage", false);
             ManaReso.SetActive("F_Manage0", false);
         };
@@ -1047,5 +1065,29 @@ public class ManaUI : Regist
         ManaReso.Get("I_BlackMask").TweenForGra();
 
         #endregion
+
+        #region K
+
+        ManaReso.Get("K_QuitGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.AddButtonEvent
+        (
+            "K_Cancel",
+            () =>
+            {
+                ManaReso.Get("K_QuitGame").TweenBacCG();
+            }
+        );
+
+        ManaReso.AddButtonEvent
+        (
+            "K_Confirm",
+            () =>
+            {
+                Application.Quit();
+            }
+        );
+
+        #endregion
     }
 }

Assets/Script/Object/Flower.cs

@@ -83,6 +83,7 @@ public class FlowerInfo
     public string Name;
     public string Description;
 
+    public Slot Slot;
     public Text Text;
     public Sprite Sprite;
     public Image Image;
@@ -104,6 +105,7 @@ public class FlowerInfo
 
         Id = int.Parse(attributes[0].Value);
         Sprite = ManaReso.Load<Sprite>(attributes[3].Value, Folder.Garden);
+       
         Name = Language.GetStr("FlowerName", "Flower" + Id);
         Description = attributes[2].Value;
 
@@ -118,7 +120,7 @@ public class FlowerInfo
         (
             () =>
             {
-                ManaGarden.PlantFlower(Id);
+                ManaGarden.PlantFlower(this);
             }
         );
     }
@@ -141,7 +143,7 @@ public class Flower : ObjRoot, IPointerClickHandler
             {
                 Phase = 0;
 
-                OperateSr1.SetActive(false);
+                OperateIcon.SetActive(false);
 
                 ManaReso.GetHudText("得分+15", Color.red, 18, ChildDic["ScoreTra"], ManaReso.Get("D_Status"), true);
 
@@ -154,26 +156,26 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     private OpType OpType;
     private SpriteRenderer FlowerSr;
-    private SpriteRenderer OperateSr1;
-    private SpriteRenderer OperateSr2;
+    private SpriteRenderer OperateIcon;
 
     #endregion
 
-    public Vector3 LocalPos;
-    public Transform ParTra;
-
-    public int Id
+    public FlowerInfo FlowerInfo
     {
-        get { return _Id; }
+        get { return _FlowerInfo; }
         set
         {
-            _Id = value;
+            _FlowerInfo = value;
 
-            FlowerSr.sprite = ManaGarden.FlowerInfoDic[Id].Sprite;
+            FlowerSr.sprite = FlowerInfo.Sprite;
         }
     }
 
-    private int _Id;
+    private FlowerInfo _FlowerInfo;
+
+    public int Id;
+    public Slot Slot;
+    public Vector3 LocalPos;
 
     private Dictionary<string, Transform> ChildDic;
 
@@ -186,8 +188,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         Auxiliary.CompileDic(transform, ChildDic);
 
         FlowerSr = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
-        OperateSr1 = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
-        OperateSr2 = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
+        OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
     }
 
 
@@ -202,34 +203,31 @@ public class Flower : ObjRoot, IPointerClickHandler
     {
         ChildDic["MiniGame"].SetActive(true);
 
-        OperateSr1.SetActive(false);
+        OperateIcon.SetActive(false);
     }
 
     public void SetFirstOp()
     {
-        OperateSr1.SetAlpha(1);
-        OperateSr2.SetAlpha(1);
+        OperateIcon.SetAlpha(1);
+        OperateIcon.material.shader = Shader.Find("DashGame/HighLight");
 
-        OperateSr1.SetActive(true);
-        OperateSr2.SetActive(true);
+        OperateIcon.SetActive(true);
     }
 
     public void SetSecondOp()
     {
-        OperateSr1.SetAlpha(0);
-        OperateSr2.SetAlpha(1);
+        OperateIcon.SetAlpha(1);
+        OperateIcon.material.shader = Shader.Find("Sprites/Default");
 
-        OperateSr1.SetActive(true);
-        OperateSr2.SetActive(true);
+        OperateIcon.SetActive(true);
     }
 
     public void SetThirdOp()
     {
-        OperateSr1.SetAlpha(0);
-        OperateSr2.SetAlpha(0.5f);
+        OperateIcon.SetAlpha(0.5f);
+        OperateIcon.material.shader = Shader.Find("Sprites/Default");
 
-        OperateSr1.SetActive(true);
-        OperateSr2.SetActive(true);
+        OperateIcon.SetActive(true);
     }
 
     public void CreateOp(int sequence)
@@ -239,17 +237,17 @@ public class Flower : ObjRoot, IPointerClickHandler
         if (random <= 0.3333333f)
         {
             OpType = OpType.Rip;
-            OperateSr2.sprite = ManaReso.Load<Sprite>("Rip", Folder.SpriteUI);
+            OperateIcon.sprite = ManaReso.Load<Sprite>("Rip", Folder.SpriteUI);
         }
         else if (random <= 0.6666666f)
         {
             OpType = OpType.Water;
-            OperateSr2.sprite = ManaReso.Load<Sprite>("Water", Folder.SpriteUI);
+            OperateIcon.sprite = ManaReso.Load<Sprite>("Water", Folder.SpriteUI);
         }
         else
         {
             OpType = OpType.Fertilize;
-            OperateSr2.sprite = ManaReso.Load<Sprite>("Fertilize", Folder.SpriteUI);
+            OperateIcon.sprite = ManaReso.Load<Sprite>("Fertilize", Folder.SpriteUI);
         }
 
         if (sequence == 0)
@@ -276,7 +274,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         {
             Phase++;
 
-            OperateSr1.SetActive(false);
+            OperateIcon.SetActive(false);
 
             return true;
         }
@@ -287,18 +285,8 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        ManaGarden.SeleFlower = this;
-
-        ManaGarden.SetFlowerCard(Id);
-
-        ManaReso.SetActive("H_Grid", false);
-        ManaReso.SetActive("H_Prev", false);
-        ManaReso.SetActive("H_Next", false);
-        ManaReso.SetActive("H_Place", false);
-        ManaReso.SetActive("H_Icon1", true);
-        ManaReso.SetActive("H_Retrieve", true);
-
         ManaReso.Get("G_Flower").TweenForCG();
-        ManaReso.Get("H_FlowerCard").TweenForCG();
+
+        ManaGarden.ShowRetrieveCard(FlowerInfo);
     }
 }

Assets/Script/Object/Garden.cs

@@ -5,10 +5,19 @@ using UnityEngine.EventSystems;
 using System.Collections;
 using System.Collections.Generic;
 
-public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandler
+public enum Direction
+{
+    Left,
+    Null,
+    Right,
+}
+
+public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandler, IBeginDragHandler
 {
     #region 变量
 
+    public int ValidPage;
+
     private int Page;
     private bool Flag1;
     private bool Flag2;
@@ -17,6 +26,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
     private float RatioBk4;
     private float RatioPlayer;
     private float SlideSpeed;
+    private Direction Direction;
     private Transform Player;
     private Transform GardenA;
     private Transform GardenBk2;
@@ -216,59 +226,107 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
     {
         if (Flag1 && Flag2)
         {
-            float rawDeltaX = Mathf.Abs(eventData.pressPosition.x - eventData.position.x);
-
-            if (eventData.delta.x < 0)
+            if (Direction == Direction.Null)
             {
-                #region MyRegion
-                
-                if (Page < GardenPosA.Count - 1)
+                if (eventData.delta.x > 0)
                 {
-                    float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
+                    Direction = Direction.Right;
+                }
+                else
+                {
+                    Direction = Direction.Left;
+                }
+            }
+            
+            if (Direction == Direction.Left)
+            {
+                if (eventData.delta.x > 0)
+                {
+                    Return();
+                }
+                else
+                {
+                    #region MyRegion
 
-                    Player.Translate(Player.right * tempX * RatioPlayer, Space.World);
+                    float rawDeltaX = eventData.position.x - eventData.pressPosition.x;
 
-                    GardenA.Translate(GardenA.right * tempX, Space.World);
-                    GardenBk2.Translate(GardenBk2.right * tempX * RatioBk2, Space.World);
-                    GardenBk3.Translate(GardenBk3.right * tempX * RatioBk3, Space.World);
-                    GardenBk4.Translate(GardenBk4.right * tempX * RatioBk4, Space.World);
-                }
+                    if (Page < ValidPage - 1)
+                    {
+                        float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
 
-                if (rawDeltaX > 300)
-                {
-                    if (Page < GardenPosA.Count - 1)
+                        Player.Translate(Player.right * tempX * RatioPlayer, Space.World);
+
+                        GardenA.Translate(GardenA.right * tempX, Space.World);
+                        GardenBk2.Translate(GardenBk2.right * tempX * RatioBk2, Space.World);
+                        GardenBk3.Translate(GardenBk3.right * tempX * RatioBk3, Space.World);
+                        GardenBk4.Translate(GardenBk4.right * tempX * RatioBk4, Space.World);
+
+                        if (rawDeltaX < -300)
+                        {
+                            NextPage();
+                        }
+                    }
+                    else
                     {
-                        NextPage();
+                        float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
+
+                        GardenA.Translate(GardenA.right * tempX, Space.World);
+
+                        if (GardenA.position.x - GardenPosA[ValidPage - 1].x < -0.7f)
+                        {
+                            GardenA.SetX(GardenPosA[ValidPage - 1].x - 0.7f);
+
+                            Return();
+                        }
                     }
-                }
 
-                #endregion
+                    #endregion
+                }
             }
-            else
+            else if (Direction == Direction.Right)
             {
-                #region MyRegion
-                
-                if (Page > 0)
+                if (eventData.delta.x < 0)
                 {
-                    float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
-
-                    Player.Translate(Player.right * tempX * RatioPlayer, Space.World);
-
-                    GardenA.Translate(GardenA.right * tempX, Space.World);
-                    GardenBk2.Translate(GardenBk2.right * tempX * RatioBk2, Space.World);
-                    GardenBk3.Translate(GardenBk3.right * tempX * RatioBk3, Space.World);
-                    GardenBk4.Translate(GardenBk4.right * tempX * RatioBk4, Space.World);
+                    Return();
                 }
-
-                if (rawDeltaX > 300)
+                else
                 {
+                    #region MyRegion
+
+                    float rawDeltaX = eventData.position.x - eventData.pressPosition.x;
+
                     if (Page > 0)
                     {
-                        PrevPage();
+                        float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
+
+                        Player.Translate(Player.right * tempX * RatioPlayer, Space.World);
+
+                        GardenA.Translate(GardenA.right * tempX, Space.World);
+                        GardenBk2.Translate(GardenBk2.right * tempX * RatioBk2, Space.World);
+                        GardenBk3.Translate(GardenBk3.right * tempX * RatioBk3, Space.World);
+                        GardenBk4.Translate(GardenBk4.right * tempX * RatioBk4, Space.World);
+
+                        if (rawDeltaX > 300)
+                        {
+                            PrevPage();
+                        }
+                    }
+                    else
+                    {
+                        float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * SlideSpeed;
+
+                        GardenA.Translate(GardenA.right * tempX, Space.World);
+
+                        if (GardenA.position.x - GardenPosA[0].x > 0.7f)
+                        {
+                            GardenA.SetX(GardenPosA[0].x + 0.7f);
+
+                            Return();
+                        }
                     }
-                }
 
-                #endregion
+                    #endregion
+                }
             }
         }
     }
@@ -281,6 +339,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         }
 
         Flag1 = true;
+        Direction = Direction.Null;
+    }
+
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        Direction = Direction.Null;
     }
 
     public void OnPointerClick(PointerEventData eventData)
@@ -290,25 +354,31 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
             return;
         }
         
-        if (eventData.rawPointerPress.transform.name.Contains("FlowerTra"))
+        if (eventData.rawPointerPress.transform.name.Contains("Slot"))
         {
-            FlowerCard flowerCard = ManaReso.Get<FlowerCard>("H_FlowerCard");
+            Slot slot = eventData.rawPointerPress.GetComponent<Slot>();
 
-            int id = -1;
+            if (slot.Valid == false)
+            {
+                return;
+            }
+
+            FlowerInfo flowerInfo = null;
+            FlowerCard flowerCard = ManaReso.Get<FlowerCard>("H_FlowerCard");
 
-            for (int i = 1; i < ManaGarden.FlowerInfoDic.Count + 1; i++)
+            for (int i = 0; i < ManaGarden.FlowerInfoList.Count; i++)
             {
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[i];
+                FlowerInfo temp = ManaGarden.FlowerInfoList[i];
 
-                if (flowerInfo.Plant == false && flowerInfo.Unlock)
+                if (temp.Plant == false && temp.Unlock)
                 {
-                    id = i;
+                    flowerInfo = temp;
 
-                    flowerCard.Add(flowerInfo);
+                    flowerCard.Add(temp);
                 }
             }
 
-            if (id == -1)
+            if (flowerInfo == null)
             {
                 ManaReso.Get("G_Flower").TweenForCG();
             }
@@ -323,9 +393,9 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
                 ManaReso.SetActive("H_Icon1", false);
                 ManaReso.SetActive("H_Retrieve", false);
 
-                ManaGarden.SelePosTra = eventData.rawPointerPress.transform;
+                ManaGarden.SeleSlot = slot;
 
-                ManaGarden.SetFlowerCard(id);
+                ManaGarden.SetFlowerCard(flowerInfo);
 
                 Auxiliary.Inst.DelayCall
                 (
@@ -348,6 +418,8 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     private void Return()
     {
+        Flag1 = false;
+
         Player.MoveVec(PlayerPos[Page], 0.25f, Curve.EaseOutQuad);
         GardenA.MoveVec(GardenPosA[Page], 0.25f, Curve.EaseOutQuad);
         GardenBk2.MoveVec(GardenPosBk2[Page], 0.25f, Curve.EaseOutQuad);

Assets/Script/Object/Skill/Pack.cs

@@ -229,7 +229,7 @@ public class Pack : SkillRoot
 
                 for (int i = 0; i < strings.Length; i++)
                 {
-                    strb.AppendFormat(" 获得<color=red>{0}</color>", ManaGarden.FlowerInfoDic[int.Parse(strings[i])].Name);
+                    strb.AppendFormat(" 获得<color=red>{0}</color>", ManaGarden.FlowerInfoList[int.Parse(strings[i])].Name);
                 }
             }
 
@@ -255,7 +255,7 @@ public class Pack : SkillRoot
 
             for (int i = 0; i < strings.Length; i++)
             {
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[int.Parse(strings[i])];
+                FlowerInfo flowerInfo = ManaGarden.FlowerInfoList[int.Parse(strings[i])];
 
                 if (flowerInfo.Unlock == false)
                 {

Assets/Script/Object/Slot.cs

@@ -0,0 +1,76 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class Slot : MonoBehaviour
+{
+    #region 变量
+
+    public bool Valid
+    {
+        get { return _Valid; }
+        set
+        {
+            _Valid = value;
+
+            if (_Valid)
+            {
+                Icon.SetActive(false);
+            }
+            else
+            {
+                Icon.SetActive(true);
+            }
+        }
+    }
+
+    private bool _Valid;
+
+    public int Id;
+    public bool Available;
+    public Flower Flower;
+    public FlowerInfo FlowerInfo;
+    public GameObject Icon;
+    public BoxCollider2D Collider;
+
+    #endregion
+
+	private void Awake()
+	{
+	    Icon = transform.GetChild(0).gameObject;
+	    Collider = GetComponent<BoxCollider2D>();
+	}
+
+
+    public void Plant(FlowerInfo flowerInfo)
+    {
+        FlowerInfo = flowerInfo;
+
+        Id = flowerInfo.Id;
+
+        Collider.enabled = false;
+
+        Available = false;
+
+        FlowerInfo.Slot = this;
+        FlowerInfo.Plant = true;
+
+        Flower = ManaReso.GetFlower(flowerInfo, this, true);
+
+        ManaGarden.PlantList.Add(this);
+    }
+
+    public void Retrieve()
+    {
+        Collider.enabled = true;
+
+        Available = true;
+
+        FlowerInfo.Plant = false;
+
+        ManaReso.Save(Flower);
+
+        ManaGarden.PlantList.Remove(this);
+    }
+}

Assets/Script/Object/Slot.cs.meta

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

Assets/Script/Tool/Auxiliary.cs

@@ -89,6 +89,11 @@ public class Auxiliary : MonoBehaviour
             ManaData.Pause = !ManaData.Pause;
         }
 
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            ManaReso.Get("K_QuitGame").TweenForCG();
+        }
+
         #endregion
 
         #region 输入检测
@@ -225,7 +230,7 @@ public class Auxiliary : MonoBehaviour
         int openIndex = 0;
         bool flag = false;
         bool group = false;
-
+        
         for (int i = 0; i < str.Length; i++)
         {
             if (group)
@@ -233,7 +238,7 @@ public class Auxiliary : MonoBehaviour
                 if (str[i] == '+' || str[i] == '-' || str[i] == '*' || str[i] == '/')
                 {
                     str = str.Replace(openIndex, i - 1, FmlParse2(str[index], str.Between(openIndex, index - 1), str.Between(index + 1, i - 1)));
-
+                    
                     i = 0;
                     group = false;
                 }
@@ -328,7 +333,7 @@ public class Auxiliary : MonoBehaviour
         {
             str = str.Replace(strings[i], strings[i + 1]);
         }
-
+        
         int openIndex = 0;
 
         for (int i = 0; i < str.Length; i++)
@@ -344,7 +349,7 @@ public class Auxiliary : MonoBehaviour
                 i = -1;
             }
         }
-
+        
         return double.Parse(FmlParse1(str));
     }
 }

Assets/Script/Tool/DashGame/CallBackUtil.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+using System.Collections;
+
+public class CallBackUtil
+{
+
+	public delegate void SimpleCallBack();
+	public delegate void IntCallBack(int value);
+    public delegate void StringCallback(string value);
+
+}
+

Assets/Script/Tool/DashGame/CallBackUtil.cs.meta

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

Assets/Script/Tool/Data.cs

@@ -189,9 +189,9 @@ public class Data
         
         for (int i = 0; i < ManaGarden.PlantList.Count; i++)
         {
-            attributes.Append(PlayerDoc.CreateAttribute(ManaGarden.PlantList[i].ParTra.name));
+            attributes.Append(PlayerDoc.CreateAttribute(ManaGarden.PlantList[i].name));
 
-            attributes[i].Value = ManaGarden.PlantList[i].Id.ToString();
+            attributes[i].Value = ManaGarden.PlantList[i].Flower.FlowerInfo.Id.ToString();
         }
     }
 
@@ -214,16 +214,19 @@ public class Data
         attributes[0].RemoveAll();
 
         XmlAttribute xmlAttribute = attributes.Append(PlayerDoc.CreateAttribute("ID"));
-        
-        foreach (var kv in ManaGarden.FlowerInfoDic)
+
+        for (int i = 0; i < ManaGarden.FlowerInfoList.Count; i++)
         {
-            if (kv.Value.Unlock)
+            if (ManaGarden.FlowerInfoList[i].Unlock)
             {
-                xmlAttribute.Value += kv.Key + " ";
+                xmlAttribute.Value += ManaGarden.FlowerInfoList[i].Id - 1;
+
+                if (i != ManaGarden.FlowerInfoList.Count - 1)
+                {
+                    xmlAttribute.Value += " ";
+                }
             }
         }
-
-        xmlAttribute.Value = xmlAttribute.Value.Trim(' ');
     }
 
     public  static void SavePlayerConfig()
@@ -361,32 +364,26 @@ public class Data
         XmlNode xmlNode = PlayerNode.SelectSingleNode("PlantList");
         xmlNode.RemoveAll();
 
-        XmlAttribute xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA1"));
+        XmlAttribute xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA1"));
+        xmlAttribute.Value = 0.ToString();
+
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA2"));
         xmlAttribute.Value = 1.ToString();
 
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA2"));
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA3"));
         xmlAttribute.Value = 2.ToString();
 
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA3"));
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA4"));
         xmlAttribute.Value = 3.ToString();
 
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA4"));
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA5"));
         xmlAttribute.Value = 4.ToString();
 
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA5"));
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA6"));
         xmlAttribute.Value = 5.ToString();
 
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA6"));
+        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SlotA7"));
         xmlAttribute.Value = 6.ToString();
-
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA7"));
-        xmlAttribute.Value = 7.ToString();
-
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA8"));
-        xmlAttribute.Value = 8.ToString();
-
-        xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("FlowerTraA9"));
-        xmlAttribute.Value = 9.ToString();
     }
 
     private static void ResetCommon()
@@ -409,7 +406,7 @@ public class Data
 
         XmlAttribute xmlAttribute = attributes.Append(PlayerDoc.CreateAttribute("ID"));
 
-        xmlAttribute.Value = "1 2 3 4 5 6 7 8 9 10";
+        xmlAttribute.Value = "0 1 2 3 4 5 6 7 8 9";
     }
 
     public  static void ResetPlayerConfig()

Assets/Script/Tool/Extension.cs

@@ -144,10 +144,14 @@ public static class Extension
 
     public static string Between(this string str, int startIndex, int endIndex)
     {
-        if (startIndex >= endIndex)
+        if (startIndex > endIndex)
         {
             return "";
         }
+        else if (startIndex == endIndex)
+        {
+            return str[startIndex].ToString();
+        }
         else
         {
             return str.Substring(startIndex, endIndex - startIndex + 1);

Assets/Script/Tool/UI/FlowerCard.cs

@@ -133,7 +133,7 @@ public class FlowerCard : MonoBehaviour
             SeleItem.TweenForScale();
             SeleItem.transform.SetAsLastSibling();
 
-            ManaGarden.SetFlowerCard(InfoList[index].Id);
+            ManaGarden.SetFlowerCard(InfoList[index]);
 
             Vector3 delta = ScrollRect.transform.position - SeleItem.transform.position;
 
@@ -211,7 +211,7 @@ public class FlowerCard : MonoBehaviour
             SeleItem = ScrollSeleItem;
             SelectIndex = ScrollSelectIndex;
 
-            ManaGarden.SetFlowerCard(InfoList[ScrollSelectIndex].Id);
+            ManaGarden.SetFlowerCard(InfoList[ScrollSelectIndex]);
         }
     }
 

MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,16 +11,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

MyLovelyGarden.txt

@@ -1,3 +1,5 @@
+签到改用强关系
+
 小游戏奖励加成
 
 Tab的Shader

PopUp/AlertPanel.meta

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

PopUp/AlertPanel/AlertCloseEvent.cs

@@ -0,0 +1,13 @@
+using System;
+
+public class AlertCloseEvent
+{
+
+	public uint detail;
+	public AlertPanel target;
+
+	public AlertCloseEvent ()
+	{
+	}
+}
+

PopUp/AlertPanel/AlertCloseEvent.cs.meta

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

PopUp/AlertPanel/AlertPanel.cs

@@ -0,0 +1,305 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System;
+using System.Collections;
+
+public class AlertPanel : PopUpPanel {
+
+    public enum AlertPanelType
+    {
+        Bordered,
+        Fluted
+    }
+    public Animator panelType;
+
+	public const uint TIME_OUT = 0;
+	public const uint YES = 0x1;
+	public const uint NO = 0x2;
+	public const uint OK = 0x4;
+	public const uint CANCEL = 0x8;
+
+	public uint flags;
+
+	protected string _okLabel;
+	protected string _yesLabel;
+	protected string _noLabel;
+	protected string _cancelLabel;
+
+	public Button okBtn;
+	public Button yesBtn;
+	public Button noBtn;
+	public Button cancelBtn;
+    public Button closeBtn;
+
+	public Text yesBtnText;
+	public Text noBtnText;
+	public Text cancelBtnText;
+    public Text titleText;
+
+    public Sprite redBtn, greenBtn;
+
+	public Text contentText;
+	protected float oldTextHeight = 0;
+
+	protected event AlertPanelCloseDelegate closeEvent;
+	public object data;
+
+	void Awake()
+	{
+        InitBackGround(transform);
+
+        Transform panelTrans = transform.FindChild("Panel");
+        panelType = panelTrans.GetComponent<Animator>();
+        yesBtn = panelTrans.FindChild("BtnContainer/YesBtn").GetComponent<Button>();
+        noBtn = panelTrans.FindChild("BtnContainer/NoBtn").GetComponent<Button>();
+        cancelBtn = panelTrans.FindChild("BtnContainer/CancelBtn").GetComponent<Button>();
+        if (panelTrans.FindChild("BtnContainer/OkBtn") != null)
+            okBtn = panelTrans.FindChild("BtnContainer/OkBtn").GetComponent<Button>();
+        yesBtnText = yesBtn.transform.FindChild("Text").GetComponent<Text>();
+        noBtnText = noBtn.transform.FindChild("Text").GetComponent<Text>();
+        cancelBtnText = cancelBtn.transform.FindChild("Text").GetComponent<Text>();
+        titleText = panelTrans.FindChild("TitleContainer/Title").GetComponent<Text>();
+        closeBtn = panelTrans.FindChild("CloseButton").GetComponent<Button>();
+
+        if (panelTrans.FindChild("ButtonImage") != null)
+        {
+            redBtn = panelTrans.FindChild("ButtonImage").GetChild(0).GetComponent<Image>().sprite;
+            greenBtn = panelTrans.FindChild("ButtonImage").GetChild(1).GetComponent<Image>().sprite;
+        }
+
+        contentText = panelTrans.FindChild("Line/Text").GetComponent<Text>();
+
+        //redefine font
+        if (Language.initialized)
+        {
+            if (okBtn != null)
+                okBtn.GetComponentInChildren<Text>().font = Language.GetFont();
+            contentText.font = Language.GetFont();
+            titleText.font = Language.GetFont();
+            yesBtnText.font = Language.GetFont();
+            noBtnText.font = Language.GetFont();
+            cancelBtnText.font = Language.GetFont();
+        }
+        else
+        {
+            if (okBtn != null)
+                okBtn.GetComponentInChildren<Text>().font = Language.GetSystemFont();
+            contentText.font = Language.GetSystemFont();
+            titleText.font = Language.GetSystemFont();
+            yesBtnText.font = Language.GetSystemFont();
+            noBtnText.font = Language.GetSystemFont();
+            cancelBtnText.font = Language.GetSystemFont();
+        }
+
+        
+
+        //init sound
+        if (okBtn != null)
+        {
+            //UISound okBtnSound = okBtn.gameObject.AddComponent<UISound>();
+            //okBtnSound.soundType = UISound.Type.Normal;
+            SoundManager.RegisterUISound(okBtn.gameObject, UISound.Type.Normal);
+        }
+        //UISound yesBtnSound = yesBtn.gameObject.AddComponent<UISound>();
+        //yesBtnSound.soundType = UISound.Type.Normal;
+        //UISound noBtnSound = noBtn.gameObject.AddComponent<UISound>();
+        //noBtnSound.soundType = UISound.Type.Back;
+        //UISound cancelBtnSound = cancelBtn.gameObject.AddComponent<UISound>();
+        //cancelBtnSound.soundType = UISound.Type.Back;
+
+        SoundManager.RegisterUISound(yesBtn.gameObject, UISound.Type.Normal);
+        SoundManager.RegisterUISound(noBtn.gameObject, UISound.Type.Back);
+        SoundManager.RegisterUISound(cancelBtn.gameObject, UISound.Type.Back);
+
+        SoundManager.RegisterUISound(closeBtn, UISound.Type.Close);
+        
+
+
+        if(okBtn != null)
+        {
+            okBtn.onClick.AddListener(
+                delegate
+                {
+                    OnClick((int)OK);
+                });
+        }
+        yesBtn.onClick.AddListener(
+            delegate
+            {
+                OnClick((int)YES);
+            });
+        noBtn.onClick.AddListener(
+            delegate
+            {
+                OnClick((int)NO);
+            });
+        cancelBtn.onClick.AddListener(
+            delegate
+            {
+                OnClick((int)CANCEL);
+            });
+        closeBtn.onClick.AddListener(Close);
+    }
+
+	public string okLabel
+	{
+		set
+		{
+			_okLabel = value;
+            if ((flags & OK) != 0)
+            { 
+				yesBtnText.text = value;
+                //yesBtn.GetComponent<Image>().sprite = redBtn;
+            }
+		}
+		get
+		{
+			return _okLabel;
+		}
+	}
+
+	public string yesLabel
+	{
+		set
+		{
+			_yesLabel = value;
+            if ((flags & YES) != 0)
+            {
+                yesBtnText.text = value;
+                //yesBtn.GetComponent<Image>().sprite = redBtn;
+            }
+		}
+		get
+		{
+			return _yesLabel;
+		}
+	}
+
+	public string noLabel
+	{
+		set
+		{
+			_noLabel = value;
+            if ((flags & NO) != 0)
+            {
+				noBtnText.text = value;
+                //noBtnText.GetComponent<Image>().sprite = greenBtn;
+            }
+		}
+		get
+		{
+			return _noLabel;
+		}
+	}
+
+	public string cancelLabel
+	{
+		set
+		{
+			_cancelLabel = value;
+            if ((flags & CANCEL) != 0)
+            {
+				cancelBtnText.text = value;
+                //cancelBtnText.GetComponent<Image>().sprite = greenBtn;
+            }
+		}
+		get
+		{
+			return _cancelLabel;
+		}
+	}
+
+
+	public virtual void OnClick(int detail)
+	{
+		if((flags & OK) != 0 && detail == YES)
+			detail = (int)OK;
+
+		AlertCloseEvent evt = new AlertCloseEvent();
+		evt.detail = (uint)detail;
+		evt.target = this;
+
+        GameTime.timeScale = 1;
+
+		if(closeEvent != null)
+		{
+			closeEvent(evt);
+		}
+        Close();
+    }
+
+    override public void Close()
+    {
+        OnClose();
+        //PopUpManager.RemovePopUp(this);
+    }
+
+    void OnDestroy()
+    {
+        if (yesBtn != null) yesBtn.onClick.RemoveAllListeners();
+        if (noBtn != null) noBtn.onClick.RemoveAllListeners();
+        if (cancelBtn != null) cancelBtn.onClick.RemoveAllListeners();
+        if(closeBtn != null)
+            closeBtn.onClick.RemoveAllListeners();
+    }
+
+	public delegate void AlertPanelCloseDelegate(AlertCloseEvent evt);
+
+
+	public static AlertPanel Show(string txt="", uint flags=0x4, AlertPanelCloseDelegate closeHandler=null, string title = null, bool showClose = false, bool pauseGame = false)
+	{
+		AlertPanel alertPanel = (AlertPanel)PopUpManager.AddPopUp(ResourcesUtil.GetInstance().GetGameObject("UI/AlertPanel/AlertPanel" + Language.lanForUI), null, true, typeof(AlertPanel));
+
+		alertPanel.flags = flags;
+		if(closeHandler != null)
+			alertPanel.closeEvent += closeHandler;
+
+		alertPanel.contentText.text = txt;
+        if (title == null)
+            alertPanel.titleText.text = Language.GetStr("AlertPanel", "title");
+        else if (title != "")
+            alertPanel.titleText.text = title;
+        else
+            alertPanel.titleText.gameObject.SetActive(false);
+
+		if((flags & OK) == 0 && (flags & YES) == 0)
+		{
+			GameObject.Destroy(alertPanel.yesBtn.gameObject);
+		}
+		else
+		{
+			if((flags & OK) != 0)
+            {
+                if (Language.IsLanguageInit())
+                    alertPanel.yesBtnText.text = Language.GetStr("Public", "ok");
+                else
+                    alertPanel.yesBtnText.text = "OK";
+            }
+			else if((flags & YES) != 0)
+				alertPanel.yesBtnText.text = Language.GetStr("Public", "yes");
+		}
+
+
+		if((flags & NO) == 0)
+			GameObject.Destroy(alertPanel.noBtn.gameObject);
+		else
+			alertPanel.noBtnText.text = Language.GetStr("Public", "no");
+
+
+		if((flags & CANCEL) == 0)
+			GameObject.Destroy(alertPanel.cancelBtn.gameObject);
+		else
+			alertPanel.cancelBtnText.text = Language.GetStr("Public", "cancel");
+
+        alertPanel.closeBtn.gameObject.SetActive(showClose);
+        //alertPanel.panelType.Play(type.ToString());
+
+        if (pauseGame)
+        {
+            if (Session.GetInstance().networkMode == Session.NetworkMode.OffLine)
+                GameTime.timeScale = 0;
+        }
+
+		return alertPanel;
+	}
+}

PopUp/AlertPanel/AlertPanel.cs.meta

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

PopUp/PopUpManager.cs

@@ -0,0 +1,149 @@
+using UnityEngine;
+using System.Collections;
+
+public class PopUpManager : MonoBehaviour {
+
+	public static bool modal = false;
+
+	public static void UpdateModal()
+	{
+		PopUpPanel[] popUpPanels = GameObject.FindObjectsOfType<PopUpPanel>();
+		for(int i=0; i<popUpPanels.Length; i++)
+		{
+			PopUpPanel panel = popUpPanels[i];
+			if(panel.gameObject.activeSelf && panel.modal == true)
+			{
+				modal = true;
+				return;
+			}
+		}
+		modal = false;
+	}
+
+	public static PopUpPanel AddPopUp(GameObject panelPrefab, Transform parent=null, bool modal=false, System.Type panelType=null)
+	{
+		if(panelPrefab == null)
+			return null;
+
+		GameObject gameObj = Instantiate(panelPrefab) as GameObject;
+        PopUpPanel panel = null;
+        if (panelType != null)
+        {
+			System.Type popType = panelType.GetType();
+//			panel = (PopUpPanel)(DllManager.instance.AddCompotent<popType>(gameObj, popType.ToString()));
+            panel = (PopUpPanel)gameObj.AddComponent(panelType);
+        }
+        else
+        {
+            panel = gameObj.GetComponent<PopUpPanel>();
+        }
+
+		//panel.gameObject.AddComponent<PopUpUtil>();
+
+        DllManager.instance.AddCompotent<PopUpUtil>(panel.gameObject, "PopUpUtil");
+
+        Vector3 originSizeDelta = panel.GetComponent<RectTransform>().sizeDelta;
+
+		if(parent == null)
+		{
+			MainCanvas canvas = GameObject.FindObjectOfType<MainCanvas>();
+			//parent = canvas.transform.FindChild("UIRoot");
+            PopUpManager.AddToForwardCanvas(gameObj);
+		}
+
+		panel.modal = modal;
+		panel.Added();
+		UpdateModal();
+		return panel;
+	}
+
+	public static void AddToMainCanvas(GameObject gameObj, Transform parent = null)
+	{
+		RectTransform rectTrans = gameObj.GetComponent<RectTransform>();
+		if(rectTrans != null)
+		{
+			Vector3 originPos = rectTrans.localPosition;
+			Vector3 originSizeDelta = rectTrans.sizeDelta;
+			Vector3 originRotation = rectTrans.localEulerAngles;
+
+			if(parent == null)
+			{
+				MainCanvas canvas = GameObject.FindObjectOfType<MainCanvas>();
+				parent = canvas.transform.FindChild("UIRoot");
+			}
+			gameObj.transform.SetParent(parent);
+	        gameObj.transform.localScale = new Vector3(1f, 1f, 1f);
+			rectTrans.localPosition = originPos;
+			rectTrans.sizeDelta = originSizeDelta;
+			rectTrans.localEulerAngles = originRotation;
+		}
+		else
+		{
+			Vector3 pos =gameObj.transform.localPosition;
+			Vector3 scale = gameObj.transform.localScale;
+			if(parent == null)
+			{
+				MainCanvas canvas = GameObject.FindObjectOfType<MainCanvas>();
+				parent = canvas.transform.FindChild("UIRoot");
+			}
+			gameObj.transform.SetParent(parent);
+			gameObj.transform.localScale = scale;
+			gameObj.transform.localPosition = pos;
+		}
+	}
+
+	public static void AddToForwardCanvas(GameObject gameObj, Transform parent = null)
+	{
+		RectTransform rectTrans = gameObj.GetComponent<RectTransform>();
+		if(rectTrans != null)
+		{
+			Vector3 anchoredPosition3D = rectTrans.anchoredPosition3D;
+			Vector3 originSizeDelta = rectTrans.sizeDelta;
+			Vector3 originRotation = rectTrans.localEulerAngles;
+			
+			if(parent == null)
+			{
+				ForwardCanvas canvas = GameObject.FindObjectOfType<ForwardCanvas>();
+				parent = canvas.transform.FindChild("UIRoot");
+			}
+			gameObj.transform.SetParent(parent);
+			gameObj.transform.localScale = new Vector3(1f, 1f, 1f);
+			rectTrans.anchoredPosition3D = anchoredPosition3D;
+			rectTrans.sizeDelta = originSizeDelta;
+			rectTrans.localEulerAngles = originRotation;
+		}
+		else
+		{
+			Vector3 pos =gameObj.transform.localPosition;
+			Vector3 scale = gameObj.transform.localScale;
+			if(parent == null)
+			{
+				MainCanvas canvas = GameObject.FindObjectOfType<MainCanvas>();
+				parent = canvas.transform.FindChild("UIRoot");
+			}
+			gameObj.transform.SetParent(parent);
+			gameObj.transform.localScale = scale;
+			gameObj.transform.localPosition = pos;
+		}
+	}
+
+    public static void ClearForwardCanvas()
+    {
+        ForwardCanvas canvas = GameObject.FindObjectOfType<ForwardCanvas>();
+        Transform parent = canvas.transform.FindChild("UIRoot");
+
+        int count = parent.childCount - 1;
+        for (int i = count; i > -1; i--)
+        {
+            PopUpPanel panel = parent.GetChild(i).GetComponent<PopUpPanel>();
+            if (panel != null)
+                Destroy(panel.gameObject);// panel.OnClose();
+        }
+    }
+
+	public static void RemovePopUp(PopUpPanel panel)
+	{
+		Destroy(panel.gameObject);
+		UpdateModal();
+	}
+}

PopUp/PopUpManager.cs.meta

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

PopUp/PopUpPanel.cs

@@ -0,0 +1,72 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+
+public abstract class PopUpPanel : MonoBehaviour
+{
+	private bool _modal;
+
+    public Image backGround;
+
+    public bool PlayAnimationStart = true;
+    public bool PlayAnimationEnd = true;
+
+    public bool NoEspScale = false;
+
+    public enum Type : int
+    {
+        NONE = -1,
+        SCALE_UP = 0,
+        SCALE_DOWN = 1,
+        ROTATION_Y = 2,
+        ROSITION_X_UP = 3,
+        ROSITION_X_DOWN = 4,
+        ROSITION_Y_UP = 5,
+        ROSITION_Y_DOWN = 6,
+    }
+
+    public void InitBackGround(Transform BG)
+    {
+        backGround = BG.GetComponent<Image>();
+    }
+
+    public Type type = Type.NONE;
+
+	public bool modal
+	{
+		set{_modal = value;}
+		get{return _modal;}
+	}
+
+	public virtual void Added()
+	{
+
+	}
+
+	public virtual void Remove()
+	{
+		Destroy(this.gameObject);
+		PopUpManager.UpdateModal();
+	}
+
+    /// <summary>
+    /// ±ØÐëµ÷Óà OnClose·½·¨
+    /// </summary>
+    public abstract void Close();
+
+    public void OnClose()
+    {
+        PopUpUtil popUpUtil = this.GetComponent<PopUpUtil>();
+        if (popUpUtil != null)
+        {
+            popUpUtil.Close();
+        }
+        else
+        {
+            Destroy(this.gameObject);
+        }
+    }
+
+    
+}
+

PopUp/PopUpPanel.cs.meta

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

PopUp/PopUpUtil.cs

@@ -0,0 +1,61 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+
+public class PopUpUtil : MonoBehaviour {
+
+    private Color color;
+    private float bga = -1;
+    private Image bg = null;
+    private bool playAnimationEnd;
+    public static System.Random random = new System.Random();
+    void OnDestroy () {
+		PopUpManager.UpdateModal();
+	}
+
+    void Start()
+    {
+          //transform.GetComponent<PopUpPanel>().type;
+        PopUpPanel popupPanel = transform.GetComponent<PopUpPanel>();
+        bg = popupPanel.backGround;
+        playAnimationEnd = popupPanel.PlayAnimationEnd;
+        if (!popupPanel.PlayAnimationStart)
+        {
+            return;
+        }
+                
+        if (bg != null)
+        {
+            color = bg.color;
+            bga = bg.color.a;
+            color.a = 0;
+            bg.color = color;
+        }
+
+        
+
+    }
+
+    public void Close()
+    {
+        if (!playAnimationEnd)
+        {
+            Destroy(this.gameObject);
+            return;
+        }
+        if (bg != null)
+        {
+            color.a = 0;
+        }
+        else
+        {
+            CloseMove();
+        }
+        
+    }
+
+    private void CloseMove()
+    {
+        
+    }
+}

PopUp/PopUpUtil.cs.meta

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

iOS.xml

@@ -0,0 +1,387 @@
+<assetbundle>
+  <a p="audioclip\sound_bt_buff_electric" m="53c16a8a2888513c0e83ff37c7ad230" />
+  <a p="audioclip\sound_bt_buff_fire" m="68832b117c871d10fcb5f32804bae7" />
+  <a p="audioclip\sound_bt_buff_frost" m="e672b2fa7e21ba7ca3eea75d84b6fc9f" />
+  <a p="audioclip\sound_bt_buff_frozen" m="c93336c36e521d5970b3c9b2da7fd42" />
+  <a p="audioclip\sound_bt_buff_lock" m="434974a76b3e5b9833715e41b093b45f" />
+  <a p="audioclip\sound_bt_buff_recover" m="20b77bfc2712604a2ce5429a8b846d58" />
+  <a p="audioclip\sound_bt_buff_seal" m="855c34f627d6e72c2d304e1d76a0e724" />
+  <a p="audioclip\sound_bt_buff_volcano" m="14204bf28ff396557bbe6f62a176379" />
+  <a p="audioclip\sound_bt_char01_atk" m="a95fa1d6307ccfb233d7f8f76be14fa9" />
+  <a p="audioclip\sound_bt_char01_die" m="109573f2ffd371f8fd8e13dd44d04f1e" />
+  <a p="audioclip\sound_bt_char01_skill_01" m="1c4149af26278f0a55a1654b5cd73ff" />
+  <a p="audioclip\sound_bt_char01_throw" m="576eb34747fb28d0efe0a21a52de402d" />
+  <a p="audioclip\sound_bt_char01_wskill_01" m="5d15e2e51521c8ae80a62f0c868488" />
+  <a p="audioclip\sound_bt_char02_atk" m="c32ead5512c3537e11c665ecbea5d7f" />
+  <a p="audioclip\sound_bt_char02_die" m="652bac6e38ef2d1456760622fbda3" />
+  <a p="audioclip\sound_bt_char02_skill_01" m="ea14ae51c621f3d9e813441b477bb35" />
+  <a p="audioclip\sound_bt_char02_skill_02" m="46535d435a1b5c7c5baa2e8d8cf8040" />
+  <a p="audioclip\sound_bt_char02_throw" m="60545ba8315b874e88a7a7c67fd3bc" />
+  <a p="audioclip\sound_bt_char02_wskill_01" m="8a4ddf33504eff97daf1eefaa35f4f1d" />
+  <a p="audioclip\sound_bt_hit_01" m="61e2b6b1b01a71eecde7aa1f5cf658f" />
+  <a p="audioclip\sound_bt_hit_02" m="ac3d94070e3c06441b177dd3af464ec" />
+  <a p="audioclip\sound_bt_hit_03" m="b246bebb541749718697df43bb24b65" />
+  <a p="audioclip\sound_bt_hit_04" m="48fb04cf45f9f571647b1536f9d1b" />
+  <a p="audioclip\sound_bt_hit_05" m="632dad878990e4f7aa24b3ab7172cf1d" />
+  <a p="audioclip\sound_bt_npc1001_atk" m="288f7888a2729a296bfa631893634b9" />
+  <a p="audioclip\sound_bt_npc1001_die" m="95be6191133632b5e7ec1f865fdb81" />
+  <a p="audioclip\sound_bt_npc1001_skill" m="d77bc8d3548c5fc818f22ac68c92cb7" />
+  <a p="audioclip\sound_bt_npc1006_atk" m="e697ba94d87f73129f3897ae1cd079" />
+  <a p="audioclip\sound_bt_npc1006_die" m="47e91186cecaa583f83fac13552c20" />
+  <a p="audioclip\sound_bt_npc1006_skill" m="1b193549d5f1b7b643701a983b55a1a" />
+  <a p="audioclip\sound_bt_npc1007_atk" m="6d619a37b79b31746bd9b843195b777" />
+  <a p="audioclip\sound_bt_npc1007_die" m="e07139616b755f2bd56673bfc13470aa" />
+  <a p="audioclip\sound_bt_npc1007_skill" m="75ec3e9c3aa53fce227932d95141a88" />
+  <a p="audioclip\sound_bt_npc1020_atk" m="92e62935478a37d95f647cf836d4318" />
+  <a p="audioclip\sound_bt_npc1020_die" m="6c65d3641494d876b346e802a434659" />
+  <a p="audioclip\sound_bt_npc1020_skill" m="2fe26dd3b4cd6186b03efedbd6e57853" />
+  <a p="audioclip\sound_bt_npc501_atk" m="cb97b2419dd483c3a8d39e1cfd6ab855" />
+  <a p="audioclip\sound_bt_npc501_die" m="3090fa2e17d23f5151516360df9f3bfa" />
+  <a p="audioclip\sound_bt_npc501_skill" m="dd8fb26c5af741183ef43e97d24ab8" />
+  <a p="audioclip\sound_bt_npc506_atk" m="ef5dd7395dc6dff8adf71b86637c63" />
+  <a p="audioclip\sound_bt_npc506_skill" m="c3dc868b8a6ba5ea7d753ca9ba26ff1" />
+  <a p="audioclip\sound_bt_npc507_atk" m="fdabff3e1564cd51afe579ac5f32d8" />
+  <a p="audioclip\sound_bt_npc507_die" m="bc17df16c79c71256ef56b1bc064703e" />
+  <a p="audioclip\sound_bt_npc507_skill" m="8d24eaaf684dec22675868a902181c7" />
+  <a p="audioclip\sound_bt_npc508_atk" m="7b9617c32b4dd526b418c1dc22f7b7" />
+  <a p="audioclip\sound_bt_npc508_skill" m="a95fb3b1f2e49a14d2c3f7c5c4f4135" />
+  <a p="audioclip\sound_bt_npc600_atk" m="d1f066dd7cfa7f635d8eb9d28293c61" />
+  <a p="audioclip\sound_bt_npc600_die" m="f458a30b632ff672f30ea421a6ff654" />
+  <a p="audioclip\sound_bt_npc600_skill" m="dbb249945431fef3946746f1d1c76716" />
+  <a p="audioclip\sound_bt_pc1_atk" m="a62f1d4f24fb104dd86a1ee5bc2d5a" />
+  <a p="audioclip\sound_bt_pc1_die" m="de2a48e598c96e5458d44c893ff3539" />
+  <a p="audioclip\sound_bt_pc1_skill" m="d11cd581beb6e58ff1952e6451e67a8c" />
+  <a p="audioclip\sound_bt_pc1_skill02" m="8776c9bbc0f9b6a873899f3a6f86a48d" />
+  <a p="audioclip\sound_bt_pc1_super" m="cb168c1635bed283d01d2ac3b09f07c" />
+  <a p="audioclip\sound_bt_pc1_throw" m="92792b1eefeb97c8cb91f3bd133a576" />
+  <a p="audioclip\sound_bt_pc3_atk" m="5e875384fa8364c26f2f1f62fea2487" />
+  <a p="audioclip\sound_bt_pc3_die" m="caa8d848f2e97d2728da5e198d511d65" />
+  <a p="audioclip\sound_bt_pc3_skill_02" m="17035646d2daf558fd1e545a34703" />
+  <a p="audioclip\sound_bt_pc7_atk" m="14962fc0d28a2cb7789bb15ad7bfbe4" />
+  <a p="audioclip\sound_bt_pc7_die" m="eae6a9d2dd0d4fbb9f6275898b174db" />
+  <a p="audioclip\sound_bt_pc7_skill_01" m="f79354e565fa999733f697c0db449d2a" />
+  <a p="audioclip\sound_bt_pc7_throw" m="712670e47b3f67911b99b13f12867d6" />
+  <a p="audioclip\sound_bt_pc7_wskill_01" m="b265fdffc49648b331931d4b14dde4" />
+  <a p="audioclip\sound_bt_pc8_atk" m="dab962d37c4b8f47c8a18805adb642e" />
+  <a p="audioclip\sound_bt_pc8_chainattack" m="aae6eb972ef55a29e243cc5fefed624" />
+  <a p="audioclip\sound_bt_pc8_die" m="8ae149ccf028e9acd4d29aa13d69e0d1" />
+  <a p="audioclip\sound_bt_pc8_skill_01" m="668c4a9bb70de74a952ccdc4719759d" />
+  <a p="audioclip\sound_bt_pc8_throw" m="71e02d1a4847256503a6ced5fb38a" />
+  <a p="audioclip\battle\music_battle_ancient_01" m="9eed77bf8761f52ec8ef6f9fe3272b2" />
+  <a p="audioclip\battle\music_battle_lose" m="8089a29b345dd82d1a549e7dfb25339" />
+  <a p="audioclip\battle\music_battle_modern_01" m="71a4112e044f3a18df7ac36bcdb12d6" />
+  <a p="audioclip\battle\music_battle_space_01" m="49ecbd3fa2bdeb392207e14918d748b" />
+  <a p="audioclip\battle\music_battle_win" m="397483e85b6fc0ea22232c62ceebe173" />
+  <a p="audioclip\battle\sound_bt_qwaquire" m="dbb330f07a5cf5cd5fe2386aa93827d" />
+  <a p="audioclip\battle\sound_se_battlestart" m="f9c7ea6b7b81ca7cc59db248cf4cb7ed" />
+  <a p="audioclip\battle\sound_se_illustration" m="e2d01c5cba5043160ba5aa54d345b6a" />
+  <a p="audioclip\grid\sound_bt_qwappear" m="422746eccef320e19f52157cc788aff8" />
+  <a p="audioclip\grid\sound_bt_qwchange" m="943665efebb9f87579e8232718987129" />
+  <a p="audioclip\grid\sound_bt_qwdisappear" m="822084383d575e57050c528d139e548" />
+  <a p="audioclip\grid\sound_bt_qwdisappear1" m="f61e2714c1f12818f0162ad53387a29" />
+  <a p="audioclip\grid\sound_bt_qwdisappear2" m="9973938a5e9aafb42817b22f36e7ab43" />
+  <a p="audioclip\grid\sound_bt_qwdisappear3" m="7bf5918477a91f70365c20671bf5b8f8" />
+  <a p="audioclip\grid\sound_bt_qwselect" m="e9ccf091161bea226572806fc4446e52" />
+  <a p="audioclip\public\sound_bt_starget1" m="76b58c87c105db08158fb79ee806474" />
+  <a p="audioclip\public\sound_bt_starget2" m="eb675a2f22e78c044e3ae27b3b562b5" />
+  <a p="audioclip\public\sound_bt_starshine" m="58c935e47e4aac18b0f5f65bdbea5c41" />
+  <a p="audioclip\tutorial\sound_tutorial_chuanyue" m="984a40dbcd5dbe2c4fbd741b1794f9fe" />
+  <a p="audioclip\tutorial\sound_tutorial_impact" m="5d2ffd407fa87a8d3e5f4bffd02c9c" />
+  <a p="audioclip\tutorial\sound_tutorial_warning" m="1d5e816e2f8039988696a8bbb4922" />
+  <a p="audioclip\ui\music_main_home_01" m="4ab944ed23fee257caae665b7262b2" />
+  <a p="audioclip\ui\music_main_intro" m="d851eb73409b89eb294fb5c35ecdb725" />
+  <a p="audioclip\ui\music_main_login_01" m="464961d4178b3cc17a2d5c7ee53dcd5" />
+  <a p="audioclip\ui\sound_dialogue_click" m="dd5a9968fbd3ba46f1ae1e9c4be7ea67" />
+  <a p="audioclip\ui\sound_se_eggbounce" m="cca16b97fa155139ec08ffe609fee45" />
+  <a p="audioclip\ui\sound_se_egglong" m="46f5b2f0c3f91e45bcc58c2bad79c7d9" />
+  <a p="audioclip\ui\sound_se_eggopen" m="8d8167b76256193102db67cec5dbd35" />
+  <a p="audioclip\ui\sound_se_eggshort" m="74d9fdb0b7cf38556383e4d2ff3c742d" />
+  <a p="audioclip\ui\sound_se_equip" m="d644abef56703e5439639679827e635" />
+  <a p="audioclip\ui\sound_se_fusion" m="7e92ad413ffbfcf13f6ce848367574" />
+  <a p="audioclip\ui\sound_se_general_01" m="1b1b3a9fc64cc3e585eef4ddb0946d" />
+  <a p="audioclip\ui\sound_se_general_02" m="ad4069a5af92af3e59f1d340112c1abf" />
+  <a p="audioclip\ui\sound_se_general_03" m="8d85dae48e8153b347a67599ae3e521a" />
+  <a p="audioclip\ui\sound_se_general_04" m="67e232895e49a24841e9ffcadfca3d38" />
+  <a p="audioclip\ui\sound_se_general_05" m="804d52ef8867b19a3249a547b394d048" />
+  <a p="audioclip\ui\sound_se_general_06" m="8672ae9ad71face43411fc76b188ed" />
+  <a p="audioclip\ui\sound_se_itemout" m="dbfa267718794cc7b44a95f874ef8797" />
+  <a p="audioclip\ui\sound_se_quest" m="4a451a8dff85cebb961022da1ac2159" />
+  <a p="audioclip\ui\sound_se_rankup" m="8174d25d39871ee6f2f45f5fbed9571" />
+  <a p="effect\acttx_1\acttx_1_1004" m="2d1761ab39b6680ec0298bbc7fc2ca" />
+  <a p="effect\acttx_1\acttx_1_11" m="99d9a8e49e9579dfd10b4eae05470c6" />
+  <a p="effect\acttx_1\acttx_1_attck" m="ade597786a3d5b67f8015630c3b3db" />
+  <a p="effect\acttx_1\acttx_1_super" m="52de85f29e963a345660476d3c30c79" />
+  <a p="effect\acttx_1\acttx_1_throw" m="9a24335d2f0753b82fced1723f14c4" />
+  <a p="effect\acttx_1001\acttx_1001_attack" m="94954b2e067a912f73fcb1b6824133a" />
+  <a p="effect\acttx_1001\acttx_1001_in" m="38b4bb6ccef23fbf862ba1f882873e1" />
+  <a p="effect\acttx_1001\acttx_1001_skill01" m="761919e63b4582edc0492623d16fedd" />
+  <a p="effect\acttx_1001\acttx_1001_wait01" m="51cf6ef823e424bcd0b1968c619ece3" />
+  <a p="effect\acttx_1006\acttx_1006_attack" m="3bc4ee35a241b7e8114544f5a4f4e5d" />
+  <a p="effect\acttx_1006\acttx_1006_skill01" m="13e58fc8c2d9e9e7cb18cccb5cf4fd" />
+  <a p="effect\acttx_1007\acttx_1007_attack" m="4fabe18edc14fb36b245128c9fd13e" />
+  <a p="effect\acttx_1007\acttx_1007_skill01" m="cd481dabb62edcc24bd8fe4e66b148" />
+  <a p="effect\acttx_1020\acttx_1020_attack" m="ef6d8e145b567c932e87d04a3c375b63" />
+  <a p="effect\acttx_1020\acttx_1020_skill01" m="1e6ed17afa2edef8137d7d88b3433eea" />
+  <a p="effect\acttx_1020\acttx_1020_wait01" m="166050556c1e82de56ab944c8e60bde7" />
+  <a p="effect\acttx_3\acttx_3_attack" m="af48e7259f5a2837f92f5b8fa8aa3f68" />
+  <a p="effect\acttx_3\acttx_3_skill02" m="d7e2711eea0fa8de5c14bf7f8a4b39" />
+  <a p="effect\acttx_501\acttx_501_attack" m="81e5bc9575dea591a367302011686bd" />
+  <a p="effect\acttx_501\acttx_501_skill01" m="e4c593db8dc8ccbb6d9e378a95a648b1" />
+  <a p="effect\acttx_506\acttx_506_attack" m="b361b8dbaa3af0ec3f1e7ac331d7e7f2" />
+  <a p="effect\acttx_506\acttx_506_attack01" m="d3874d649a1f135f460fef27fd11417" />
+  <a p="effect\acttx_506\acttx_506_skill01" m="c6beaf3edbbd6b51199cbf9dfb83b83" />
+  <a p="effect\acttx_506\acttx_506_skill02" m="b7b5f49b4158fc3d56fd68b0dafb41a" />
+  <a p="effect\acttx_506\acttx_506_skill03" m="3f6d4b37bd7c7026513bf1244ebf9d1e" />
+  <a p="effect\acttx_600\acttx_600_attack" m="fbf7185b119f398bd6c7b814c2df545" />
+  <a p="effect\acttx_600\acttx_600_skill01" m="3f755d7c87b47dc65b61269ba6a65b8" />
+  <a p="effect\acttx_7\acttx_7_1003" m="495f4e15073b3abd52782bf50259242" />
+  <a p="effect\acttx_7\acttx_7_8" m="c4c95a4b966c5deada1aa07dc48b544d" />
+  <a p="effect\acttx_7\acttx_7_attack" m="4d88547ac3711e265c1fffa5cbaa072" />
+  <a p="effect\acttx_7\acttx_7_super" m="3ae32612e8ef919eb711c1e3f757717" />
+  <a p="effect\acttx_7\acttx_7_throw" m="3d53d7aba677ff92736c584e6d8f87ca" />
+  <a p="effect\acttx_8\acttx_8_1004" m="f8d8e0e52ea8628c2a56b3b4cce8d76" />
+  <a p="effect\acttx_8\acttx_8_attack" m="2feb788dcc4dc47f5cee5e72efaa4565" />
+  <a p="effect\acttx_8\acttx_8_super" m="a6c6b6e165529a6cc2db67fc497e35" />
+  <a p="effect\acttx_8\acttx_8_throw" m="a998a4679e4c5c29bc13233171613" />
+  <a p="effect\element-group\element-r-bing\element-r-bing" m="bd65ce8c646ca870f4fb808ddee4" />
+  <a p="effect\element-group\element-r-dian\element-r-dian01" m="6cc5f1b9143e85a268ab9c3eecac7976" />
+  <a p="effect\element-group\element-r-dian\element-r-dian02" m="fc818fa16e1be8f9a15f6cbe4bc1668" />
+  <a p="effect\element-group\element-r-suolian\element-r-suolian" m="1cc167ebbd36e3d304dc2d11e9a25b9" />
+  <a p="effect\element-group\element-r-zuoshao\element-zuoshao01" m="241258d50ae5fe32ce05ccc4042652" />
+  <a p="effect\element-group\element-r-zuoshao\element-zuoshao02" m="86c54b25781755af584ec7c12cb0b2" />
+  <a p="effect\element-group\element_buff_fengyin\element_buff_fengyin" m="add76ac55ccf2b5790108d4c7ac78a7" />
+  <a p="effect\element-group\element_buff_huifu\element_buff_huifu" m="f2d3b010b67e7046d12cf1841ba82f6e" />
+  <a p="effect\element-group\element_buff_huoshan\element_buff_huoshan" m="bd87793a138044b2c098b57b0bd924a" />
+  <a p="effect\hit-group\hit-p\hit-p" m="eaf37f50e6dd7d2d58240cfdc9ffb31" />
+  <a p="effect\jianke\jianshi-super\jianke-attack" m="905a47af1187cba8f6998e1faa7929bb" />
+  <a p="effect\jianke\jianshi-super\jianke-skill01" m="2fbd5622da299c599ca9218365bee8f" />
+  <a p="effect\jianke\jianshi-super\jianke-skill02" m="a7efac995fc110fb534c6c394b6137d" />
+  <a p="effect\jianke\jianshi-super\jianke-super" m="eaf9f46d1b8fcc020661624117d45d" />
+  <a p="effect\jianke\jianshi-super\jianke-throw" m="d38523bcff3ce2961b0fb2565764597" />
+  <a p="effect\pc04-luoli\luoli-super\luoli-attack" m="2e88611aabfe3c72660b671c79cbb36" />
+  <a p="effect\pc04-luoli\luoli-super\luoli-skill01" m="9c7ff840152556acfdd609e3fe9417a" />
+  <a p="effect\pc04-luoli\luoli-super\luoli-skill02" m="6e9a704dffca55be34daf83bd5273a8a" />
+  <a p="effect\pc04-luoli\luoli-super\luoli-super" m="e061d1918ed6c5f7dbd615779bc80d" />
+  <a p="effect\pc04-luoli\luoli-super\luoli-throw" m="302561a575ff317bde1a1b8148979e" />
+  <a p="effect\tongyong\element-r-a\element-r-a" m="f04bc7ab25afdf66e3c1f5e7e01c8f1d" />
+  <a p="effect\tongyong\element-r-a\element-r-q" m="e0e6eef9b876b26c4fe2c946c6d897c" />
+  <a p="effect\tongyong\element-r-b\element-r-b" m="25e6019f95eb740eae24159c5f077" />
+  <a p="effect\tongyong\element-r-feixing\element-r-feixing" m="c1ff432a1d7b989c16a81b492e746cb" />
+  <a p="effect\tongyong\fangyu\hudun" m="a6b99f7888deb72ee6a26aad21637b" />
+  <a p="effect\tongyong\in-02\yanwu\tongyong-in-02" m="63df23be8d8b912f1748ed1310ef9b9f" />
+  <a p="effect\tongyong\in01\tongyong-jianshi-in" m="576ce886f9c5c55bfa8ddb8a592b5e1b" />
+  <a p="effect\tongyong\kaishi\tongyong-kaishi" m="23b857a19e48f678c7c5642bed2bafa6" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang" m="7b40b6f0df74f53bffdfa1696770f997" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang02" m="9efd586fd932bb44f9421d3e713f5522" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang03" m="e2e49214fa58416bedf9cfa3fb6a5355" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang04" m="567c2274643eff549fbec765de40fd64" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang05" m="63f868c8215d7647d97039c88eb2f0ed" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang06" m="6d83b2caa8407091f4d132557054f190" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang07" m="75b1cca855eef9e9137e4aa86c2f2e" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang08" m="29cc9ae20ce936b3eaa2ce46ab9d3" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang09" m="1af6bdf4eb3be1ecfbd1c3825776f8" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang10" m="b55ee6c685dc5807dbe6c621932b245" />
+  <a p="effect\tongyong\liuguang\tongyong-liuguang11" m="5968ae17c3ea25573147f86b2e1" />
+  <a p="effect\tongyong\liuguang\acttx_1025\acttx_1025_attack" m="eba2172f0bfea682258abd8a8d84852" />
+  <a p="effect\tongyong\liuguang\acttx_1025\acttx_1025_skill01" m="9dcd77edebe126ed885b77648eeb1ef7" />
+  <a p="effect\tongyong\move\tongyong-move" m="9b7976bd5276e217a7867c94844ba58e" />
+  <a p="effect\tongyong\shadow\tongyong-shadow" m="5aeba1c9a1be1bbefc44cf3be436555" />
+  <a p="effect\tongyong\tongyong-daliuguang\tongyong-daliuguang" m="56b96c9fa36cbb849fa24a5149ad66a8" />
+  <a p="effect\tongyong\tongyong_dwshengji\rankupanim" m="e03756e13736c37bc8ccc386aa7dd5" />
+  <a p="effect\tongyong\tongyong_dwshengji\tongyong_dwshengji" m="e3aaa02a3a70af3fe993986fac9607" />
+  <a p="effect\tongyong\tongyong_rwshengji\tongyong_rwshengji" m="3424e59263e919678bc72c3d2df1a77" />
+  <a p="effect\tongyong\tongyong_zuihouyiji\tongyong_zuihouyiji" m="69e3eb107ed4ae567ed64f8b1051dec6" />
+  <a p="effect\tongyong\tongyong_zuihouyiji\tongyong_zuihouyiji_chinese" m="19547f79cd13af30fed37f5c59c7bead" />
+  <a p="effect\tongyong\tongyong_zuihouyiji\tongyong_zuihouyiji_english" m="64bbb7103569661cfe3cb3a2d34eb3c1" />
+  <a p="spinedatas\npc1001\npc1001" m="582e825d3471bdf3f8a152eade88818" />
+  <a p="spinedatas\npc1006\npc1006" m="c33cdc61880f6641a1b4da71fc9cae" />
+  <a p="spinedatas\npc1007\npc1007" m="e1388a57c88ab57f98fb9b50b9e1b661" />
+  <a p="spinedatas\npc1010\npc1010" m="d9a7632e3c36b584d2d99dbe63aee5" />
+  <a p="spinedatas\npc1020\npc1020" m="1a27539d1234eeced0550a80c699d2" />
+  <a p="spinedatas\npc501\npc501" m="6beee67277cad6b85d7226b9180871b" />
+  <a p="spinedatas\npc506\npc506" m="d64a649801547a745bb168f4e2fec92" />
+  <a p="spinedatas\npc507\npc507" m="b46bc548f8d5a49ad0d767e8af36fe3" />
+  <a p="spinedatas\npc508\npc508" m="d1deaa7ad053c6d48cefb0cd9715fb7" />
+  <a p="spinedatas\npc600\npc600" m="b2a7d7215aff22e8d6a0d3c1e1f25e5" />
+  <a p="spinedatas\pc1\pc1" m="ceac98dfa05014db2ff8722cc53166f5" />
+  <a p="spinedatas\pc3\pc3" m="7fb3937219f4bf19bedd8e338d853d3" />
+  <a p="spinedatas\pc5\pc5" m="72d794b41b47d5913911662efbc424b" />
+  <a p="spinedatas\pc6\pc6" m="75523826ef61a112e71882112f808d4" />
+  <a p="spinedatas\pc7\pc7" m="c6ec618cb1ae3e1c9dbcd1f4adc822" />
+  <a p="spinedatas\pc8\pc8" m="2c34419cd3db84324a67e575a9a78d7c" />
+  <a p="texture\battlebg\12_feichuan" m="189665db079aabdaad295ff74e652" />
+  <a p="texture\battlebg\14hubian" m="5e507fee58f58a3820a977fe6efc8ec1" />
+  <a p="texture\battlebg\16_shandong" m="dabf5cbb4d10ba687599121632667f8" />
+  <a p="texture\battlebg\1_shanding" m="88796a81777d55b17e7ee2bbcfbc965" />
+  <a p="texture\battlebg\2_" m="494ba8df1e5bfd8fd71b5ef7948208c" />
+  <a p="texture\battlebg\3_hu" m="5b915c2ee2bda8eb7ecd5b66592a65d" />
+  <a p="texture\battlebg\4_xuanya" m="9fbe7e16b0ef46bf04632d9a54ee04a" />
+  <a p="texture\battlebg\6_shangu" m="38adeab482b948344bb2f8743338d019" />
+  <a p="texture\battlebg\7_guanwai" m="b12885b3987ad881664ad26eb83efc" />
+  <a p="texture\circlehead\1" m="929d8b8849b8fb63733ebe873958e6a4" />
+  <a p="texture\circlehead\5" m="3f574ef93b61e2a09d669957289c7a6" />
+  <a p="texture\circlehead\6" m="7ba2febd9d5ccfbb6d3e12a47fe2a2de" />
+  <a p="texture\circlehead\7" m="397cf61a8f9d4917efe58130425bc" />
+  <a p="texture\circlehead\8" m="b142b78a24f0a42bb588146fd551c57" />
+  <a p="texture\cube\blue" m="ccf4612af11d46afeae1c53d36a6426f" />
+  <a p="texture\cube\green" m="c5f0f42163911a3b12f5be4cc72face" />
+  <a p="texture\cube\ice" m="bbe31541db8fab4716249be90a94c92" />
+  <a p="texture\cube\occupy" m="a9af6aa63038247d2f5017c281a217" />
+  <a p="texture\cube\occupy_glow" m="a87e7aeacb7ab57bdafb2721ba17a7" />
+  <a p="texture\cube\purple" m="ef7a145b2eeba2fc89ff1fd91111be7e" />
+  <a p="texture\cube\red" m="e368b6364627437b5a2fbb4b5899b7d" />
+  <a p="texture\cube\thunder" m="5f98cb5b96c0382da348a6e676ab6d3b" />
+  <a p="texture\cube\volcano" m="f071358d28b8d3e21def4ac12dde6adc" />
+  <a p="texture\cube\yellow" m="392dd3878a81f573cb42e4bebcb5c84" />
+  <a p="texture\emotion\0" m="e04af16e1fc4be4d5852d25715e9579a" />
+  <a p="texture\emotion\1" m="94354f8ed4b28394728f1e7caf21b2" />
+  <a p="texture\emotion\10" m="9af93049d3b33c92fe907b4071673b9c" />
+  <a p="texture\emotion\11" m="b1bf8990ac5fd43d805d75ca472be142" />
+  <a p="texture\emotion\12" m="dd2994f8856adbed6b194dd17d75ac" />
+  <a p="texture\emotion\13" m="feeb2d3775fb679abd0ddbdae2645" />
+  <a p="texture\emotion\14" m="f69c2a41713cef9948d62ef5c79a4e9f" />
+  <a p="texture\emotion\15" m="c562f25536f3c541436fda45e3207e" />
+  <a p="texture\emotion\16" m="5ac953cfb2d1ba788aa283b6595" />
+  <a p="texture\emotion\17" m="fc281298c6445dd391722b79b151d28" />
+  <a p="texture\emotion\18" m="245ef0628a67a3567eb53a1dde1387d" />
+  <a p="texture\emotion\19" m="b2c02fd3b8b6d69aa05758ae2390cfa" />
+  <a p="texture\emotion\2" m="a9cdb5aa13969f85c813c4f7b523bab" />
+  <a p="texture\emotion\3" m="1011bd51d4c1d7b8ef2d3f5e1542a0" />
+  <a p="texture\emotion\4" m="87f658b6f92d536e8e84b770e3612449" />
+  <a p="texture\emotion\5" m="465fc5d44b3275eca2ccf1ee1d2272d" />
+  <a p="texture\emotion\6" m="fdc5bc8b6fc1b62bf6b6b1ca1f25cd60" />
+  <a p="texture\emotion\7" m="e88866e0881e7b3685c7acf5a7ce2db" />
+  <a p="texture\emotion\8" m="2c8691f47f62438b207be0ccdbabe3c" />
+  <a p="texture\emotion\9" m="37c5b55a5303f70c5f557ecb8ef79e" />
+  <a p="texture\halfbody\0" m="1e9d66855973347b99c9555ae8b4806f" />
+  <a p="texture\halfbody\1" m="53f75d49a343ce2f3a897fb7c0618cdd" />
+  <a p="texture\halfbody\1001" m="b07cebd4d843298a969a3172aba84c3" />
+  <a p="texture\halfbody\1006" m="f1eb70c6ab6d32ab75fc63a9c24650d5" />
+  <a p="texture\halfbody\1007" m="118fd6de806d351546f0ddaf4ddff315" />
+  <a p="texture\halfbody\1020" m="ec71bb3a651ad0c276ce7413a1d671" />
+  <a p="texture\halfbody\3" m="3929f2dba8be23037a854a29db125c8" />
+  <a p="texture\halfbody\5" m="6de376aa55fa85e9e9fcbb2a476d1852" />
+  <a p="texture\halfbody\501" m="3e54ef219142fa2128f4b0a83aff9633" />
+  <a p="texture\halfbody\506" m="4683c63a5e5e4df29164f760622e9b82" />
+  <a p="texture\halfbody\507" m="2338a3cfc967431b80e378e12cfa8cde" />
+  <a p="texture\halfbody\508" m="b2ffc1e71ba11671bd765c699beb572f" />
+  <a p="texture\halfbody\6" m="86204a393622a7b2cfd8754c91222cf" />
+  <a p="texture\halfbody\600" m="9d23862970e945a3b746702ee1f13c" />
+  <a p="texture\halfbody\7" m="2c8913a6ab9bd7476c842b172247935" />
+  <a p="texture\halfbody\8" m="fe2f9f4a734eb3d1d7ee99892451e94a" />
+  <a p="texture\head\1" m="914f4343c5ca6f5f71b7249dee6e8b6" />
+  <a p="texture\head\1001" m="f453733886d8eae092c3818ab4bc3" />
+  <a p="texture\head\1006" m="8c60d39508dfeb735ed58fd972db49" />
+  <a p="texture\head\1007" m="bc2691b2d1aaca4bcb5c62889b465242" />
+  <a p="texture\head\1010" m="a6f242229c0c1495f68ecdf8f2249" />
+  <a p="texture\head\1020" m="2c14047af69173ef994cefb55cec33" />
+  <a p="texture\head\3" m="807ff7fe76c336e2805cc078466e3d" />
+  <a p="texture\head\5" m="4ddacdcd88168526f81b9894dfd5cb44" />
+  <a p="texture\head\501" m="d037998f11c020af6a906790c01b2ef1" />
+  <a p="texture\head\506" m="74b9ea0985fe7a7109657f51b958f7a" />
+  <a p="texture\head\507" m="7ae799defdb717dea81ec8496980cc" />
+  <a p="texture\head\508" m="9295143a4bf8d3fc5cd1d45e15e6f857" />
+  <a p="texture\head\6" m="2677852fff250dd49ca40ad122a24" />
+  <a p="texture\head\600" m="367198cc59baf7eee96d5edab6b7354f" />
+  <a p="texture\head\7" m="db3fdb30fa9aa819e64f69eee77e1856" />
+  <a p="texture\head\8" m="41f76fb4fe2d93e724e5fed2ef2c8e8f" />
+  <a p="texture\icon\item\0" m="6434ef4d0db7227f6494fd95ed1348" />
+  <a p="texture\icon\item\1" m="a55b978a2b9550483e115ddb7f9f23f" />
+  <a p="texture\icon\item\10001" m="83c0893d21d23201a32bc5fe4363e3e" />
+  <a p="texture\icon\item\10002" m="972eaab1e6fd7526fbc8869c2534a727" />
+  <a p="texture\icon\item\10005" m="5349778471ed7e74f19fe28bec766b99" />
+  <a p="texture\icon\item\10006" m="5aa4e47187bf1615e89328934783288" />
+  <a p="texture\icon\item\10010" m="8231fee971267776d41b27e0be619e9c" />
+  <a p="texture\icon\item\10011" m="ea5c3e4e5ca685ed98a18248b6254dd" />
+  <a p="texture\icon\item\10013" m="9aa4c7f5e6d96e3994a6ce9ac1956331" />
+  <a p="texture\icon\item\10014" m="1a99b64e113f9b25d0dccd197df63b" />
+  <a p="texture\icon\item\10015" m="ab6602aa21b3917fd6e2aeeedd977e" />
+  <a p="texture\icon\item\102" m="bac11051c9281d17333cf5244d72c33" />
+  <a p="texture\icon\item\13001" m="c7cbbba9f9846caafe66d25ce8ddaa68" />
+  <a p="texture\icon\item\5" m="1df5dfd4744e6162dbe3ea415b862993" />
+  <a p="texture\icon\item\6" m="d13d5b14a4f3263d871b1bcec6eab829" />
+  <a p="texture\icon\item\7" m="1bdd2f3a7617612a9518a8e22e55413" />
+  <a p="texture\icon\item\7001" m="df0bcb4bca11472525fa2b5b7a92777" />
+  <a p="texture\icon\item\7002" m="114b2dcb60ec52a0a41db952b2855647" />
+  <a p="texture\icon\item\7003" m="a3f162de84b4e92605a4ce3f9bdf439" />
+  <a p="texture\icon\item\8" m="e0fce7c94e595d3f1d978b8ca0518d" />
+  <a p="texture\icon\skill\0" m="5c50a832c1203914427984e645e354cf" />
+  <a p="texture\icon\skill\1" m="bf10f059a038060d3dd96e4d1ef20f6" />
+  <a p="texture\icon\skill\109" m="a3599985556e458771d88653247557a" />
+  <a p="texture\icon\skill\301" m="31df8a7c98d8334dc8c2e1b16d4a1daa" />
+  <a p="texture\icon\skill\5" m="e2c1fcc169a1e2469ce5891a6931495" />
+  <a p="texture\icon\skill\6" m="f8e2b2cd9899e7954a960f8e0e5992" />
+  <a p="texture\icon\skill\7" m="8149b97e9faa8931ef11c8c084a3d55" />
+  <a p="texture\icon\skill\8" m="3dafcbb8fef6e8dc3818d9889531ae4" />
+  <a p="texture\icon\skill\901" m="b3d9a798b69adec6b1ef8580585bd0" />
+  <a p="texture\icon\skill\903" m="2b781897317c1232569b3b2ea76e7c5" />
+  <a p="texture\icon\skill\905" m="d2fb1af594d80eb32f423516b23133a" />
+  <a p="texture\icon\skill\908" m="2c5a8952b7e851b55e74b8568a36c2ac" />
+  <a p="texture\icon\skill\912" m="88cd5c943dd32ea32aeebd5d42880d6" />
+  <a p="texture\icon\skill\913" m="c607294b85bc473f9a76d82c42fe880" />
+  <a p="texture\icon\skill\918" m="f65768a8215b292bdd9d68d4440d99c" />
+  <a p="texture\icon\skill\920" m="5fdfd9f8eb79e4d12a1eacf6b94817f5" />
+  <a p="texture\illustration\0" m="16fe0463c4c2217ae24cdfd0ad8846" />
+  <a p="texture\illustration\1" m="1254246ffaca3c2fbac39354ced3d984" />
+  <a p="texture\illustration\10" m="83bf341c9e89ab46c9f6458eb1838" />
+  <a p="texture\illustration\13" m="fdf33257b46e5a36956bd2472874694" />
+  <a p="texture\illustration\14" m="bab2ab2e76e9e130d09b2775674cb2" />
+  <a p="texture\illustration\15" m="4b83d265c4dd5d49b3c3411d74e843b9" />
+  <a p="texture\illustration\16" m="224230ef5dc03e22f93c7a815a923365" />
+  <a p="texture\illustration\2" m="ad57ff591647342e5a7d40b8d6f616cc" />
+  <a p="texture\illustration\21" m="c095499d25d299628b756e878ee23028" />
+  <a p="texture\illustration\23" m="75e4605e1c79745588524e87382861" />
+  <a p="texture\illustration\24" m="26b3ee8e926ca62092e2d56d647daa9b" />
+  <a p="texture\illustration\26" m="f61ab442a4a86df2388785e8211f41f" />
+  <a p="texture\illustration\3" m="86a4c6df939253bba6396fece01ca988" />
+  <a p="texture\illustration\30" m="dfe5574ab93b5d5abb3d4d7382dfde5b" />
+  <a p="texture\illustration\31" m="bfb9b12de6ec31af12fb176f7cf6b2b" />
+  <a p="texture\illustration\32" m="6ba961df441c4e7797c7144199d363f9" />
+  <a p="texture\illustration\33" m="c5dfb10f383cd2b1ec694af55b992e" />
+  <a p="texture\illustration\34" m="13ad20c44caaa397b5a21085b2dee20" />
+  <a p="texture\illustration\35" m="46db8262816fd6babf89401fc2af993" />
+  <a p="texture\illustration\36" m="b39cdeb14d421475e264335564a182" />
+  <a p="texture\illustration\4" m="37112c9873731bba3d997f283315ad3" />
+  <a p="texture\illustration\41" m="d1d5dd8cd9eee5717c57cda499d36b2" />
+  <a p="texture\illustration\42" m="5e54fb1ba786cd40d23c1d8bdb3871" />
+  <a p="texture\illustration\43" m="3147c33dfdb811fb663d8207f1fbf0" />
+  <a p="texture\illustration\44" m="c252c70d4c27891ee2b6cfce074cca" />
+  <a p="texture\illustration\5" m="196e773572dd60122f1ac286db51b79" />
+  <a p="texture\illustration\54" m="db761a7e2167fa469c7054bf6a5be165" />
+  <a p="texture\illustration\6" m="822fc3cc89a477b51d9fcb8c378115e" />
+  <a p="texture\illustration\7" m="b0a960de5dfd539b8fc43c50bb66b5" />
+  <a p="texture\illustration\8" m="2fbd01bd7aee95d446e29ea6305454" />
+  <a p="texture\illustration\9" m="63566ca1a4d0f7b0a0c38937eb9b69b8" />
+  <a p="texture\landmark\fujian" m="c54eafa521b73523377d03ba4ebf06c" />
+  <a p="texture\liuguang\1" m="ad589295e87202c88e737d3d17daed3" />
+  <a p="texture\liuguang\5" m="991fb6aada7f417c8a30e061fe9fbc45" />
+  <a p="texture\liuguang\6" m="7a80c743de859d98e277c126d2fd702f" />
+  <a p="texture\liuguang\7" m="7c2261d8613b3627211367f86ce6d7b" />
+  <a p="texture\liuguang\8" m="24754dbbd2c5ce519596c6cdb26e6a7" />
+  <a p="texture\maplevel\background\1" m="63ce6ceff6137d7e8ce687337a7859b" />
+  <a p="texture\maplevel\foreground\1" m="20ccc8a661dd11a42c267f57cecae597" />
+  <a p="texture\maplevel\foreground\2" m="da292e8993e517864fcbdbd01a629cd" />
+  <a p="texture\maplevel\foreground\3" m="ea382edad3e7d1b998e65c47fe791758" />
+  <a p="texture\toon\a01" m="186f2f5159f49cfce29faf26cc04a2" />
+  <a p="texture\toon\a02" m="adccc23cbdad357ef8fa368ab3fd75" />
+  <a p="texture\toon\a03" m="99a3dd41b968db9bc2b4e1fa3bf79bb" />
+  <a p="texture\toon\a04" m="afa3b96b645635a9cc235893a68798" />
+  <a p="texture\townbg\001a1" m="fd188e6efdaae2f3652f9739376492e" />
+  <a p="texture\townbg\001a2" m="c725e41da96d334935c146bd2d3827f0" />
+  <a p="texture\townbg\001a3" m="4f7bc1b411241ef64eac8ebf2ab3a34" />
+  <a p="texture\townbg\001a4" m="b18bb665a67c7f432876df20c546a91" />
+  <a p="texture\weapon\1" m="5093147571b987ad44dd91fa21c91c80" />
+  <a p="texture\weapon\102" m="c75e94a93e911765f43638fcfb8d0b2" />
+  <a p="texture\weapon\5" m="c2e5db5860ca27d55ac2b93d8d2526af" />
+  <a p="texture\weapon\6" m="74d9cb814931efda2dc2e3fa3842b8" />
+  <a p="texture\weapon\7" m="d378ec2e7e79b0c385a9b290801860c8" />
+  <a p="texture\weapon\8" m="cdddee7890ba3b711e911b75d915d526" />
+  <a p="ui\loginpanel\anim\dldaiji" m="5eb446952d547d38b05d38fa9703cab" />
+  <a p="ui\loginpanel\anim\piao" m="646b732a5f58da1c8ff3d5f5fa6dc3" />
+  <a p="xml\config\chinese" m="38fee387a5dde2c102bb0d84166dfb4" />
+  <a p="xml\config\chinesetraditional" m="8ae5d6c6d9fa33a282863d1805e13f" />
+  <a p="xml\config\english" m="5cb88a992f213f73ba1d49fa883fdaff" />
+  <a p="xml\language\chinese" m="7f0adbe864b7cc79a2f57fefb2be7c" />
+  <a p="xml\language\chinesetraditional" m="13a5c5f3eec74d4092946e83ca4a306e" />
+  <a p="xml\language\english" m="327df3316a3866d47b0bc1fb7332fc" />
+</assetbundle>