增加语言文档热更新

Assets/HotUpdate/IOS.meta

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

Assets/HotUpdate/Windows.meta

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

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

@@ -1,25 +0,0 @@
-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/Logo.unity

@@ -612,11 +612,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 0
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  AuditEdition: 1
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -74,6 +74,9 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 5cc0ef6383647534e9a83fd5843938ed, type: 3}
   - {fileID: 4900000, guid: a79829841944453429626186870453f6, type: 3}
   - {fileID: 4900000, guid: 4698881600aaf234a921ace52ac3c9b2, type: 3}
+  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
+  - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
+  - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
   NewFlowerConfigList:
   - {fileID: 4900000, guid: 017f420931600084280cc54894830112, type: 3}
   NewFlowerSpriteList:
@@ -302,10 +305,7 @@ MonoBehaviour:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}
   - {fileID: 4900000, guid: 592b5873809f003499db8a5484f2b765, type: 3}
-  - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
-  - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
   - {fileID: 4900000, guid: cf10bfe715240ea4e87102475ca55678, type: 3}
-  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   - {fileID: 4900000, guid: aed362854a581da4399847ab3c71acce, type: 3}
   - {fileID: 4900000, guid: 5f649838ec2ce1d43b1b0cc6326149b0, type: 3}
   - {fileID: 4900000, guid: 4e6ffe6a76751f64fbe4a8e9187d73d7, type: 3}
@@ -325,5 +325,8 @@ MonoBehaviour:
   - {fileID: 4900000, guid: b9413a82e8f919e46b0c37372b491307, type: 3}
   - {fileID: 4900000, guid: ca67a0705396bba4b90fb3fc76541bf7, type: 3}
   - {fileID: 4900000, guid: 37bda6257ca3a7f4e82ee65e8fde6832, type: 3}
+  - {fileID: 4900000, guid: 9d54580916da3734495db9235ccd27d9, type: 3}
+  - {fileID: 4900000, guid: 3319e503eb3fdd54d8660318ae937604, type: 3}
+  - {fileID: 4900000, guid: e438efaf3e160a84eb427989a9de29e4, type: 3}
   DiscardList: []
   PlazaRoomList: []

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -229,7 +229,7 @@ GameObject:
   - component: {fileID: 222019461600080400}
   - component: {fileID: 114266384869856062}
   m_Layer: 5
-  m_Name: K_Tit
+  m_Name: AJ_Content
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1752,6 +1752,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1096774315751258
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224618837436774070}
+  - component: {fileID: 222320970112638072}
+  - component: {fileID: 114111160120417236}
+  m_Layer: 5
+  m_Name: AJ_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1098365383192076
 GameObject:
   m_ObjectHideFlags: 1
@@ -1959,6 +1976,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1112012073510388
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224572351682749150}
+  - component: {fileID: 222562227883569240}
+  - component: {fileID: 114541347337871442}
+  m_Layer: 5
+  m_Name: K_Bubble0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1113342556454646
 GameObject:
   m_ObjectHideFlags: 1
@@ -8549,6 +8583,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1466470207831454
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224444081237601850}
+  - component: {fileID: 222174647368216062}
+  - component: {fileID: 114937834605497998}
+  - component: {fileID: 225893348784806270}
+  m_Layer: 5
+  m_Name: AJ_UpdatePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1468339839587024
 GameObject:
   m_ObjectHideFlags: 1
@@ -11093,12 +11145,12 @@ GameObject:
   - component: {fileID: 222043327274990370}
   - component: {fileID: 114348921289020582}
   m_Layer: 5
-  m_Name: K_Bubble0
+  m_Name: AJ_bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1597963926627606
 GameObject:
   m_ObjectHideFlags: 1
@@ -16706,6 +16758,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1929761458404398
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224301211020142586}
+  - component: {fileID: 222354179571553060}
+  - component: {fileID: 114865135862851350}
+  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 &1931769464506004
 GameObject:
   m_ObjectHideFlags: 1
