备份

Assets/Editor.meta

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

Assets/Plugins/metro/UWP.meta

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

Assets/Plugins/metro/WindowsPhone81.meta

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

Assets/Resource/Prefab/PrefabUI/SkillItem.prefab

@@ -78,6 +78,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1571775833425854
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224680618114388086}
+  - component: {fileID: 222270481494867574}
+  - component: {fileID: 114799092303750802}
+  m_Layer: 5
+  m_Name: IconLab1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1578938048162630
 GameObject:
   m_ObjectHideFlags: 0
@@ -161,6 +178,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1753077593704228
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224416091010794476}
+  - component: {fileID: 222657493250765514}
+  - component: {fileID: 114823576705235868}
+  m_Layer: 5
+  m_Name: Icon1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1987736408932752
 GameObject:
   m_ObjectHideFlags: 0
@@ -373,6 +407,66 @@ MonoBehaviour:
   RemoveIndex: 
   NewTextIndex: 
   NewTextPos: []
+--- !u!114 &114799092303750802
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1571775833425854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!114 &114823576705235868
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1753077593704228}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114852074207498102
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -475,6 +569,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1711800979860744}
+--- !u!222 &222270481494867574
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1571775833425854}
 --- !u!222 &222366561853418940
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -493,6 +593,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1588467276941316}
+--- !u!222 &222657493250765514
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1753077593704228}
 --- !u!222 &222709845905395904
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -573,6 +679,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224416091010794476
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1753077593704228}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224680618114388086}
+  m_Father: {fileID: 224859775814496456}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 39.8, y: 17.999992}
+  m_SizeDelta: {x: 88.475, y: 36}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224621018139970486
 RectTransform:
   m_ObjectHideFlags: 1
@@ -610,6 +735,24 @@ RectTransform:
   m_AnchoredPosition: {x: -40.02501, y: 17.999994}
   m_SizeDelta: {x: 257, y: 19.8}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224680618114388086
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1571775833425854}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224416091010794476}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224762394635763476
 RectTransform:
   m_ObjectHideFlags: 1
@@ -621,7 +764,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224859775814496456}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -639,7 +782,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224859775814496456}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -677,6 +820,7 @@ RectTransform:
   - {fileID: 224625499702098922}
   - {fileID: 224143133215223350}
   - {fileID: 224853125206147754}
+  - {fileID: 224416091010794476}
   - {fileID: 224762394635763476}
   - {fileID: 224837192284127996}
   m_Father: {fileID: 0}

Assets/Resource/XML/Config/pack_config.xml

@@ -1,15 +1,15 @@
 <data>
