2 Commits 20a9076686 ... fb9d15a635

Author SHA1 Message Date
  liuqilin fb9d15a635 更新语言文档 7 years ago
  liuqilin 831a876cf9 更新语言文档 7 years ago

BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide


+ 1 - 1
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -1062,7 +1062,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1

+ 25 - 25
Assets/Resource/XML/Config/flower_config.xml

@@ -66,42 +66,42 @@
   <item id="64" name="月见草(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower64" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
   <item id="65" name="月见草(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower65" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
   <comment>
-    <id>
-id
+    <id>
+id
 </id>
-    <name>
-名称
+    <name>
+名称
 </name>
-    <desc>
-描述
+    <desc>
+描述
 </desc>
-    <unlock_ahead_cur>
-提前解锁
-消耗货币
+    <unlock_ahead_cur>
+提前解锁
+消耗货币
 </unlock_ahead_cur>
-    <unlock_ahead>
-提前解锁消耗的货币
+    <unlock_ahead>
+提前解锁消耗的货币
 </unlock_ahead>
-    <icon>
-图标
+    <icon>
+图标
 </icon>
-    <anim>
-场景物件
+    <anim>
+场景物件
 </anim>
-    <flower_coin_buff>
-种花金币加成
+    <flower_coin_buff>
+种花金币加成
 </flower_coin_buff>
-    <itemSize>
-
+    <itemSize>
+
 </itemSize>
-    <flowerCardSize>
-
+    <flowerCardSize>
+
 </flowerCardSize>
-    <minigameSize>
-
+    <minigameSize>
+
 </minigameSize>
-    <show>
-显示在花朵管理界面
+    <show>
+显示在花朵管理界面
 </show>
   </comment>
 </data>

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="41" />
+  <Version value="42" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

+ 14 - 14
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -119,7 +119,7 @@
 
 程序 水怪
 ]]></Lc_CreditsContent>
-    <Ld_Title desc=""><![CDATA[备份短码]]></Ld_Title>
+    <Ld_Title desc=""><![CDATA[备份]]></Ld_Title>
     <Ld_PlaceHolder desc=""><![CDATA[《我的甜蜜花园》
 我的用户短码为 : %NUM%]]></Ld_PlaceHolder>
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
@@ -460,21 +460,21 @@
     <Flower48 desc=""><![CDATA[白]]></Flower48>
     <Flower49 desc=""><![CDATA[粉]]></Flower49>
     <Flower50 desc=""><![CDATA[红]]></Flower50>
-    <Flower51 desc=""><![CDATA[]]></Flower51>
-    <Flower52 desc=""><![CDATA[]]></Flower52>
+    <Flower51 desc=""><![CDATA[]]></Flower51>
+    <Flower52 desc=""><![CDATA[]]></Flower52>
     <Flower53 desc=""><![CDATA[红]]></Flower53>
-    <Flower54 desc=""><![CDATA[]]></Flower54>
-    <Flower55 desc=""><![CDATA[]]></Flower55>
-    <Flower56 desc=""><![CDATA[]]></Flower56>
+    <Flower54 desc=""><![CDATA[]]></Flower54>
+    <Flower55 desc=""><![CDATA[]]></Flower55>
+    <Flower56 desc=""><![CDATA[]]></Flower56>
     <Flower57 desc=""><![CDATA[红]]></Flower57>
-    <Flower58 desc=""><![CDATA[]]></Flower58>
-    <Flower59 desc=""><![CDATA[]]></Flower59>
-    <Flower60 desc=""><![CDATA[]]></Flower60>
-    <Flower61 desc=""><![CDATA[]]></Flower61>
-    <Flower62 desc=""><![CDATA[]]></Flower62>
-    <Flower63 desc=""><![CDATA[]]></Flower63>
-    <Flower64 desc=""><![CDATA[]]></Flower64>
-    <Flower65 desc=""><![CDATA[]]></Flower65>
+    <Flower58 desc=""><![CDATA[]]></Flower58>
+    <Flower59 desc=""><![CDATA[]]></Flower59>
+    <Flower60 desc=""><![CDATA[]]></Flower60>
+    <Flower61 desc=""><![CDATA[]]></Flower61>
+    <Flower62 desc=""><![CDATA[]]></Flower62>
+    <Flower63 desc=""><![CDATA[]]></Flower63>
+    <Flower64 desc=""><![CDATA[]]></Flower64>
+    <Flower65 desc=""><![CDATA[]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>

+ 32 - 31
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -119,8 +119,9 @@
 
 程式 水怪
 ]]></Lc_CreditsContent>