@@ -18711,7 +18780,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5065\u5EB7\u6E38\u620F\u5FE0\u544A  \u62B5\u5236\u4E0D\u826F\u6E38\u620F\uFF0C\u62D2\u7EDD\u76D7\u7248\u6E38\u620F\u3002\u6CE8\u610F\u81EA\u6211\u4FDD\u62A4\uFF0C\u8C28\u9632\u53D7\u9A97\u4E0A\u5F53\u3002\u9002\u5EA6\u6E38\u620F\u76CA\u8111\uFF0C\u6C89\u8FF7\u6E38\u620F\u4F24\u8EAB\u3002\u5408\u7406\u5B89\u6392\u65F6\u95F4\uFF0C\u4EAB\u53D7\u5065\u5EB7\u751F\u6D3B\u3002"
+  m_Text: 
 --- !u!114 &114017630418865204
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -22513,6 +22582,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114111160120417236
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1096774315751258}
+  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: "\u66F4\u65B0\u6E38\u620F\u4E2D"
 --- !u!114 &114111364313841180
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -28226,16 +28328,16 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
     m_FontSize: 21
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 21
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u9000\u51FA\u6E38\u620F?"
+  m_Text: "\u5171%NUM%\u4E2A\u6587\u4EF6\u9700\u8981\u66F4\u65B0, \u5DF2\u66F4\u65B0%NUM%\u4E2A\u6587\u4EF6"
 --- !u!114 &114267641669012388
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -38967,6 +39069,33 @@ MonoBehaviour:
   m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &114541347337871442
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112012073510388}
+  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: 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_Sprite: {fileID: 21300000, guid: cce3d1ce97604c7488f58a61c493a74e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114543689290341928
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -43781,7 +43910,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5065\u5EB7\u6E38\u620F\u5FE0\u544A"
+  m_Text: 
 --- !u!114 &114677314704077846
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -51484,6 +51613,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672A\u5F00\u59CB"
+--- !u!114 &114865135862851350
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1929761458404398}
+  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 &114865623211777006
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -54531,6 +54693,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114937834605497998
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1466470207831454}
+  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: 0, g: 0, b: 0, a: 0.7058824}
+  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_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 &114938109160937894
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -60446,6 +60635,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1883852926683034}
+--- !u!222 &222174647368216062
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1466470207831454}
 --- !u!222 &222175989069485746
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -61082,6 +61277,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1878031102636368}
+--- !u!222 &222320970112638072
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1096774315751258}
 --- !u!222 &222323696522939404
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -61304,6 +61505,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1546427938947980}
+--- !u!222 &222354179571553060
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1929761458404398}
 --- !u!222 &222356504499704698
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -62372,6 +62579,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1386628585711608}
+--- !u!222 &222562227883569240
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112012073510388}
 --- !u!222 &222562843478810460
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -69208,6 +69421,7 @@ RectTransform:
   - {fileID: 224903490475154396}
   - {fileID: 224246756044616158}
   - {fileID: 224694386806689142}
+  - {fileID: 224444081237601850}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -70713,6 +70927,24 @@ RectTransform:
   m_AnchoredPosition: {x: 74.34998, y: -24.29208}
   m_SizeDelta: {x: 154, y: 52.342}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224301211020142586
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1929761458404398}
+  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 &224301720278101990
 RectTransform:
   m_ObjectHideFlags: 1
@@ -73175,6 +73407,25 @@ RectTransform:
   m_AnchoredPosition: {x: -98.31, y: -200.96}
   m_SizeDelta: {x: 43.8, y: 41.61}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224444081237601850
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1466470207831454}
+  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: 224903696752996094}
+  m_Father: {fileID: 224229560457679016}
+  m_RootOrder: 39
+  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 &224444109706632914
 RectTransform:
   m_ObjectHideFlags: 1
@@ -76091,6 +76342,27 @@ RectTransform:
   m_AnchoredPosition: {x: -271.00027, y: 0.00061035156}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000041350722}
+--- !u!224 &224572351682749150
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112012073510388}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 224301211020142586}
+  - {fileID: 224986266947929816}
+  - {fileID: 224725686779648230}
+  m_Father: {fileID: 224904266184244856}
+  m_RootOrder: 0
+  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: -0.049863618, y: -0.000037357724}
+  m_SizeDelta: {x: 429, y: 262}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224572409315317076
 RectTransform:
   m_ObjectHideFlags: 1
@@ -77095,6 +77367,24 @@ RectTransform:
   m_AnchoredPosition: {x: 118.4, y: 0.00007036954}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224618837436774070
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1096774315751258}
+  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: 224903696752996094}
+  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 &224620720285413058
 RectTransform:
   m_ObjectHideFlags: 1
@@ -79374,7 +79664,7 @@ RectTransform:
   m_Children:
   - {fileID: 224820922329473150}
   - {fileID: 224331452934299914}
-  m_Father: {fileID: 224903696752996094}
+  m_Father: {fileID: 224572351682749150}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -82232,12 +82522,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224903696752996094}
-  m_RootOrder: 0
+  m_RootOrder: 1
   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_AnchoredPosition: {x: 214.50002, y: -158}