-  <item id="1" name="金币大礼包" class="3" class_id="2" coin_person="" person="" skill_cd="" coin="9000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="200" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包1" anim="" label="" />
-  <item id="2" name="天赐大礼包" class="3" class_id="3" coin_person="" person="" skill_cd="" coin="36000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="400" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包2" anim="" label="" />
-  <item id="3" name="花神大礼包" class="3" class_id="4" coin_person="" person="" skill_cd="" coin="90000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="800" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包3" anim="" label="" />
-  <item id="4" name="新手礼包" class="4" class_id="2" coin_person="5%" person="" skill_cd="" coin="" diamond="150" flower="25" use_lv="" use_cur="3" use_amnt="6" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-初级包" anim="" label="" />
-  <item id="5" name="中级礼包" class="4" class_id="3" coin_person="5%" person="" skill_cd="" coin="" diamond="500" flower="26" use_lv="" use_cur="3" use_amnt="30" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-中级包" anim="" label="" />
-  <item id="6" name="高级礼包" class="4" class_id="4" coin_person="5%" person="" skill_cd="" coin="" diamond="2000" flower="27" use_lv="" use_cur="3" use_amnt="68" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-高级包" anim="" label="" />
-  <item id="7" name="钻石100" class="4" class_id="5" coin_person="" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="6" desc="购买 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="" />
-  <item id="8" name="钻石500 赠送50" class="4" class_id="6" coin_person="" person="" skill_cd="" coin="" diamond="550" flower="" use_lv="" use_cur="3" use_amnt="30" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="热卖" />
-  <item id="9" name="钻石2000 赠送500" class="4" class_id="7" coin_person="" person="" skill_cd="" coin="" diamond="2500" flower="" use_lv="" use_cur="3" use_amnt="68" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-小量钻石" anim="" label="超值" />
-  <item id="10" name="钻石6000 赠送600" class="4" class_id="8" coin_person="" person="" skill_cd="" coin="" diamond="6600" flower="" use_lv="" use_cur="3" use_amnt="128" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-中量钻石" anim="" label="" />
-  <item id="11" name="钻石10000 赠送2000" class="4" class_id="9" coin_person="" person="" skill_cd="" coin="" diamond="12000" flower="" use_lv="" use_cur="3" use_amnt="328" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-大量钻石" anim="" label="" />
+  <item id="1" name="金币大礼包" class="3" class_id="2" coin_person="" person="" skill_cd="" coin="9000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="200" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包1" anim="" label="" lock="" />
+  <item id="2" name="天赐大礼包" class="3" class_id="3" coin_person="" person="" skill_cd="" coin="36000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="400" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包2" anim="" label="" lock="" />
+  <item id="3" name="花神大礼包" class="3" class_id="4" coin_person="" person="" skill_cd="" coin="90000*c" diamond="" flower="" use_lv="" use_cur="2" use_amnt="800" desc="立即获得金币 [&amp;coin&amp;]" icon="绿-金币包3" anim="" label="" lock="" />
+  <item id="4" name="新手礼包" class="4" class_id="2" coin_person="5%" person="" skill_cd="" coin="" diamond="150" flower="25" use_lv="" use_cur="3" use_amnt="6" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-初级包" anim="" label="" lock="1" />
+  <item id="5" name="中级礼包" class="4" class_id="3" coin_person="5%" person="" skill_cd="" coin="" diamond="500" flower="26" use_lv="" use_cur="3" use_amnt="30" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-中级包" anim="" label="" lock="1" />
+  <item id="6" name="高级礼包" class="4" class_id="4" coin_person="5%" person="" skill_cd="" coin="" diamond="2000" flower="27" use_lv="" use_cur="3" use_amnt="68" desc="获得[&amp;flower&amp;]，[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;]，永久有效" icon="蓝-高级包" anim="" label="" lock="1" />
+  <item id="7" name="钻石100" class="4" class_id="5" coin_person="" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="6" desc="购买 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="" lock="" />
+  <item id="8" name="钻石500 赠送50" class="4" class_id="6" coin_person="" person="" skill_cd="" coin="" diamond="550" flower="" use_lv="" use_cur="3" use_amnt="30" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-免费钻" anim="" label="热卖" lock="" />
+  <item id="9" name="钻石2000 赠送500" class="4" class_id="7" coin_person="" person="" skill_cd="" coin="" diamond="2500" flower="" use_lv="" use_cur="3" use_amnt="68" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-小量钻石" anim="" label="超值" lock="" />
+  <item id="10" name="钻石6000 赠送600" class="4" class_id="8" coin_person="" person="" skill_cd="" coin="" diamond="6600" flower="" use_lv="" use_cur="3" use_amnt="128" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-中量钻石" anim="" label="" lock="" />
+  <item id="11" name="钻石10000 赠送2000" class="4" class_id="9" coin_person="" person="" skill_cd="" coin="" diamond="12000" flower="" use_lv="" use_cur="3" use_amnt="328" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-大量钻石" anim="" label="" lock="" />
   <comment>
     <id>
 id
@@ -67,5 +67,8 @@ id
     <label>
 标签
 </label>
+    <lock>
+是否可用
+</lock>
   </comment>
 </data>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -18,6 +18,7 @@
     <Fe_BtnLab6 desc=""><![CDATA[冷却中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩余时间]]></Fe_BtnLab7>
     <Fe_BtnLab8 desc=""><![CDATA[使用中]]></Fe_BtnLab8>
+    <Fe_BtnLab9 desc=""><![CDATA[已购买]]></Fe_BtnLab9>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[连接服务器]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[该功能仅在联网时使用]]></Fg_Lab0>
@@ -99,6 +100,8 @@
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[去试衣间看看吧！]]></N_Lab>
     <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
