开启热更新

Assets/HotUpdate/IOS.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 3ae5f59da051da245834098829253171
+guid: 8e46fa4c2152e0442bb7c186fbedcbf2
 folderAsset: yes
-timeCreated: 1516931719
+timeCreated: 1518056215
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/HotUpdate/Windows.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: c834c5dae0622884ca57d4cee44eb238
+guid: 9e923939d42957c418a0d8876dd88738
 folderAsset: yes
-timeCreated: 1517987355
+timeCreated: 1518056220
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    iOS:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Prefab/Object/Star.prefab

@@ -51,7 +51,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1793247254756174}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.15, y: 0.36, z: 0}
+  m_LocalPosition: {x: 0.1500001, y: 0.36000007, z: 0.19999981}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children: []
   m_Father: {fileID: 4802320044011298}
@@ -64,7 +64,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1423747695256464}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -6, y: 0.8, z: -5}
+  m_LocalPosition: {x: -6, y: 0.8, z: -5.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4373189500522788}

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -62,6 +62,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1006556591565166
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224934571005385950}
+  - component: {fileID: 222662386492398862}
+  - component: {fileID: 114869605008525828}
+  m_Layer: 5
+  m_Name: K_Tit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1006766824147322
 GameObject:
   m_ObjectHideFlags: 1
@@ -925,7 +942,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
@@ -2592,6 +2609,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1146663012734858
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224380728162702874}
+  - component: {fileID: 222279453069863528}
+  - component: {fileID: 114273875824198684}
+  m_Layer: 5
+  m_Name: Bd_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1146904342523404
 GameObject:
   m_ObjectHideFlags: 1
@@ -16769,12 +16803,12 @@ GameObject:
   - component: {fileID: 222354179571553060}
   - component: {fileID: 114865135862851350}
   m_Layer: 5
-  m_Name: K_Tit
+  m_Name: K_Lab3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1931769464506004
 GameObject:
   m_ObjectHideFlags: 1
@@ -17427,7 +17461,7 @@ GameObject:
   - component: {fileID: 222535682564872154}
   - component: {fileID: 114059233431648014}
   m_Layer: 5
-  m_Name: Bd_Title
+  m_Name: Bd_Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -20537,7 +20571,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -20548,16 +20582,16 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
     m_FontSize: 17
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 114
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u793C\u5305\u5956\u52B1"
+  m_Text: 
 --- !u!114 &114059960334680692
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -28560,6 +28594,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114273875824198684
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146663012734858}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  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: 17
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 114
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u793C\u5305\u5956\u52B1"
 --- !u!114 &114274366872483280
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -51880,6 +51947,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114869605008525828
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1006556591565166}
+  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.5803922, g: 0.09411766, b: 0.09411766, a: 1}
+  m_RaycastTarget: 1
+  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: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u9000\u51FA\u6E38\u620F?"
 --- !u!114 &114870197093549780
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -61079,6 +61179,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1364233723655836}
+--- !u!222 &222279453069863528
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146663012734858}
 --- !u!222 &222279791640743724
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -63083,6 +63189,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1733654438694030}
+--- !u!222 &222662386492398862
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1006556591565166}
 --- !u!222 &222663174228456750
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -67692,7 +67804,7 @@ RectTransform:
   m_Children:
   - {fileID: 224772624321667534}
   m_Father: {fileID: 224615837835894668}
-  m_RootOrder: 2
+  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}
@@ -70937,12 +71049,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224572351682749150}
-  m_RootOrder: 0
+  m_Father: {fileID: 224986266947929816}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 214.5, y: -56.999977}
+  m_AnchoredPosition: {x: 50, y: -168}
   m_SizeDelta: {x: 384, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224301720278101990
@@ -72339,6 +72451,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0.000030517578, y: -0.000009081999}
   m_SizeDelta: {x: 0, y: 370}
   m_Pivot: {x: 0, y: 0.5}
+--- !u!224 &224380728162702874
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146663012734858}
+  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: 224615837835894668}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.9}
+  m_AnchorMax: {x: 0.5, y: 0.9}
+  m_AnchoredPosition: {x: 0, y: -0.73999786}
+  m_SizeDelta: {x: 160, y: 29}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224380752597365256
 RectTransform:
   m_ObjectHideFlags: 1
@@ -73247,7 +73377,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 1.9728832e-32, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -74509,7 +74639,7 @@ RectTransform:
   m_Children:
   - {fileID: 224030841416356944}
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -76352,7 +76482,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 224301211020142586}
+  - {fileID: 224934571005385950}
   - {fileID: 224986266947929816}
   - {fileID: 224725686779648230}
   m_Father: {fileID: 224904266184244856}
@@ -77242,8 +77372,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224674612688876854}
   - {fileID: 224863283310294208}