+  m_SizeDelta: {x: 416.1, y: 161}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224880598090394370
 RectTransform:
@@ -82830,15 +83120,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
+  - {fileID: 224618837436774070}
   - {fileID: 224880109309308150}
-  - {fileID: 224986266947929816}
-  - {fileID: 224725686779648230}
-  m_Father: {fileID: 224904266184244856}
+  m_Father: {fileID: 224444081237601850}
   m_RootOrder: 0
   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: -0.049863618, y: -0.000037357724}
+  m_AnchoredPosition: {x: 0.000011228025, y: -0.0000090679605}
   m_SizeDelta: {x: 429, y: 262}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224903833123223624
@@ -82878,7 +83167,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224903696752996094}
+  - {fileID: 224572351682749150}
   m_Father: {fileID: 224229560457679016}
   m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -84418,7 +84707,7 @@ RectTransform:
   - {fileID: 224815988563629826}
   - {fileID: 224439401636557830}
   - {fileID: 224490149669999908}
-  m_Father: {fileID: 224903696752996094}
+  m_Father: {fileID: 224572351682749150}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -85434,6 +85723,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225893348784806270
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1466470207831454}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225901329705099434
 CanvasGroup:
   m_ObjectHideFlags: 1

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -184,7 +184,7 @@
     <U_WarningText desc=""><![CDATA[健康游戏忠告  抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖，3次机会]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖，答案不带“色”字，3次机会]]></Y_GuessColorDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原来的颜色即可领奖，例如“红”“黄”“蓝”，3次机会]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜错了，还剩[&value&]次机会]]></Y_GuessWrong>
     <Y_OutOfChance desc=""><![CDATA[机会用完啦！]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[已经被抢光了]]></Y_SoldOut>

Assets/Resource/XML/lan/ChineseSimplified.xml.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
 guid: 2a6d8a1acd28b9b40acaa68244594b9d
-timeCreated: 1491207122
+timeCreated: 1517994040
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: new_language_config
   assetBundleVariant: 

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -184,7 +184,7 @@
     <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎，3次機會]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎，答案不帶“色”字，3次機會]]></Y_GuessColorDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原來的顏色即可領獎，例如“紅”“黃”“藍”，3次機會]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜錯了，還剩[&value&]次機會]]></Y_GuessWrong>
     <Y_OutOfChance desc=""><![CDATA[機會用完啦！]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[已經被搶光了]]></Y_SoldOut>

Assets/Resource/XML/lan/ChineseTraditional.xml.meta

@@ -4,5 +4,5 @@ timeCreated: 1491207123
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: new_language_config
   assetBundleVariant: 

Assets/Resource/XML/lan/English.xml

@@ -184,7 +184,7 @@ Program 水怪
     <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
     <X_Self desc=""><![CDATA[[ME]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest. 3 chances]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case. 3 chances]]></Y_GuessColorDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[Hit the origin color of the flower shape. eg.'red''Blue''ORANGE'. 3 chances]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[Wrong! [&value&] chances left]]></Y_GuessWrong>
     <Y_OutOfChance desc=""><![CDATA[No more chance]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[All the treasures seemed to be gone]]></Y_SoldOut>

Assets/Resource/XML/lan/English.xml.meta

@@ -4,5 +4,5 @@ timeCreated: 1491207122
 licenseType: Pro
 TextScriptImporter:
   userData: 
-  assetBundleName: config
+  assetBundleName: new_language_config
   assetBundleVariant: 

Assets/Resource/XML/lan/default_ChineseSimplified.xml

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

Assets/Resource/XML/lan/default_ChineseSimplified.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d54580916da3734495db9235ccd27d9
+timeCreated: 1517988696
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/lan/default_ChineseTraditional.xml

@@ -0,0 +1,6 @@
+<lan>
+  <UI>
+    <AJ_Title desc=""><![CDATA[]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[]]></AJ_Content>
+  </UI>
+</lan>

Assets/Resource/XML/lan/default_ChineseTraditional.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3319e503eb3fdd54d8660318ae937604
+timeCreated: 1517988697
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/lan/default_English.xml

@@ -0,0 +1,6 @@
+<lan>
+  <UI>
+    <AJ_Title desc=""><![CDATA[]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[]]></AJ_Content>
+  </UI>
+</lan>

Assets/Resource/XML/lan/default_English.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e438efaf3e160a84eb427989a9de29e4
+timeCreated: 1517988695
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/Xlsx/default_language_config.xlsx.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f86ebe9eb55e30740a489153690f7f91
+timeCreated: 1517988488
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/AssetBundleUtility/AssetBundleSet.cs