+    <热卖 desc=""><![CDATA[热卖]]></热卖>
+    <超值 desc=""><![CDATA[超值]]></超值>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -18,6 +18,7 @@
     <Fe_BtnLab6 desc=""><![CDATA[冷卻中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩餘時間]]></Fe_BtnLab7>
     <Fe_BtnLab8 desc=""><![CDATA[使用中]]></Fe_BtnLab8>
+    <Fe_BtnLab9 desc=""><![CDATA[已購買]]></Fe_BtnLab9>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[連接伺服器]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[該功能僅在聯網時使用]]></Fg_Lab0>
@@ -99,6 +100,8 @@
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[去試衣間看看吧！]]></N_Lab>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
+    <热卖 desc=""><![CDATA[熱賣]]></热卖>
+    <超值 desc=""><![CDATA[超值]]></超值>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resource/XML/lan/English.xml

@@ -18,6 +18,7 @@
     <Fe_BtnLab6 desc=""><![CDATA[CD]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[Left ]]></Fe_BtnLab7>
     <Fe_BtnLab8 desc=""><![CDATA[Using ]]></Fe_BtnLab8>
+    <Fe_BtnLab9 desc=""><![CDATA[Bought]]></Fe_BtnLab9>
     <Fg_Tit desc=""><![CDATA[Alert]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[Connet]]></Fg_BtnLab>
     <Fg_Lab0 desc=""><![CDATA[Internet required]]></Fg_Lab0>
@@ -99,6 +100,8 @@
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
+    <热卖 desc=""><![CDATA[Hot]]></热卖>
+    <超值 desc=""><![CDATA[Bargain]]></超值>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>

Assets/Script/Manage/Initializer.cs

@@ -44,6 +44,7 @@ public class Initializer : MonoBehaviour
 
         DontDestroyOnLoad(gameObject);
 
+        ManaServer.SetPackLock();
         ManaServer.Login(ManaCenter.LoginCallbackInitial);
 
         Instance = this;

Assets/Script/Manage/ManaCenter.cs

@@ -579,7 +579,7 @@ public class ManaCenter : Regist
 
             #region MyRegion
 
-            if (attributeList[i].Count == 17)
+            if (attributeList[i].Count == 18)
             {
                 skillRoot = new Pack(attributeList[i]);
             }

Assets/Script/Manage/ManaIAP.cs

@@ -88,7 +88,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         }
 
         PayChannel = ManaReso.Load<TextAsset>("Setting", Folder.Config).text.ToEnum<PayChannel>();
-
+        
         if (PayChannel == PayChannel.AliPay)
         {
             foreach (var attribute in ManaData.GetIAPConfig())

Assets/Script/Manage/ManaServer.cs

@@ -58,6 +58,7 @@ public class ManaServer : Regist
 
     public static int Counter;
     public static float Timer;
+    public static bool PackLock;
     public static bool Complete;
     public static bool FirstConnect = true;
 
@@ -107,6 +108,21 @@ public class ManaServer : Regist
     }
 
 
+    public static void SetPackLock()
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        URLRequest.CreateURLRequest
+            (
+                "https://garden.dashgame.com/index.php/home/index/index",
+                urlData,
+                data =>
+                {
+                    PackLock = Auxiliary.BoolParse(data["l"]["val"].ToJson().Trim('"'), true);
+                }
+            );
+    }
+
     public static void GetProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();

Assets/Script/Manage/ManaUI.cs

@@ -2103,7 +2103,7 @@ public class ManaUI : Regist
                 "P_Save",
                 () =>
                 {
-                    ManaPlayer.Player.Save();
+                    ManaPlayer.Player.Save(true);
                 }
             );
 
@@ -2332,7 +2332,10 @@ public class ManaUI : Regist
         ManaReso.SetButtonEvent
         (
             "P_Return",
-            ManaPlayer.Player.Return
+            () =>
+            {
+                ManaPlayer.Player.Return();
+            }
         );
         
         #endregion

Assets/Script/Object/Player.cs