-    <Ld_Title desc=""><![CDATA[]]></Ld_Title>
-    <Ld_PlaceHolder desc=""><![CDATA[]]></Ld_PlaceHolder>
+    <Ld_Title desc=""><![CDATA[備份]]></Ld_Title>
+    <Ld_PlaceHolder desc=""><![CDATA[《我的甜蜜花園》
+我的用戶短碼為 : %NUM%]]></Ld_PlaceHolder>
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
     <J_Info0 desc=""><![CDATA[獲得]]></J_Info0>
     <J_Info1 desc=""><![CDATA[使用技能:]]></J_Info1>
@@ -169,7 +170,7 @@
     <Pi_TitleTip desc=""><![CDATA[請填寫標題]]></Pi_TitleTip>
     <Pi_ContentTip desc=""><![CDATA[請填寫描述]]></Pi_ContentTip>
     <Pi_BuyAllTip desc=""><![CDATA[確定要購買缺少的裝扮?]]></Pi_BuyAllTip>
-    <Pi_Share desc=""><![CDATA[]]></Pi_Share>
+    <Pi_Share desc=""><![CDATA[分享]]></Pi_Share>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[給這家主人說點什麼吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
@@ -391,21 +392,21 @@
     <Flower48 desc=""><![CDATA[花煙草(白) ]]></Flower48>
     <Flower49 desc=""><![CDATA[花煙草(粉) ]]></Flower49>
     <Flower50 desc=""><![CDATA[花煙草(紅) ]]></Flower50>
-    <Flower51 desc=""><![CDATA[]]></Flower51>
-    <Flower52 desc=""><![CDATA[]]></Flower52>
-    <Flower53 desc=""><![CDATA[]]></Flower53>
-    <Flower54 desc=""><![CDATA[]]></Flower54>
-    <Flower55 desc=""><![CDATA[]]></Flower55>
-    <Flower56 desc=""><![CDATA[]]></Flower56>
-    <Flower57 desc=""><![CDATA[]]></Flower57>
-    <Flower58 desc=""><![CDATA[]]></Flower58>
-    <Flower59 desc=""><![CDATA[]]></Flower59>
-    <Flower60 desc=""><![CDATA[]]></Flower60>
-    <Flower61 desc=""><![CDATA[]]></Flower61>
-    <Flower62 desc=""><![CDATA[]]></Flower62>
-    <Flower63 desc=""><![CDATA[]]></Flower63>
-    <Flower64 desc=""><![CDATA[]]></Flower64>
-    <Flower65 desc=""><![CDATA[]]></Flower65>
+    <Flower51 desc=""><![CDATA[雛菊(白)]]></Flower51>
+    <Flower52 desc=""><![CDATA[雛菊(粉)]]></Flower52>
+    <Flower53 desc=""><![CDATA[雛菊(紅)]]></Flower53>
+    <Flower54 desc=""><![CDATA[雛菊(黃)]]></Flower54>
+    <Flower55 desc=""><![CDATA[令劍荷花(白)]]></Flower55>
+    <Flower56 desc=""><![CDATA[令箭荷花(橙)]]></Flower56>
+    <Flower57 desc=""><![CDATA[令箭荷花(紅)]]></Flower57>
+    <Flower58 desc=""><![CDATA[令箭荷花(黃)]]></Flower58>
+    <Flower59 desc=""><![CDATA[令箭荷花(紫)]]></Flower59>
+    <Flower60 desc=""><![CDATA[五爪金龍(白)]]></Flower60>
+    <Flower61 desc=""><![CDATA[五爪金龍(紫)]]></Flower61>
+    <Flower62 desc=""><![CDATA[月見草(白)]]></Flower62>
+    <Flower63 desc=""><![CDATA[月見草(粉)]]></Flower63>
+    <Flower64 desc=""><![CDATA[月見草(黃)]]></Flower64>
+    <Flower65 desc=""><![CDATA[月見草(紫)]]></Flower65>
   </FlowerName>
   <FlowerColor>
     <Flower0 desc=""><![CDATA[粉]]></Flower0>
@@ -459,21 +460,21 @@
     <Flower48 desc=""><![CDATA[白]]></Flower48>
     <Flower49 desc=""><![CDATA[粉]]></Flower49>
     <Flower50 desc=""><![CDATA[紅]]></Flower50>
-    <Flower51 desc=""><![CDATA[]]></Flower51>
-    <Flower52 desc=""><![CDATA[]]></Flower52>
+    <Flower51 desc=""><![CDATA[]]></Flower51>
+    <Flower52 desc=""><![CDATA[]]></Flower52>
     <Flower53 desc=""><![CDATA[紅]]></Flower53>
-    <Flower54 desc=""><![CDATA[]]></Flower54>
-    <Flower55 desc=""><![CDATA[]]></Flower55>
-    <Flower56 desc=""><![CDATA[]]></Flower56>
+    <Flower54 desc=""><![CDATA[]]></Flower54>
+    <Flower55 desc=""><![CDATA[]]></Flower55>
+    <Flower56 desc=""><![CDATA[]]></Flower56>
     <Flower57 desc=""><![CDATA[紅]]></Flower57>
-    <Flower58 desc=""><![CDATA[]]></Flower58>
-    <Flower59 desc=""><![CDATA[]]></Flower59>
-    <Flower60 desc=""><![CDATA[]]></Flower60>
-    <Flower61 desc=""><![CDATA[]]></Flower61>
-    <Flower62 desc=""><![CDATA[]]></Flower62>
-    <Flower63 desc=""><![CDATA[]]></Flower63>
-    <Flower64 desc=""><![CDATA[]]></Flower64>
-    <Flower65 desc=""><![CDATA[]]></Flower65>
+    <Flower58 desc=""><![CDATA[]]></Flower58>
+    <Flower59 desc=""><![CDATA[]]></Flower59>
+    <Flower60 desc=""><![CDATA[]]></Flower60>
+    <Flower61 desc=""><![CDATA[]]></Flower61>
+    <Flower62 desc=""><![CDATA[]]></Flower62>
+    <Flower63 desc=""><![CDATA[]]></Flower63>
+    <Flower64 desc=""><![CDATA[]]></Flower64>
+    <Flower65 desc=""><![CDATA[]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>

+ 33 - 32
Assets/Resource/XML/lan/English.xml

@@ -119,8 +119,9 @@ Music&Audio 十三叔
 
 Program 水怪
 ]]></Lc_CreditsContent>