@@ -16,7 +16,7 @@ namespace assetBundleUtility
 	    [NonSerialized] public string StreamingPath;
 	    [NonSerialized] public string PersistentPath;
 	    [NonSerialized] public AssetBundle AssetBundle;
-	    [NonSerialized] public Action<AssetBundleSet> GetSucceedCallback;  //加载/下载成功后的回调
+	    [NonSerialized] public Action<AssetBundleSet, bool> GetSucceedCallback;  //加载/下载成功后的回调
 	    [NonSerialized] public Action<AssetBundleSet, string> GetFailedCallback;  //加载/下载失败后的回调
 	
 	    //EditorWindow使用 用于自动生成MD5File和MD5DictionaryFile

Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -88,7 +88,7 @@ namespace assetBundleUtility
         /// <param name="haveFailedCallback">任意一个AssetBundle加载失败后的回调 如果有多个AssetBundle加载失败 也只回调一次</param>
         /// <param name="getSucceedCallback">每个AssetBundle加载成功后的回调</param>
         /// <param name="getFailedCallback">每个AssetBundle加载失败后的回调</param>
-        public static void LoadAllAssetBundle(List<AssetBundleSet> assetBundleSets, Action allSucceedCallback, Action haveFailedCallback, Action<AssetBundleSet> getSucceedCallback, Action<AssetBundleSet, string> getFailedCallback)
+        public static void LoadAllAssetBundle(List<AssetBundleSet> assetBundleSets, Action allSucceedCallback, Action haveFailedCallback, Action<AssetBundleSet, bool> getSucceedCallback, Action<AssetBundleSet, string> getFailedCallback)
 	    {
             List<AssetBundleSet> staleAssetBundleSets = new List<AssetBundleSet>();
             foreach (var assetBundleSet in assetBundleSets)
@@ -108,7 +108,7 @@ namespace assetBundleUtility
         /// <param name="haveFailedCallback">任意一个AssetBundle加载/下载失败后的回调 如果有多个AssetBundle加载/下载失败 也只回调一次</param>
         /// <param name="getSucceedCallback">每个AssetBundle加载/下载成功后的回调</param>
         /// <param name="getFailedCallback">每个AssetBundle加载/下载失败后的回调</param>
-        public static void UpdateAllAssetBundle(string md5Dictionary, string persistentFolder, List<AssetBundleSet> assetBundleSets, Action allSucceedCallback, Action haveFailedCallback, Action<AssetBundleSet> getSucceedCallback, Action<AssetBundleSet, string> getFailedCallback)
+        public static int UpdateAllAssetBundle(string md5Dictionary, string persistentFolder, List<AssetBundleSet> assetBundleSets, Action allSucceedCallback, Action haveFailedCallback, Action<AssetBundleSet, bool> getSucceedCallback, Action<AssetBundleSet, string> getFailedCallback)
         {
             List<AssetBundleSet> staleAssetBundleSets = new List<AssetBundleSet>();
             List<AssetBundleSet> upToDateAssetBundleSets = new List<AssetBundleSet>();
@@ -126,6 +126,7 @@ namespace assetBundleUtility
                 //Debug.Log($"UpToDateAssetBundleSet : {upToDateAssetBundleSet.Name}");
             }
             LoadAndDownloadAssetBundles(staleAssetBundleSets, upToDateAssetBundleSets, allSucceedCallback, haveFailedCallback);
+            return staleAssetBundleSets.Count;
         }
 
         private static void GetStaleAndUpToDateAssetBundleSets(string md5Dictionary, string persistentFolder, List<AssetBundleSet> assetBundleSets, List<AssetBundleSet> staleAssetBundleSets, List<AssetBundleSet> upToDateAssetBundleSets)
@@ -314,7 +315,7 @@ namespace assetBundleUtility
                 yield break;
 	        }
 	        assetBundleSet.AssetBundle = www.assetBundle;
-            assetBundleSet.GetSucceedCallback.Invoke(assetBundleSet);
+            assetBundleSet.GetSucceedCallback.Invoke(assetBundleSet, false);
             succeedCallback.Invoke();
         }
 	
@@ -334,7 +335,7 @@ namespace assetBundleUtility
 	        }
 	        File.WriteAllBytes(assetBundleSet.PersistentPath, www.bytes);
 	        assetBundleSet.AssetBundle = www.assetBundle;