+  - {fileID: 224674612688876854}
+  - {fileID: 224380728162702874}
   - {fileID: 224123421402180164}
   m_Father: {fileID: 224623735070588188}
   m_RootOrder: 0
@@ -78604,7 +78735,7 @@ RectTransform:
   m_Children:
   - {fileID: 224589918620029198}
   m_Father: {fileID: 224615837835894668}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -82234,17 +82365,17 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1959167464823796}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
   m_Children: []
   m_Father: {fileID: 224615837835894668}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.9}
   m_AnchorMax: {x: 0.5, y: 0.9}
-  m_AnchoredPosition: {x: 0, y: -0.73999786}
-  m_SizeDelta: {x: 160, y: 29}
+  m_AnchoredPosition: {x: -0.000030517578, y: -29.74}
+  m_SizeDelta: {x: 464.3, y: 29}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224863956332486956
 RectTransform:
@@ -83731,6 +83862,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224934571005385950
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1006556591565166}
+  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: 224572351682749150}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 214.5, y: -56.999977}
+  m_SizeDelta: {x: 384, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224934863761541958
 RectTransform:
   m_ObjectHideFlags: 1
@@ -84705,6 +84854,7 @@ RectTransform:
   - {fileID: 224872852296835126}
   - {fileID: 224800375159776288}
   - {fileID: 224815988563629826}
+  - {fileID: 224301211020142586}
   - {fileID: 224439401636557830}
   - {fileID: 224490149669999908}
   m_Father: {fileID: 224572351682749150}

Assets/Resource/XML/Config/new_flower_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="36" name="鸡冠花（黄）" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
+  <item id="36" name="花" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
   <comment>
     <id>
 id

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -1,6 +1,6 @@
 <lan>
   <UI>
-    <C_MiniGameLab desc=""><![CDATA[快来打理花园吧！]]></C_MiniGameLab>
+    <C_MiniGameLab desc=""><![CDATA[快来打理花园吧]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[等级]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[提升花园等级,开放试衣间]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[无法访问花园]]></C_VisitFail>

Assets/Resource/XML/lan/default_ChineseSimplified.xml

@@ -2,5 +2,6 @@
   <UI>
     <AJ_Title desc=""><![CDATA[更新游戏中]]></AJ_Title>
     <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
   </UI>
 </lan>

Assets/Resource/XML/lan/default_ChineseTraditional.xml

@@ -2,5 +2,6 @@
   <UI>
     <AJ_Title desc=""><![CDATA[]]></AJ_Title>
     <AJ_Content desc=""><![CDATA[]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[]]></AJ_UpdateFailed>
   </UI>
 </lan>

Assets/Resource/XML/lan/default_English.xml

@@ -2,5 +2,6 @@
   <UI>
     <AJ_Title desc=""><![CDATA[]]></AJ_Title>
     <AJ_Content desc=""><![CDATA[]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[]]></AJ_UpdateFailed>
   </UI>
 </lan>

Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -74,7 +74,7 @@ namespace assetBundleUtility
                 string[] strings = items[i].Split('|');
                 assetBundleSet.Name = strings[0];
                 assetBundleSet.MD5 = strings[1];
-                assetBundleSet.URL = strings[2];
+                //assetBundleSet.URL = strings[2];
                 assetBundleSets.Add(assetBundleSet);
             }
             return assetBundleSets;