-    <Ld_Title desc=""><![CDATA[]]></Ld_Title>
-    <Ld_PlaceHolder desc=""><![CDATA[]]></Ld_PlaceHolder>
+    <Ld_Title desc=""><![CDATA[Backup]]></Ld_Title>
+    <Ld_PlaceHolder desc=""><![CDATA["My Lovely Garden"
+My short code is: %NUM%]]></Ld_PlaceHolder>
     <M_Tit desc=""><![CDATA[Achievement]]></M_Tit>
     <J_Info0 desc=""><![CDATA[Get]]></J_Info0>
     <J_Info1 desc=""><![CDATA[Use skill:]]></J_Info1>
@@ -169,7 +170,7 @@ Program 水怪
     <Pi_TitleTip desc=""><![CDATA[Enter the title]]></Pi_TitleTip>
     <Pi_ContentTip desc=""><![CDATA[Enter the description]]></Pi_ContentTip>
     <Pi_BuyAllTip desc=""><![CDATA[Are you sure to buy them all?]]></Pi_BuyAllTip>
-    <Pi_Share desc=""><![CDATA[]]></Pi_Share>
+    <Pi_Share desc=""><![CDATA[Share]]></Pi_Share>
     <Q_Tit desc=""><![CDATA[Message board]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[Say something to the host]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
@@ -391,21 +392,21 @@ Program 水怪
     <Flower48 desc=""><![CDATA[Henbane(White)]]></Flower48>
     <Flower49 desc=""><![CDATA[Henbane(Pink)]]></Flower49>
     <Flower50 desc=""><![CDATA[Henbane(Red)]]></Flower50>
-    <Flower51 desc=""><![CDATA[]]></Flower51>
-    <Flower52 desc=""><![CDATA[]]></Flower52>
-    <Flower53 desc=""><![CDATA[]]></Flower53>
-    <Flower54 desc=""><![CDATA[]]></Flower54>
-    <Flower55 desc=""><![CDATA[]]></Flower55>
-    <Flower56 desc=""><![CDATA[]]></Flower56>
-    <Flower57 desc=""><![CDATA[]]></Flower57>
-    <Flower58 desc=""><![CDATA[]]></Flower58>
-    <Flower59 desc=""><![CDATA[]]></Flower59>
-    <Flower60 desc=""><![CDATA[]]></Flower60>
-    <Flower61 desc=""><![CDATA[]]></Flower61>
-    <Flower62 desc=""><![CDATA[]]></Flower62>
-    <Flower63 desc=""><![CDATA[]]></Flower63>
-    <Flower64 desc=""><![CDATA[]]></Flower64>
-    <Flower65 desc=""><![CDATA[]]></Flower65>
+    <Flower51 desc=""><![CDATA[Daisy(White)]]></Flower51>
+    <Flower52 desc=""><![CDATA[Daisy(Pink)]]></Flower52>
+    <Flower53 desc=""><![CDATA[Daisy(Red)]]></Flower53>
+    <Flower54 desc=""><![CDATA[Daisy(Yellow)]]></Flower54>
+    <Flower55 desc=""><![CDATA[Nopalxochia(White)]]></Flower55>
+    <Flower56 desc=""><![CDATA[Nopalxochia(Orange)]]></Flower56>
+    <Flower57 desc=""><![CDATA[Nopalxochia(White)]]></Flower57>
+    <Flower58 desc=""><![CDATA[Nopalxochia(White)]]></Flower58>
+    <Flower59 desc=""><![CDATA[Nopalxochia(White)]]></Flower59>
+    <Flower60 desc=""><![CDATA[Ipomoea Cairica(White)]]></Flower60>
+    <Flower61 desc=""><![CDATA[Ipomoea Cairica(Purple)]]></Flower61>
+    <Flower62 desc=""><![CDATA[Evening Primrose(White)]]></Flower62>
+    <Flower63 desc=""><![CDATA[Evening Primrose(Pink)]]></Flower63>
+    <Flower64 desc=""><![CDATA[Evening Primrose(Yellow)]]></Flower64>
+    <Flower65 desc=""><![CDATA[Evening Primrose(Purple)]]></Flower65>
   </FlowerName>
   <FlowerColor>
     <Flower0 desc=""><![CDATA[Pink]]></Flower0>
@@ -459,21 +460,21 @@ Program 水怪
     <Flower48 desc=""><![CDATA[White]]></Flower48>
     <Flower49 desc=""><![CDATA[Pink]]></Flower49>
     <Flower50 desc=""><![CDATA[Red]]></Flower50>
-    <Flower51 desc=""><![CDATA[Red]]></Flower51>
-    <Flower52 desc=""><![CDATA[Red]]></Flower52>
+    <Flower51 desc=""><![CDATA[White]]></Flower51>
+    <Flower52 desc=""><![CDATA[Pink]]></Flower52>
     <Flower53 desc=""><![CDATA[Red]]></Flower53>
-    <Flower54 desc=""><![CDATA[Red]]></Flower54>
-    <Flower55 desc=""><![CDATA[Red]]></Flower55>
-    <Flower56 desc=""><![CDATA[Red]]></Flower56>
-    <Flower57 desc=""><![CDATA[Red]]></Flower57>
-    <Flower58 desc=""><![CDATA[Red]]></Flower58>
-    <Flower59 desc=""><![CDATA[Red]]></Flower59>
-    <Flower60 desc=""><![CDATA[Red]]></Flower60>
-    <Flower61 desc=""><![CDATA[Red]]></Flower61>
-    <Flower62 desc=""><![CDATA[Red]]></Flower62>
-    <Flower63 desc=""><![CDATA[Red]]></Flower63>
-    <Flower64 desc=""><![CDATA[Red]]></Flower64>
-    <Flower65 desc=""><![CDATA[Red]]></Flower65>
+    <Flower54 desc=""><![CDATA[Yellow]]></Flower54>
+    <Flower55 desc=""><![CDATA[White]]></Flower55>
+    <Flower56 desc=""><![CDATA[Orange]]></Flower56>
+    <Flower57 desc=""><![CDATA[White]]></Flower57>
+    <Flower58 desc=""><![CDATA[White]]></Flower58>
+    <Flower59 desc=""><![CDATA[White]]></Flower59>
+    <Flower60 desc=""><![CDATA[White]]></Flower60>
+    <Flower61 desc=""><![CDATA[Purple]]></Flower61>
+    <Flower62 desc=""><![CDATA[White]]></Flower62>
+    <Flower63 desc=""><![CDATA[Pink]]></Flower63>
+    <Flower64 desc=""><![CDATA[Yellow]]></Flower64>
+    <Flower65 desc=""><![CDATA[Purple]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 8 - 8
Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -56,13 +56,13 @@ MonoBehaviour:
     MD5DictionaryFileName: AndroidMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 8322d2dbc03eda649a17970bba68e0b8, type: 3}
+    - Object: {fileID: 102900000, guid: 15769c76b0a898c43956a2170104105a, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 93a0a12dc45393e4a9602aefadb055fb, type: 3}
+    - Object: {fileID: 102900000, guid: 18eafc5a1207e0b4684cc02a99268365, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: cda53ff6778b1054e87a5610411f1f71, type: 3}
+    - Object: {fileID: 102900000, guid: 77060b67a7f8b1a4982d5d68ec1f2144, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: c9d179985526e764fb30975544663ca8, type: 3}
+    - Object: {fileID: 102900000, guid: 40f2765e25fe6804d9296ec83ee9f5f0, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
@@ -80,11 +80,11 @@ MonoBehaviour:
     MD5DictionaryFileName: WindowsMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 62664e6c14d6aa044826edf1d6808f1f, type: 3}
+    - Object: {fileID: 102900000, guid: 06276d44c4639a7418419ea01bd91f64, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 1cd34e0da763f6843998307b64542333, type: 3}
+    - Object: {fileID: 102900000, guid: 6a1ee4b0395a170498c4130082b3757d, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: e90c99efc8cedec45b9a57189b703203, type: 3}
+    - Object: {fileID: 102900000, guid: 77a0d550aa65e7d4c81cd5642e728469, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: c90608050bb902749bf293b85d455a0c, type: 3}
+    - Object: {fileID: 102900000, guid: 99e4b5702e0728846a7b147f22863899, type: 3}
       URL: null

+ 20 - 0
Assets/Script/Manage/ConfigManager.cs

@@ -1643,6 +1643,13 @@ public class ConfigManager : Regist
             ToVersion41(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 42)
+        {
+            Debug.LogWarning("UpdateArchive to 42");
+
+            ToVersion42(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -2227,4 +2234,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion42(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 42.ToString();
+
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

+ 35 - 35
Assets/Script/Tool/Auxiliary.cs

@@ -140,46 +140,46 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        //if (Input.GetKeyDown(KeyCode.Escape))
-        //{
-        //    TutorialManager.MemoryMinigameTutorial = true;
-        //    TutorialManager.memoryMinigameTutorial = true;
+        ////if (Input.GetKeyDown(KeyCode.Escape))
+        ////{
+        ////    TutorialManager.MemoryMinigameTutorial = true;
+        ////    TutorialManager.memoryMinigameTutorial = true;
 
-        //    TutorialManager.FindMissingMinigameTutorial = true;
-        //    TutorialManager.findMissingMinigameTutorial = true;
+        ////    TutorialManager.FindMissingMinigameTutorial = true;
+        ////    TutorialManager.findMissingMinigameTutorial = true;
 
-        //    TutorialManager.FindSoloMinigameTutorial = true;
-        //    TutorialManager.findSoloMinigameTutorial = true;
+        ////    TutorialManager.FindSoloMinigameTutorial = true;
+        ////    TutorialManager.findSoloMinigameTutorial = true;
 
-        //    SFSManager.GardenSmartFox.SmartFox.Disconnect();
-        //    RobotManager.DeactivateAllRobots(false);
-        //}
+        ////    SFSManager.GardenSmartFox.SmartFox.Disconnect();
+        ////    RobotManager.DeactivateAllRobots(false);
+        ////}
 
-        if (Input.GetKey(KeyCode.Space))
-        {
-            Vector3 pos = ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position;
-            ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position = pos + new Vector3(0, 2f, 0);
-        }
+        //if (Input.GetKey(KeyCode.Space))
+        //{
+        //    Vector3 pos = ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position;
+        //    ResourceManager.Get(CanvasLabel.Lc_CreditsContent).position = pos + new Vector3(0, 2f, 0);
+        //}
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            //TutorialManager.changeMouseTutorial = true;
-            //PlayerManager.Player.UAC.anim.Stop();
-            //Manager.Coin = 0;
-            //Manager.Diamond = 0;
-            //CommentRewardManager.GetReward();
-            //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
-            //DebugManager.ResetGardenLevel(38);
-            //HttpManager.GetTargetConfig
-            //(
-            //    "1801134288353834791",
-            //    data =>
-            //    {
-            //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
-            //        VisitManager.SavePulledConfig(data);
-            //    }
-            //);
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    //TutorialManager.changeMouseTutorial = true;
+        //    //PlayerManager.Player.UAC.anim.Stop();
+        //    //Manager.Coin = 0;
+        //    //Manager.Diamond = 0;
+        //    //CommentRewardManager.GetReward();
+        //    //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
+        //    //DebugManager.ResetGardenLevel(38);
+        //    //HttpManager.GetTargetConfig
+        //    //(
+        //    //    "1801134288353834791",
+        //    //    data =>
+        //    //    {
+        //    //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
+        //    //        VisitManager.SavePulledConfig(data);
+        //    //    }
+        //    //);
+        //}
 
         #endregion
 

+ 6 - 6
Assets/Script/Tool/Bundle.cs

@@ -20,7 +20,7 @@ public class Bundle : MonoBehaviour
 {
     #region
 
-    public static string version = "1_3_3";
+    public static string version = "1_3_4";
 
     public static bool CopyComplete
     {
@@ -827,12 +827,12 @@ public class Bundle : MonoBehaviour
                 //Debug.Log(localMD5);
                 //Debug.Log(HttpManager.Md5);
                 needUpdate = localMD5 != HttpManager.Md5;
-                //Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
-            }
-            if (Application.isEditor || Application.isMobilePlatform)
-            {
-                needUpdate = false;
+                Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
             }
+            //if (Application.isEditor || Application.isMobilePlatform)
+            //{
+            //    needUpdate = false;
+            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

+ 13 - 13
Assets/Script/Tool/Test.cs

@@ -12,7 +12,7 @@ public class Test : MonoBehaviour
     public Text Text;
     public Texture2D Texture2D;
 
-    private string FilePath;
+    //private string FilePath;
 
     public void Awake()
     {
@@ -35,18 +35,18 @@ public class Test : MonoBehaviour
     public static ShareSDK ShareSDK;
     public void TestShare()
     {
-        ShareContent shareContent = new ShareContent();
-        shareContent.SetText("content");
-        shareContent.SetTitle("title");
-        shareContent.SetTitleUrl("www.baidu.com");
-        shareContent.SetSite("www.baidu.com");
-        shareContent.SetSiteUrl("www.baidu.com");
-        shareContent.SetUrl("www.baidu.com");
-        shareContent.SetShareType(ContentType.App);
-        //shareContent.SetImageUrl("http://or5zgoeui.bkt.clouddn.com/game_icon.png");
-        shareContent.SetImagePath(FilePath);
-        ShareSDK.ShowPlatformList(null, shareContent, 100, 100);
-        Text.text = "¿ªÊ¼·ÖÏí";
+        //ShareContent shareContent = new ShareContent();
+        //shareContent.SetText("content");
+        //shareContent.SetTitle("title");
+        //shareContent.SetTitleUrl("www.baidu.com");
+        //shareContent.SetSite("www.baidu.com");
+        //shareContent.SetSiteUrl("www.baidu.com");
+        //shareContent.SetUrl("www.baidu.com");
+        //shareContent.SetShareType(ContentType.App);
+        ////shareContent.SetImageUrl("http://or5zgoeui.bkt.clouddn.com/game_icon.png");
+        //shareContent.SetImagePath(FilePath);
+        //ShareSDK.ShowPlatformList(null, shareContent, 100, 100);
+        //Text.text = "¿ªÊ¼·ÖÏí";
     }
 
     public void ShareCallback(int reqID, ResponseState state, PlatformType type, Hashtable result)

+ 10 - 4
ProjectSettings/ProjectSettings.asset

@@ -125,7 +125,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3.3
+  bundleVersion: 1.3.4
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -156,8 +156,8 @@ PlayerSettings:
     iOS: com.dashgame.garden
     tvOS: com.dashgame.garden
   buildNumber:
-    iOS: 19
-  AndroidBundleVersionCode: 27
+    iOS: 20
+  AndroidBundleVersionCode: 28
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 24
   AndroidPreferredInstallLocation: 1
@@ -262,7 +262,13 @@ PlayerSettings:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
     m_DynamicBatching: 1
-  m_BuildTargetGraphicsAPIs: []
+  m_BuildTargetGraphicsAPIs:
+  - m_BuildTarget: AndroidPlayer
+    m_APIs: 0b0000000800000015000000
+    m_Automatic: 1
+  - m_BuildTarget: WindowsStandaloneSupport
+    m_APIs: 0200000001000000
+    m_Automatic: 1
   m_BuildTargetVRSettings: []
   m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0