-            assetBundleSet.GetSucceedCallback.Invoke(assetBundleSet);
+            assetBundleSet.GetSucceedCallback.Invoke(assetBundleSet, true);
             succeedCallback.Invoke();
 	    }
 	}

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -84,3 +84,19 @@ MonoBehaviour:
       URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_flower_tex
     - Object: {fileID: 102900000, guid: 5b03cd71e42736741a067becf4ad756b, type: 3}
       URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_language_config
+  - MD5FileName: WindowsMD5.txt
+    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

Assets/Script/Editor/EditorBundle.cs

@@ -203,6 +203,10 @@ public class EditorBundle : Editor
         {
             hotUpdateFolder = Application.dataPath + "/HotUpdate/IOS";
         }
+        else if (buildTarget == BuildTarget.StandaloneWindows64)
+        {
+            hotUpdateFolder = Application.dataPath + "/HotUpdate/Windows";
+        }
         if (!string.IsNullOrEmpty(hotUpdateFolder))
         {
             foreach (var name in names)

Assets/Script/Editor/EditorLanguageExport.cs

@@ -36,9 +36,11 @@ public class EditorLanguageExport : EditorWindow
         defaultPathes = new List<string>();
 		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/language_config.xlsx");
 		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/new_language_config.xlsx");
+		defaultPathes.Add(Application.dataPath + @"/Resource/Xlsx/default_language_config.xlsx");
         exportPathes = new List<string>();
         exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "#NAME" + ".xml");
         exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "new_#NAME" + ".xml");
+        exportPathes.Add(Application.dataPath + @"/Resource/xml/lan/" + "default_#NAME" + ".xml");
     }
 
     void OnGUI()
@@ -86,6 +88,7 @@ public class EditorLanguageExport : EditorWindow
 		foreach( string s in avaliableLan) {
 			CreateXml(defaultPathes[0], exportPathes[0], s);
 			CreateXml(defaultPathes[1], exportPathes[1], s);
+            CreateXml(defaultPathes[2], exportPathes[2], s);
         }
 
         if (isSuccess)

Assets/Script/Label/CanvasLabel.cs

@@ -1058,5 +1058,9 @@ public class CanvasLabel
     public static string U_Group = "U_Group";
     public static string U_Icon = "U_Icon";
     public static string U_Lab = "U_Lab";
+    public static string AJ_UpdatePanel = "AJ_UpdatePanel";
+    public static string AJ_bg = "AJ_bg";
+    public static string AJ_Title = "AJ_Title";
+    public static string AJ_Content = "AJ_Content";
     //EndMark-Used by LabelUtility-Do not remove
 }

Assets/Script/Label/LanguageLabel.cs

@@ -16,8 +16,10 @@ public class LanguageLabel
         return $"{page}{LanguagePageSeperator}{id}";
     }
 
+    public static string UI__AJ_Title = "UI__AJ_Title";
+    public static string UI__AJ_Content = "UI__AJ_Content";
     //StartMark-Used by LabelUtility-Do not remove
-    	public static string UI = "UI";
+    public static string UI = "UI";
     	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
     	public static string UI__C_GardenLab = "UI__C_GardenLab";
     	public static string UI__C_DressRoom = "UI__C_DressRoom";

Assets/Script/Label/ResourceLabel.cs

@@ -123,6 +123,9 @@ public class ResourceLabel
     public static string NewEnglish = "new_English";
     public static string NewChineseSimplified = "new_ChineseSimplified";
     public static string NewChineseTraditional = "new_ChineseTraditional";
+    public static string DefaultEnglish = "default_English";
+    public static string DefaultChineseSimplified = "default_ChineseSimplified";
+    public static string DefaultChineseTraditional = "default_ChineseTraditional";
 
     public static string BtnClip = "BtnClip";
     public static string SkillClip = "SkillClip";

Assets/Script/Manage/IAPManager.cs

@@ -227,7 +227,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
             Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__LoadAd));
         }
     }