@@ -499,7 +499,7 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
-    public void Save()
+    public void Save(bool showNavigate)
     {
         ManaAudio.PlayClip(Clip.BtnClip);
 
@@ -520,7 +520,10 @@ public class Player : Regist , IPointerClickHandler
         {
             if (!closeUnitList[i].Bought)
             {
-                BuyNavigate(closeUnitList);
+                if (showNavigate)
+                {
+                    BuyNavigate(closeUnitList);
+                }
 
                 return;
             }
@@ -611,7 +614,14 @@ public class Player : Regist , IPointerClickHandler
                         EventType.BackwardFinish,
                         () =>
                         {
-                            BuyNavigate(closeUnitList);
+                            if (closeUnitList.Count == 0)
+                            {
+                                Save(false);
+                            }
+                            else
+                            {
+                                BuyNavigate(closeUnitList);
+                            }
                         }
                     );
 

Assets/Script/Object/Skill/Pack.cs

@@ -35,6 +35,7 @@ public class Pack : SkillRoot
     public float UseAmt;
     public float CoinPerson;
     public float DiamondOnce;
+    public bool Lock;
     public string CoinFml;
 
     public float Plus;
@@ -93,6 +94,7 @@ public class Pack : SkillRoot
         Flower = attribute[9].Value;
         CoinFml = attribute[7].Value;
 
+        Lock = Auxiliary.BoolParse(attribute[17].Value, false);
         UseAmt = Auxiliary.FloatParse(attribute[12].Value,0);
         ItemIndex = Auxiliary.IntParse(attribute[3].Value,0);
         DiamondOnce = Auxiliary.FloatParse(attribute[8].Value,0);
@@ -168,6 +170,14 @@ public class Pack : SkillRoot
         ItemBtn.onClick.RemoveAllListeners();
         ItemBtn.onClick.AddListener(OnClick);
 
+
+        if (!string.IsNullOrEmpty(Label))
+        {
+            ItemIcon1.SetActive(true);
+
+            ManaLan.Add(IconLab1, new LanStr("UI", Label));
+        }
+
         ItemLab.text = GetDescription(0);
 
         ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
@@ -176,6 +186,12 @@ public class Pack : SkillRoot
         ManaIAP.ProductActionDic.UniqueAdd(ID, PurchaseResult);
 
         ItemStatus = ItemStatus;
+
+
+        if (Lock && ManaServer.PackLock && Level > 0)
+        {
+            Disable();
+        }
     }
 
     public override void UpdateStatus()
@@ -185,6 +201,11 @@ public class Pack : SkillRoot
             return;
         }
 
+        if (Lock && ManaServer.PackLock)
+        {
+            return;
+        }
+
         ItemLab.text = GetDescription(0);
 
         if (MaxUseLv == MinUseLv)
@@ -229,6 +250,13 @@ public class Pack : SkillRoot
         }
     }
 
+    protected void Disable()
+    {
+        ItemBtn.interactable = false;
+
+        ManaLan.Add(ItemBtnLab, Language.GetStr("UI", "Fe_BtnLab9"));
+    }
+
     protected void OnClick()
     {
         ManaAudio.PlayClip(Clip.BtnClip);
@@ -268,6 +296,11 @@ public class Pack : SkillRoot
 
     protected void PurchaseResult()
     {
+        if (Lock && ManaServer.PackLock)
+        {
+            Disable();
+        }
+
         int tempCoin = 0;
         int tempDiamond = (int) DiamondOnce;
 

Assets/Script/Object/Skill/SkillRoot.cs

@@ -116,8 +116,10 @@ public abstract class SkillRoot
 
     public Text ItemTit;
     public Text ItemLab;
+    public Text IconLab1;
     public Text ItemBtnLab;
     public Image ItemIcon;
+    public Image ItemIcon1;
     public Button ItemBtn;
 
     public SkillTab SkillTab;
@@ -183,7 +185,9 @@ public abstract class SkillRoot
         ItemTit = childDic["Tit"].GetComponent<Text>();
         ItemBtn = childDic["Btn"].GetComponent<Button>();
         ItemLab = childDic["Lab"].GetComponent<Text>();
+        IconLab1 = childDic["IconLab1"].GetComponent<Text>();
         ItemIcon = childDic["Icon"].GetComponent<Image>();
+        ItemIcon1 = childDic["Icon1"].GetComponent<Image>();
         ItemBtnLab = childDic["BtnLab"].GetComponent<Text>();
 
         ItemIcon.sprite = Icon;

ToList.txt

@@ -1,3 +1,5 @@
+超值热卖
+
 苹果的本地化
 
 分享appid