@@ -321,6 +321,21 @@ namespace assetBundleUtility
 	
 	    private static IEnumerator downloadBundle(AssetBundleSet assetBundleSet, Action succeedCallback, Action failedCallback)
 	    {
+            string folder;
+            if (Application.platform == RuntimePlatform.Android)
+            {
+                folder = "android";
+            }
+            else if (Application.platform == RuntimePlatform.IPhonePlayer)
+            {
+                folder = "ios";
+            }
+            else
+            {
+                folder = "windows";
+            }
+	        assetBundleSet.URL = HttpManager.AssetbundleUrl + folder + Path.DirectorySeparatorChar + assetBundleSet.Name;
+            //Debug.Log(assetBundleSet.URL);
 	        WWW www = new WWW(assetBundleSet.URL);
 	        yield return www;
 	        if (!string.IsNullOrEmpty(www.error))

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -56,18 +56,18 @@ MonoBehaviour:
     MD5DictionaryFileName: AndroidMD5Dictionary.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 46a699a86f13316489a948f63bfaf901, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_config
-    - Object: {fileID: 102900000, guid: 33466405b7ecc6b4c901205ff5be2667, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_ske
-    - Object: {fileID: 102900000, guid: 1a49bf28873b63346a9d25a39c921fa7, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_tex
-    - Object: {fileID: 102900000, guid: 93b2fda5a42fe4a4cb89c237fd0e01ec, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_flower_config
-    - Object: {fileID: 102900000, guid: 5b8c44112f2fe534c9dfaa0a6dfc0cf5, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_flower_tex
-    - Object: {fileID: 102900000, guid: 53f574c01e2650046b757b46d3da7100, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_language_config
+    - Object: {fileID: 102900000, guid: b144e6804b7dd404e849b0bc74527138, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 8cdda597a784fa44098f091fab3fb829, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: d205a191403fc2a4c9e9cbfd84e6a204, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: ef850c01badae034f8aa1a2a88f76f03, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 6d9c13d607d91c746877e21c80481636, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: c19d6ad25e0cf5e44853e5dcf379dcbc, type: 3}
+      URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
     OutputPath: Assets\HotUpdate\IOS
@@ -88,15 +88,15 @@ MonoBehaviour:
     MD5DictionaryFileName: WindowsMD5Dictionary.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: d77b34cf60a1077478335988f4bdebe4, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_dress_config
-    - Object: {fileID: 102900000, guid: fbea7fe3acff6624ab8b7ebc7e240903, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_dress_ske
-    - Object: {fileID: 102900000, guid: 3be1358ca29914248a4b7d9989005596, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_dress_tex
-    - Object: {fileID: 102900000, guid: 051b1a9165a10404d9fc1a9b89ada782, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_flower_config
-    - Object: {fileID: 102900000, guid: 7be714fb3fe5afc4f856dbf717633a4c, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_flower_tex
-    - Object: {fileID: 102900000, guid: 8897a86bbac61914cb2646d527eba5e3, type: 3}
-      URL: file://D:\UnityProject\Garden5\Assets\HotUpdate\Windows\new_language_config
+    - Object: {fileID: 102900000, guid: ba7281a1ab56d604c95686e9e6dbfee4, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: a5fd5eee70dcf7146819a50e531b4f27, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 5ca364cd037134c429eeeacb5f2ff0cb, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 0917c1efcd07fdc47ac744335d69727f, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 3b87727f8d4abf84f85a6a101cf2d12b, type: 3}
+      URL: null
+    - Object: {fileID: 102900000, guid: 65d975531e8d39e4a9c9710124715f93, type: 3}
+      URL: null

Assets/Script/Label/CanvasLabel.cs

@@ -993,6 +993,7 @@ public class CanvasLabel
     public static string Bc_ConfirmLab = "Bc_ConfirmLab";
     public static string Bd_Mail = "Bd_Mail";
     public static string Bd_Mail0 = "Bd_Mail0";
+    public static string Bd_Text = "Bd_Text";
     public static string Bd_Get = "Bd_Get";
     public static string Bd_GetLab = "Bd_GetLab";
     public static string Bd_Title = "Bd_Title";
@@ -1031,6 +1032,7 @@ public class CanvasLabel
     public static string K_ImagePlus2 = "K_ImagePlus2";
     public static string K_Lab1 = "K_Lab1";
     public static string K_ImagePlus1 = "K_ImagePlus1";
+    public static string K_Lab3 = "K_Lab3";
     public static string K_LinkButton = "K_LinkButton";
     public static string K_NotifyLab = "K_NotifyLab";
     public static string K_NotifyImagePlus = "K_NotifyImagePlus";

Assets/Script/Label/LanguageLabel.cs

@@ -18,6 +18,7 @@ public class LanguageLabel
 
     public static string UI__AJ_Title = "UI__AJ_Title";
     public static string UI__AJ_Content = "UI__AJ_Content";
+    public static string UI__AJ_UpdateFailed = "UI__AJ_UpdateFailed";
     //StartMark-Used by LabelUtility-Do not remove
     public static string UI = "UI";
     	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
@@ -811,7 +812,6 @@ public class LanguageLabel
     	public static string DressRoom__Armature28 = "DressRoom__Armature28";
     	public static string DressRoom__Armature29 = "DressRoom__Armature29";
     	public static string DressRoom__Armature30 = "DressRoom__Armature30";
-    	public static string DressRoom__Armature31 = "DressRoom__Armature31";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -829,7 +829,6 @@ public class LanguageLabel
     	public static string DressRoom__Armature215 = "DressRoom__Armature215";
     	public static string DressRoom__Armature216 = "DressRoom__Armature216";
     	public static string DressRoom__Armature217 = "DressRoom__Armature217";
-    	public static string DressRoom__Armature218 = "DressRoom__Armature218";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -857,7 +856,6 @@ public class LanguageLabel
     	public static string DressRoom__Armature610 = "DressRoom__Armature610";
     	public static string DressRoom__Armature611 = "DressRoom__Armature611";
     	public static string DressRoom__Armature612 = "DressRoom__Armature612";
-    	public static string DressRoom__Armature613 = "DressRoom__Armature613";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -875,7 +873,6 @@ public class LanguageLabel
     	public static string DressRoom__Armature815 = "DressRoom__Armature815";
     	public static string DressRoom__Armature816 = "DressRoom__Armature816";
     	public static string DressRoom__Armature817 = "DressRoom__Armature817";
-    	public static string DressRoom__Armature818 = "DressRoom__Armature818";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";

Assets/Script/Manage/ConfigManager.cs

@@ -1396,6 +1396,20 @@ public class ConfigManager : Regist
             ToVersion17(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 18)
+        {
+            Debug.LogWarning("UpdateArchive to 18");
+
+            ToVersion18(nativeDoc, defaultDoc);
+        }
+
+        if (nativeVersion < 19)
+        {
+            Debug.LogWarning("UpdateArchive to 19");
+
+            ToVersion19(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1681,4 +1695,30 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion18(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 18.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion19(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 19.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/HttpManager.cs

@@ -61,6 +61,7 @@ public class HttpManager : Regist
         public string ID;
         public string Key;
         public string Value;
+        public string Text;
 
         public MailReward(string id, string key, string value)
         {
@@ -140,6 +141,11 @@ public class HttpManager : Regist
 
     public static string MailXmlStr;
     public static List<MailReward> MailRewardList = new List<MailReward>();
+    public static List<MailReward> BroadcastMailRewardList = new List<MailReward>();
+
+    public static string Md5;
+    public static string Md5Dictionnary;
+    public static string AssetbundleUrl;
 
     public static string BaseURL = "https://garden.dashgame.com/index.php/home";
     public static string NewBaseURL = "https://garden.dashgame.com/index.php/newhome";
@@ -165,12 +171,15 @@ public class HttpManager : Regist
     public static string GetRecommendBuddyListURL = NewBaseURL + "/buddy/recommend";
     public static string SearchBuddyURL = NewBaseURL + "/buddy/like";
     public static string GetPrivateMessageURL = NewBaseURL + "/comment/find";
+    public static string LoadFileURL = NewBaseURL + "/index/loadfile";
     public static string ReportMailAddress = "bug@dashgame.com";
 
     #endregion
 
     public void Awake()
     {
+        //GetConfigBySerialNumber("1801134288353834791", data => Debug.Log(data.ToJson()));
+
         //GetConfigByID
         //(
         //    "rr1WP4",
@@ -645,6 +654,7 @@ public class HttpManager : Regist
             urlData,
             data =>
             {
+                //Debug.Log(data.ToJson());
                 if (data.Inst_Object.ContainsKey("error"))
                 {
                     if (ConfigManager.configDocument != null)
@@ -661,6 +671,7 @@ public class HttpManager : Regist
                 }
                 else
                 {
+                    AssetbundleUrl = data["l"][4]["val"].ToJson().Trim('"');
                     callback(data);
                 }
             }
@@ -735,6 +746,15 @@ public class HttpManager : Regist
         Image Icon2 = childDictionary[MailItemLabel.Icon2].GetComponent<Image>();
         Image Icon3 = childDictionary[MailItemLabel.Icon3].GetComponent<Image>();
 
+        if (!string.IsNullOrEmpty(mailReward.Text))
+        {
+            ResourceManager.Get<Text>(CanvasLabel.Bd_Text).text = mailReward.Text;
+        }
+        else
+        {
+            ResourceManager.Get<Text>(CanvasLabel.Bd_Text).text = "";
+        }
+
         if (mailReward.Key == "pack")
         {
             SkillRoot skillRoot;
@@ -855,6 +875,13 @@ public class HttpManager : Regist
 
     public static void DecodeMailXmlStr(string mailXml)
     {
+        if (string.IsNullOrEmpty(mailXml))
+        {
+            return;
+        }
+
+        //Debug.Log(mailXml);
+
         MailRewardList = new List<MailReward>();
 
         XmlDocument xmlDoc = new XmlDocument();
@@ -890,19 +917,40 @@ public class HttpManager : Regist
 
             for (int j = 0; j < targetIdNodeList.Count; j++)
             {
-                if (targetIdNodeList[j].InnerText == ID)
+                if (targetIdNodeList[j].InnerText == ID || targetIdNodeList[j].InnerText == "AllPlayersR")
                 {
                     XmlNodeList xmlNodeList = rewardNodeList[i].SelectSingleNode("reward").ChildNodes;
 
                     for (int k = 0; k < xmlNodeList.Count; k++)
                     {
-                        MailRewardList.Add(new MailReward(id, xmlNodeList[k].Name, xmlNodeList[k].InnerText));
+                        //MailReward mailReward = new MailReward(id, xmlNodeList[k].Name, xmlNodeList[k].InnerText);
+                        //if (targetIdNodeList[j].InnerText == "AllPlayersR")
+                        //{
+                        //    mailReward.Text = rewardNodeList[i].SelectSingleNode("text").InnerText;
+                        //    BroadcastMailRewardList.Add(mailReward);
+                        //}
+                        //else
+                        //{
+                        //    MailRewardList.Add(mailReward);
+                        //}
+                        MailReward mailReward = new MailReward(id, xmlNodeList[k].Name, xmlNodeList[k].InnerText);
+                        if (targetIdNodeList[j].InnerText == ID)
+                        {
+                            MailRewardList.Add(mailReward);
+                        }
+                        else
+                        {
+                            mailReward.Text = rewardNodeList[i].SelectSingleNode("text").InnerText;
+                            BroadcastMailRewardList.Add(mailReward);
+                        }
                     }
 
                     break;
                 }
             }
         }
+
+        MailXmlStr = null;
     }
 
     public static void GetBuyPackLimitFlag()
@@ -1637,6 +1685,82 @@ public class HttpManager : Regist
     }
 
 
+    public static void LoadMd5()
+    {
+        string fileName = "";
+        if (Application.platform == RuntimePlatform.Android)
+        {
+            fileName = "AndroidMD5";
+        }
+        else if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            fileName = "IOSMD5";
+        }
+        else
+        {
+            fileName = "WindowsMD5";
+        }
+        if (string.IsNullOrEmpty(fileName))
+        {
+            Debug.LogWarning("fileName is unvalid");
+        }
+        else
+        {
+            LoadFile(fileName, str => Md5 = str, () => { });
+        }
+    }
+
+    public static void LoadMd5Dictionary()
+    {
+        string fileName = "";
+        if (Application.platform == RuntimePlatform.Android)
+        {
+            fileName = "AndroidMD5Dictionary";
+        }
+        else if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            fileName = "IOSMD5Dictionary";
+        }
+        else
+        {
+            fileName = "WindowsMD5Dictionary";
+        }
+        if (string.IsNullOrEmpty(fileName))
+        {
+            Debug.LogWarning("fileName is unvalid");
+        }
+        else
+        {
+            LoadFile(fileName, str => Md5Dictionnary = str, () => { });
+        }
+    }
+
+    public static void LoadFile(string fileName, Action<string> succeedCallback, Action failedCallback)
+    {
+        URLRequestData urlData = new URLRequestData();
+        urlData.Add("f", fileName);
+
+        URLRequest.CreateURLRequest
+        (
+            true,
+            LoadFileURL,
+            urlData,
+            jData =>
+            {
+                if (jData.Inst_Object.ContainsKey("l"))
+                {
+                    succeedCallback.Invoke((string) jData["l"]);
+                }
+                else
+                {
+                    failedCallback.Invoke();
+                }
+            },
+            URLRequest.Method.POST
+        );
+    }
+
+
     private static string SmtpHost = "smtp.163.com";
     private static string ReporterMailAccount = "dashgamegarden@163.com";
     private static string ReporterMailPassword = "cs670cs";

Assets/Script/Manage/Initializer.cs

@@ -98,6 +98,10 @@ public class Initializer : MonoBehaviour
     private void InitScript()
     {
         int index = 1;
+
+        HttpManager.LoadMd5();
+        HttpManager.LoadMd5Dictionary();
+
         InitScriptProgress = index++.ToString();
         Application.targetFrameRate = 50;
 

Assets/Script/Manage/Manager.cs

@@ -1192,7 +1192,7 @@ public class Manager : Regist
                     Bubble.Show
                     (
                         Language.GetStr(LanguageLabel.Common__ShortCoin),
-                        Language.GetStr(LanguageLabel.Common__NavigateCoin),
+                        "",
                         null,
                         Lib.GoldSprite,
                         () =>
@@ -1227,6 +1227,9 @@ public class Manager : Regist
                             }
                         }
                     );
+                    Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__NavigateCoin);
+                    Bubble.Lab3.SetActive(true);
+                    Bubble.Lab.SetActive(false);
                 }
                 else
                 {
@@ -1265,7 +1268,7 @@ public class Manager : Regist
                     Bubble.Show
                     (
                         Language.GetStr(LanguageLabel.Common__ShortDiamond),
-                        Language.GetStr(LanguageLabel.Common__NavigateDiamond),
+                        "",
                         null,
                         Lib.DiamondSprite,
                         () =>
@@ -1300,6 +1303,9 @@ public class Manager : Regist
                             }
                         }
                     );
+                    Bubble.Lab3.text = Language.GetStr(LanguageLabel.Common__NavigateDiamond);
+                    Bubble.Lab3.SetActive(true);
+                    Bubble.Lab.SetActive(false);
                 }
                 else
                 {

Assets/Script/Manage/MiniGameManager.cs

@@ -1178,10 +1178,10 @@ public class MiniGameManager : Regist
 
     public static MiniGameType SelectMinigameType(List<MiniGameType> availableGameTypes)
     {
-        PunchGameOperateParent.SetActive(false);
-        MemoryGameOperateParent.SetActive(false);
-        FindSoloGameOperateParent.SetActive(false);
-        FindMissingGameOperateParent.SetActive(false);
+        //PunchGameOperateParent.SetActive(false);
+        //MemoryGameOperateParent.SetActive(false);
+        //FindSoloGameOperateParent.SetActive(false);
+        //FindMissingGameOperateParent.SetActive(false);
 
         bool memoryGameAvailable = Manager.GardenLevel >= TutorialManager.MemoryMinigameTutorialLevel;
         bool findSoloGameAvailable = GardenManager.TotalUnlockFlower >= TutorialManager.MinFlowerForFindSoloGame && Manager.GardenLevel >= TutorialManager.FindSoloMinigameTutorialLevel;
@@ -1218,6 +1218,11 @@ public class MiniGameManager : Regist
 
     public static void GameEnter(MiniGameType type)
     {
+        PunchGameOperateParent.SetActive(false);
+        MemoryGameOperateParent.SetActive(false);
+        FindSoloGameOperateParent.SetActive(false);
+        FindMissingGameOperateParent.SetActive(false);
+
         miniGameType = type;
 
         TryGetNewFlower();

Assets/Script/Manage/ResourceManager.cs

@@ -590,7 +590,7 @@ public class ResourceManager : Regist
         Star star = tra.GetComponent<Star>();
 
         tra.parent = slot.transform;
-        tra.SetLZ(-0.1f + Random.Range(StarMinOffset, StarMaxOffset));
+        tra.SetLZ(-0.3f + Random.Range(StarMinOffset, StarMaxOffset));
 
         if (star == null)
         {

Assets/Script/Manage/SignManager.cs

@@ -686,6 +686,11 @@ public class SignManager : Regist
             return true;
         }
 
+        if (ShowBroadcastMailRewardPanel())
+        {
+            return true;
+        }
+
         if (ShowSignPanel())
         {
             return true;
@@ -725,14 +730,43 @@ public class SignManager : Regist
 
         if (HttpManager.MailRewardList.Count > 0)
         {
-                HttpManager.GetAllMailReward();
+            HttpManager.GetAllMailReward();
 
-                ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
 
-                ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
-                ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenForCG();
+            ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
+            ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenForCG();
 
-                return true;
+            HttpManager.MailRewardList = new List<HttpManager.MailReward>();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static bool ShowBroadcastMailRewardPanel()
+    {
+        HttpManager.DecodeMailXmlStr(HttpManager.MailXmlStr);
+        
+        if (HttpManager.BroadcastMailRewardList.Count > 0)
+        {
+            HttpManager.GetMailReward(HttpManager.BroadcastMailRewardList[0]);
+
+            //AnimManager.MoveForList.Remove(ResourceManager.Get(CanvasLabel.C_Group).GetTweenCG());
+            //AnimManager.MoveForList.Remove(ResourceManager.Get(CanvasLabel.B_SignIn).GetTweenCG());
+            //AnimManager.MoveForList.Remove(ResourceManager.Get(CanvasLabel.Bd_Mail0).GetTweenCG());
+            //AnimManager.MoveBacList.Remove(ResourceManager.Get(CanvasLabel.C_Group).GetTweenCG());
+            //AnimManager.MoveBacList.Remove(ResourceManager.Get(CanvasLabel.B_SignIn).GetTweenCG());
+            //AnimManager.MoveBacList.Remove(ResourceManager.Get(CanvasLabel.Bd_Mail0).GetTweenCG());
+
+            ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
+            ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenForCG();
+
+            HttpManager.BroadcastMailRewardList.RemoveAt(0);
+
+            return true;
         }
 
         return false;

Assets/Script/Manage/UIManager.cs

@@ -245,7 +245,16 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenBacCG();
+                int childCount = ResourceManager.Get(CanvasLabel.Bd_Grid).childCount;
+                for (int i = 0; i < childCount; i++)
+                {
+                    ResourceManager.Save(ResourceManager.Get(CanvasLabel.Bd_Grid).GetChild(0));
+                }
+
+                if (HttpManager.MailRewardList.Count == 0 && HttpManager.BroadcastMailRewardList.Count == 0)
+                {
+                    ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenBacCG();
+                }
 
                 if (!SignManager.ShowPanels())
                 {

Assets/Script/Manage/VisitManager.cs

@@ -388,11 +388,11 @@ public class VisitManager : Regist
             return;
         }
 
-        if (ConfigManager.GetConfigVersion(ConfigManager.ConfigDocument) < ConfigManager.GetConfigVersion(VisiteeDocument))
-        {
-            ShowVisitFailPanelFromSelfGarden();
-            return;
-        }
+        //if (ConfigManager.GetConfigVersion(ConfigManager.ConfigDocument) < ConfigManager.GetConfigVersion(VisiteeDocument))
+        //{
+        //    ShowVisitFailPanelFromSelfGarden();
+        //    return;
+        //}
 
         ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
         //Debug.Log(Document.OuterXml);
@@ -734,6 +734,7 @@ public class VisitManager : Regist
 
     public static void ShowVisitFailPanelFromSelfGarden()
     {
+        //Debug.Log(0);
         Bubble.Show
         (
             Language.GetStr(LanguageLabel.UI__C_VisitFail),
@@ -1003,11 +1004,14 @@ public class VisitManager : Regist
         //Debug.Log(jsonData.ToJson());
         XmlDocument document = new XmlDocument();
         document.LoadXml(jsonData["l"].ToString());
+        //Debug.Log(1);
         if (ConfigManager.GetGardenLevel(document) == 0)
         {
             return;
         }
+        //Debug.Log(2);
         XmlNode xmlNode = document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.SerialNumber);
+        //UnusedDataList.Add(new VisitData(jsonData, document));
         if (xmlNode != null && xmlNode.Attributes[0].Value != HttpManager.SerialNumber)
         {
             UnusedDataList.Add(new VisitData(jsonData, document));

Assets/Script/Tool/Auxiliary.cs

@@ -141,11 +141,19 @@ public class Auxiliary : Regist
 
         //if (Input.GetKeyDown(KeyCode.Escape))
         //{
+        //    TutorialManager.MemoryMinigameTutorial = true;
+        //    TutorialManager.memoryMinigameTutorial = true;
+
+        //    TutorialManager.FindMissingMinigameTutorial = true;
+        //    TutorialManager.findMissingMinigameTutorial = true;
+
+        //    TutorialManager.FindSoloMinigameTutorial = true;
+        //    TutorialManager.findSoloMinigameTutorial = true;
+
         //    SFSManager.GardenSmartFox.SmartFox.Disconnect();
         //    RobotManager.DeactivateAllRobots(false);
         //}
 
-
         //if (Input.GetKeyDown(KeyCode.Space))
         //{
         //    foreach (var skill in Manager.UsingSkillList)
@@ -158,10 +166,10 @@ public class Auxiliary : Regist
         //    }
         //    HttpManager.GetTargetConfig
         //    (
-        //        "1801203341708362776",
+        //        "1801134288353834791",
         //        data =>
         //        {
-        //            VisitManager.VisiteeSerialNumber = "1801169491424370642";
+        //            VisitManager.VisiteeSerialNumber = "1801134288353834791";
         //            VisitManager.SavePulledConfig(data);
         //        }
         //    );
@@ -231,6 +239,10 @@ public class Auxiliary : Regist
 
         //if (Input.GetKeyDown(KeyCode.C))
         //{
+        //    ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, "");
+
+        //    SignManager.LastSignTime = DateTime.MinValue;
+
         //    DebugManager.ResetAbilityAnim();
         //}
 

Assets/Script/Tool/Bundle.cs

@@ -752,6 +752,9 @@ public class Bundle : MonoBehaviour
     public static int UpdateFinishAmt;
     public static bool UpdateAssetBundles()
     {
+        //Debug.Log(HttpManager.Md5);
+        //Debug.Log(HttpManager.Md5Dictionnary);
+        //Debug.Log(HttpManager.AssetbundleUrl);
         try
         {
             Initializer.DebugText.text = "U0";
@@ -771,20 +774,29 @@ public class Bundle : MonoBehaviour
             );
             Initializer.DebugText.text = "U3";
             string localMD5 = AssetBundleUtility.GetMD5OfAssetBundleSets(assetBundleSets);
-            string serverMD5 = "AE29F7EE00843A792D96CA02D6907FAA";
-            bool needUpdate = localMD5 != serverMD5;
-            //if (Application.isEditor)
-            //{
-            //    needUpdate = false;
-            //}
-            //needUpdate = false;
-            //Debug.LogWarning($"NeedUpdate : {needUpdate}");
+            bool needUpdate; 
+            if (string.IsNullOrEmpty(HttpManager.Md5) || string.IsNullOrEmpty(HttpManager.Md5Dictionnary) || string.IsNullOrEmpty(HttpManager.AssetbundleUrl))
+            {
+                needUpdate = false;
+                Debug.LogWarning($"NeedUpdate : {needUpdate} connection error");
+            }
+            else
+            {
+                Debug.Log(localMD5);
+                Debug.Log(HttpManager.Md5);
+                needUpdate = localMD5 != HttpManager.Md5;
+                Debug.LogWarning($"NeedUpdate : {needUpdate}");
+            }
+            if (Application.isEditor)
+            {
+                needUpdate = false;
+            }
             if (needUpdate)
             {
                 Initializer.DebugText.text = "U4";
                 UpdateAmt = AssetBundleUtility.UpdateAllAssetBundle
                 (
-                    "new_dress_config|F5D72F9FDCFBB75E83A751FB180B9D4C|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_dress_config\r\nnew_dress_ske|531AE05FA301BBAD7B58B532BCD04CFD|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_dress_ske\r\nnew_dress_tex|3060DC78E5C9A8D58CF440C6C66035C4|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_dress_tex\r\nnew_flower_config|E1B8FB25188BAB5257427245A9FAED72|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_flower_config\r\nnew_flower_tex|3AE116480991657BBC2CCB7651D39948|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_flower_tex\r\nnew_language_config|86E969CA359D6514822E3A514C2C9F97|file://D:\\UnityProject\\Garden5\\Assets\\HotUpdate\\Windows\\new_language_config",
+                    HttpManager.Md5Dictionnary,
                     persistentFolderPath,
                     assetBundleSets,
                     DownloadAllAssetBundleSucceed,
@@ -946,10 +958,12 @@ public class Bundle : MonoBehaviour
 
     public static void DownloadAssetBundleFailed(AssetBundleSet assetBundleSet, string error)
     {
-        Debug.Log(error);
-        Initializer.DebugText.text = assetBundleSet.Name;
-        Initializer.DebugText.text += error;
-        Initializer.EnableDebugLab();
+        string str = Language.GetStr(LanguageLabel.UI__AJ_UpdateFailed, Application.systemLanguage) + "    "  + error;
+        UpdatePanel.SetContent(str);
+        //Debug.Log(error);
+        //Initializer.DebugText.text = assetBundleSet.Name;
+        //Initializer.DebugText.text += error;
+        //Initializer.EnableDebugLab();
     }
 
     public static void SkipUpdateForDebugMode()

Assets/Script/Tool/UI/Bubble.cs

@@ -12,6 +12,7 @@ public class Bubble : Regist
     public static Text Lab;
     public static Text Lab1;
     public static Text Lab2;
+    public static Text Lab3;
     public static Text NotifyLab;
     public static Image Icon;
     public static Button Cancel;
@@ -36,6 +37,7 @@ public class Bubble : Regist
         Lab = ResourceManager.Get<Text>(CanvasLabel.K_Lab);
         Lab1 = ResourceManager.Get<Text>(CanvasLabel.K_Lab1);
         Lab2 = ResourceManager.Get<Text>(CanvasLabel.K_Lab2);
+        Lab3 = ResourceManager.Get<Text>(CanvasLabel.K_Lab3);
         NotifyLab = ResourceManager.Get<Text>(CanvasLabel.K_NotifyLab);
         Icon = ResourceManager.Get<Image>(CanvasLabel.K_Icon);
 
@@ -60,6 +62,7 @@ public class Bubble : Regist
     {
         Lab1.SetActive(false);
         Lab2.SetActive(false);
+        Lab3.SetActive(false);
         LinkButton.SetActive(false);
 
         AudioManager.PlayClip(AudioLabel.Bubble);

Assets/Script/UI/UpdatePanel.cs

@@ -60,4 +60,9 @@ public class UpdatePanel : MonoBehaviour
         str = str.Replace("%NUM0%", updateAmt.ToString()).Replace("%NUM1%", finishAmt.ToString());
         instance.content.text = str;
     }
+
+    public static void SetContent(string str)
+    {
+        instance.content.text = str;
+    }
 }

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.8
+  bundleVersion: 1.2.9
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 20
+  AndroidBundleVersionCode: 21
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 14
+  iPhoneBuildNumber: 15
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

ProjectSettings/UnityConnectSettings.asset

@@ -21,7 +21,7 @@ UnityConnectSettings:
     m_TestEventUrl: 
     m_TestConfigUrl: 
   UnityAdsSettings:
-    m_Enabled: 1
+    m_Enabled: 0
     m_InitializeOnStartup: 0
     m_TestMode: 0
     m_EnabledPlatforms: 4294964991

第五期.txt

@@ -1,6 +1,9 @@
 微信支付
 
 
+第二次获取离线收入时也要考虑quit flag
+
+
 //关闭DebugMode 开启CatchException
 
 //切换到远程服务器 正常Zone