-
+    
     public static void PlayADCallback(ShowResult showResult)
     {
         if (showResult == ShowResult.Finished)

Assets/Script/Manage/Initializer.cs

@@ -38,6 +38,11 @@ public class Initializer : MonoBehaviour
 
     private void Awake()
     {
+        if (!Application.isEditor)
+        {
+            Debug.logger.logEnabled = false;
+        }
+
         if (CatchException)
         {
             try
@@ -406,7 +411,7 @@ public class Initializer : MonoBehaviour
 
         //EnableDebugLab();
         DebugText = GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>();
-        DebugText.text = "W3";
+        //DebugText.text = "W3";
 
         Bundle.CopyAssetBundles();
         while (!Bundle.CopyComplete)
@@ -414,6 +419,7 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
+        ResourceManager.Get(CanvasLabel.AJ_UpdatePanel).AddComponent<UpdatePanel>().Init();
         bool haveError = Bundle.UpdateAssetBundles();
 
         while (haveError)
@@ -421,17 +427,26 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
-        DebugText.text = "W4";
+        //DebugText.text = "W4";
         while (!Bundle.UpdateComplete)
         {
-            DebugText.text = "W5";
+            //DebugText.text = "W5";
             yield return null;
         }
 
-        DebugText.text = "W6";
+        //UpdatePanel.Show();
+        //while (true)
+        //{
+        //    yield return null;
+        //}
+
+        //DebugText.text = "W5-2";
+        SetWarningTitleAndText();
+
+        //DebugText.text = "W6";
         while (ConfigManager.PlayerDocumentDamageFlag)
         {
-            DebugText.text = "W7";
+            //DebugText.text = "W7";
             yield return null;
         }
 

Assets/Script/Manage/UIManager.cs

@@ -59,7 +59,6 @@ public class UIManager : Regist
 
         ResourceManager.SetActive(CanvasLabel.C_Main, true);
         ResourceManager.SetActive(CanvasLabel.U_LoadingPanel, true);
-        Initializer.SetWarningTitleAndText();
 
         #region 
 

Assets/Script/Tool/Bundle.cs

@@ -748,6 +748,8 @@ public class Bundle : MonoBehaviour
         }
     }
 
+    public static int UpdateAmt;
+    public static int UpdateFinishAmt;
     public static bool UpdateAssetBundles()
     {
         try
@@ -771,19 +773,18 @@ public class Bundle : MonoBehaviour
             string localMD5 = AssetBundleUtility.GetMD5OfAssetBundleSets(assetBundleSets);
             string serverMD5 = "AE29F7EE00843A792D96CA02D6907FAA";
             bool needUpdate = localMD5 != serverMD5;
-            if (Application.isEditor)
-            {
-                needUpdate = false;
-            }
-            needUpdate = false;
+            //if (Application.isEditor)
+            //{
+            //    needUpdate = false;
+            //}
+            //needUpdate = false;
             //Debug.LogWarning($"NeedUpdate : {needUpdate}");
-
             if (needUpdate)
             {
                 Initializer.DebugText.text = "U4";
-                AssetBundleUtility.UpdateAllAssetBundle
+                UpdateAmt = AssetBundleUtility.UpdateAllAssetBundle
                 (
-                    "new_dress_config|F1F0FA4EB0C70A658BB03E935738C422|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_dress_config\r\nnew_dress_ske|531AE05FA301BBAD7B58B532BCD04CFD|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_dress_ske\r\nnew_dress_tex|3060DC78E5C9A8D58CF440C6C66035C4|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_dress_tex\r\nnew_flower_config|0CD417F29E1C7580A742BFC33DAE7DF5|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_flower_config\r\nnew_flower_tex|8640D886CB7D71B5D5EBA8D0FF037573|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_flower_tex\r\nnew_language_config|D7683A0A8867FBC6D32CFF5C9F41BAC4|file://E:\\UnityProject\\Garden5\\Assets\\HotUpdateTest\\new_language_config",
+                    "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",
                     persistentFolderPath,
                     assetBundleSets,
                     DownloadAllAssetBundleSucceed,
@@ -791,6 +792,8 @@ public class Bundle : MonoBehaviour
                     DownloadAssetBundleSucceed,
                     DownloadAssetBundleFailed
                 );
+                UpdatePanel.Show();
+                UpdatePanel.SetProgress(UpdateAmt, 0);
             }
             else
             {
@@ -844,19 +847,37 @@ public class Bundle : MonoBehaviour
                 ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
-            Initializer.DebugText.text = "05";
-            TextAsset language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewEnglish);
+            Initializer.DebugText.text = "051";
+            TextAsset language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.English);
             XmlDocument document = new XmlDocument();
             document.LoadXml(language.text);
             Language.AddLanguageDocument(CurrentLanguage.English, document);
 
-            Initializer.DebugText.text = "06";
+            Initializer.DebugText.text = "061";
+            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.ChineseSimplified);
+            document = new XmlDocument();
+            document.LoadXml(language.text);
+            Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
+
+            Initializer.DebugText.text = "071";
+            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.ChineseTraditional);
+            document = new XmlDocument();
+            document.LoadXml(language.text);
+            Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+
+            Initializer.DebugText.text = "052";
+            language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewEnglish);
+            document = new XmlDocument();
+            document.LoadXml(language.text);
+            Language.AddLanguageDocument(CurrentLanguage.English, document);
+
+            Initializer.DebugText.text = "062";
             language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseSimplified);
             document = new XmlDocument();
             document.LoadXml(language.text);
             Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
 
-            Initializer.DebugText.text = "07";
+            Initializer.DebugText.text = "072";
             language = NewLanguage.LoadAsset<TextAsset>(ResourceLabel.NewChineseTraditional);
             document = new XmlDocument();
             document.LoadXml(language.text);
@@ -873,9 +894,12 @@ public class Bundle : MonoBehaviour
             }
 
             UpdateComplete = true;
+
+            DelayCall.Call(1f, UpdatePanel.Hide);
         }
         catch (Exception e)
         {
+            Debug.Log(e);
             Initializer.DebugText.text += e.ToString();
             Initializer.EnableDebugLab();
         }
@@ -886,7 +910,7 @@ public class Bundle : MonoBehaviour
         Debug.Log("failed");
     }
 
-    public static void DownloadAssetBundleSucceed(AssetBundleSet assetBundleSet)
+    public static void DownloadAssetBundleSucceed(AssetBundleSet assetBundleSet, bool isDownload)
     {
         if (assetBundleSet.Name == ResourceLabel.NewDressConfig)
         {
@@ -912,10 +936,17 @@ public class Bundle : MonoBehaviour
         {
             NewFlowerTex = assetBundleSet.AssetBundle;
         }
+
+        if (isDownload)
+        {
+            UpdateFinishAmt++;
+            UpdatePanel.SetProgress(UpdateAmt, UpdateFinishAmt);
+        }
     }
 
     public static void DownloadAssetBundleFailed(AssetBundleSet assetBundleSet, string error)
     {
+        Debug.Log(error);
         Initializer.DebugText.text = assetBundleSet.Name;
         Initializer.DebugText.text += error;
         Initializer.EnableDebugLab();
@@ -958,14 +989,32 @@ public class Bundle : MonoBehaviour
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
-                Language.AddLanguageDocument(CurrentLanguage.English, document);
+                Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
             }
             else if (textAsset.name == ResourceLabel.NewChineseTraditional)
             {
                 XmlDocument document = new XmlDocument();
                 document.LoadXml(textAsset.text);
+                Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+            }
+            else if (textAsset.name == ResourceLabel.English)
+            {
+                XmlDocument document = new XmlDocument();
+                document.LoadXml(textAsset.text);
                 Language.AddLanguageDocument(CurrentLanguage.English, document);
             }
+            else if (textAsset.name == ResourceLabel.ChineseSimplified)
+            {
+                XmlDocument document = new XmlDocument();
+                document.LoadXml(textAsset.text);
+                Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
+            }
+            else if (textAsset.name == ResourceLabel.ChineseTraditional)
+            {
+                XmlDocument document = new XmlDocument();
+                document.LoadXml(textAsset.text);
+                Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+            }
         }
 
         NewFlowerConfigs = ConfigManager.GetDressRoomConfig(Instance.NewFlowerConfigList[0] as TextAsset);

Assets/Script/Tool/DashGame/Language.cs

@@ -44,41 +44,47 @@ public class Language
     }
     public static Dictionary<CurrentLanguage, TextAsset> languageDic;
 
-    public static Dictionary<CurrentLanguage, List<XmlDocument>> XmlDocumentDictionary
-    {
-        get
-        {
-            if (xmlDocumentDictionary == null)
-            {
-                InitLanguageDocument();
-            }
-            return xmlDocumentDictionary;
-        }
-    }
-    public static Dictionary<CurrentLanguage, List<XmlDocument>> xmlDocumentDictionary;
+    public static Dictionary<CurrentLanguage, List<XmlDocument>> XmlDocumentDictionary = new Dictionary<CurrentLanguage, List<XmlDocument>>();
+    //{
+    //    get
+    //    {
+    //        if (xmlDocumentDictionary == null)
+    //        {
+    //            InitLanguageDocument();
+    //        }
+    //        return xmlDocumentDictionary;
+    //    }
+    //}
+    //public static Dictionary<CurrentLanguage, List<XmlDocument>> xmlDocumentDictionary;
 
-    public static void InitLanguageDocument()
-    {
-        xmlDocumentDictionary = new Dictionary<CurrentLanguage, List<XmlDocument>>();
-        XmlDocument xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
-        xmlDocumentDictionary.Add(CurrentLanguage.English, new List<XmlDocument> { xmlDocument });
-        xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
-        xmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, new List<XmlDocument> { xmlDocument });
-        xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
-        xmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, new List<XmlDocument> { xmlDocument });
-    }
+    //public static void InitLanguageDocument()
+    //{
+    //    xmlDocumentDictionary = new Dictionary<CurrentLanguage, List<XmlDocument>>();
+    //    XmlDocument xmlDocument = new XmlDocument();
+    //    xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
+    //    xmlDocumentDictionary.Add(CurrentLanguage.English, new List<XmlDocument> { xmlDocument });
+    //    xmlDocument = new XmlDocument();
+    //    xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
+    //    xmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, new List<XmlDocument> { xmlDocument });
+    //    xmlDocument = new XmlDocument();
+    //    xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
+    //    xmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, new List<XmlDocument> { xmlDocument });
+    //}
 
     public static void AddLanguageDocument(CurrentLanguage language, XmlDocument document)
     {
-        if (xmlDocumentDictionary == null)
+        //if (xmlDocumentDictionary == null)
+        //{
+        //    InitLanguageDocument();
+        //}
+        if (XmlDocumentDictionary.ContainsKey(language))
         {
-            InitLanguageDocument();
+            XmlDocumentDictionary[language].Add(document);
+        }
+        else
+        {
+            XmlDocumentDictionary.Add(language, new List<XmlDocument> {document});
         }
-
-        XmlDocumentDictionary[language].Add(document);
     }
 
     public static void Initialize()
@@ -88,6 +94,7 @@ public class Language
             return;
         }
         Inited = true;
+
         LanguageManager.CurrentLanguage = ConfigManager.GetStringFormConfig("Language").ToEnum<CurrentLanguage>();
         if (Initializer.Instance.AuditEdition)
         {
@@ -270,6 +277,11 @@ public class Language
 
     public static string GetStr(string page, string id, CurrentLanguage language)
     {
+        if (Initializer.Instance.AuditEdition)
+        {
+            language = CurrentLanguage.ChineseSimplified;
+        }
+
         List<XmlDocument> documents = XmlDocumentDictionary[language];
 
         foreach (var document in documents)

Assets/Script/UI.meta

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

Assets/Script/UI/UpdatePanel.cs

@@ -0,0 +1,63 @@
+using System.Text.RegularExpressions;
+using System.Xml;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class UpdatePanel : MonoBehaviour
+{
+    public static UpdatePanel instance;
+
+    [SerializeField] private Text title;
+    [SerializeField] private Text content;
+    [SerializeField] private Transform bg;
+
+    private TweenCG alphaAnim;
+    private TweenScale scaleAnim;
+
+    public void Init()
+    {
+        instance = this;
+
+        title = ResourceManager.Get<Text>(CanvasLabel.AJ_Title);
+        content = ResourceManager.Get<Text>(CanvasLabel.AJ_Content);
+        bg = ResourceManager.Get(CanvasLabel.AJ_bg);
+
+        alphaAnim = transform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        scaleAnim = bg.CreateTweenScale(Vector3.zero, Vector3.one, 0.25f, false, true, Curve.EaseOutQuad);
+
+        XmlDocument document = new XmlDocument();
+        TextAsset textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultEnglish);
+        document.LoadXml(textAsset.text);
+        Language.AddLanguageDocument(CurrentLanguage.English, document);
+
+        document = new XmlDocument();
+        textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseSimplified);
+        document.LoadXml(textAsset.text);
+        Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
+
+        document = new XmlDocument();
+        textAsset = Bundle.Config.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseTraditional);
+        document.LoadXml(textAsset.text);
+        Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+    }
+
+    public static void Show()
+    {
+        instance.title.text = Language.GetStr(LanguageLabel.UI__AJ_Title, Application.systemLanguage);
+        instance.alphaAnim.StartForward();
+        instance.scaleAnim.StartForward();
+    }
+
+    public static void Hide()
+    {
+        instance.alphaAnim.StartBackward();
+        instance.scaleAnim.StartBackward();
+    }
+
+    public static void SetProgress(int updateAmt, int finishAmt)
+    {
+        string str = Language.GetStr(LanguageLabel.UI__AJ_Content, Application.systemLanguage);
+        str = str.Replace("%NUM0%", updateAmt.ToString()).Replace("%NUM1%", finishAmt.ToString());
+        instance.content.text = str;
+    }
+}

Assets/Script/UI/UpdatePanel.cs.meta

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

ProjectSettings/GraphicsSettings.asset

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