修改更新界面

Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -47,7 +47,7 @@ namespace AtlasUtility
 
             if (GUILayout.Button("Test"))
             {
-                Debug .Log(Script.GameObject.transform.GetSiblingIndex());
+                //Debug .Log(Script.GameObject.transform.GetSiblingIndex());
                 //foreach (var VARIABLE in Enum.GetValues(typeof(PlayerDirection)))
                 //{
                 //    Debug.Log(VARIABLE);

Assets/AtlasUtility/Script/Test.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Policy;
@@ -9,123 +10,30 @@ namespace AtlasUtility
 {
     using UnityEngine;
 
-    //[ExecuteInEditMode]
     public class Test : MonoBehaviour
     {
-        #region Variable
-
-        public GameObject GameObject;
-        public TextAsset TextAsset;
-
-        public Text Text;
-        public Texture2D Texture2D;
-        public SpriteRenderer SpriteRenderer;
-
-        public Sprite Sprite;
-        public MeshFilter MeshFilter;
-        public MeshRenderer MeshRenderer;
-
-        public static Material Material;
-
-        public static int TcpPort = 9933;
-        public static string Host = "127.0.0.1";
-        public static string Zone = "Garden";
-
-        #endregion
-
-        private SmartFox smartFox = new SmartFox();
-        private VirtualScrollRectPlus VirtualScrollRectPlus;
-        private void Start()
+        public void Awake()
         {
-            VirtualScrollRectPlus = GetComponent<VirtualScrollRectPlus>();
-            VirtualScrollRectPlus.Init(5, 15, GetNextItem, GetPreviousItem, (i, item) => { item.SetParent(null); Items.Add(item); item.SetActive(false); });
+            StartCoroutine(ETest());
         }
 
-        private VirtualScrollRectItem GetPreviousItem(int index)
+        public IEnumerator ETest()
         {
-            //Debug.LogWarning("previous " + index);
-            if (index < 0)
-            {
-                return null;
-            }
-            else
+            Debug.Log("start");
+            WWW www = new WWW("https://garden.dashgame.com/bundle/android/new_flower_tex1.3");
+            while (www.isDone == false)
             {
-                if (Items.Count > 0)
-                {
-                    VirtualScrollRectItem item = Items[0];
-                    item.GetComponentInChildren<Text>().text = index.ToString();
-                    item.SetParent(VirtualScrollRectPlus.content);
-                    Items.RemoveAt(0);
-                    item.SetActive(true);
-                    return item;
-                }
-                else
-                {
-                    GameObject go = Instantiate(GameObject);
-                    go.GetComponentInChildren<Text>().text = index.ToString();
-                    VirtualScrollRectItem virtualScrollRectItem = go.GetComponent<VirtualScrollRectItem>();
-                    virtualScrollRectItem.Init();
-                    virtualScrollRectItem.SetParent(VirtualScrollRectPlus.content);
-                    return virtualScrollRectItem;
-                }
+                Debug.Log(www.progress);
+                yield return null;
             }
-        }
-
-        public int MaxAmount = 23;
-        private List<VirtualScrollRectItem> Items = new List<VirtualScrollRectItem>();
-        private VirtualScrollRectItem GetNextItem(int index)
-        {
-            //Debug.LogWarning("next " + index);
-            if (index >= MaxAmount)
+            if (string.IsNullOrEmpty(www.error))
             {
-                return null;
+                Debug.Log("finish");
             }
             else
             {
-                if (Items.Count > 0)
-                {
-                    VirtualScrollRectItem item = Items[0];
-                    item.GetComponentInChildren<Text>().text = index.ToString();
-                    item.SetParent(VirtualScrollRectPlus.content);
-                    Items.RemoveAt(0);
-                    item.SetActive(true);
-                    return item;
-                }
-                else
-                {
-                    GameObject go = Instantiate(GameObject);
-                    go.GetComponentInChildren<Text>().text = index.ToString();
-                    VirtualScrollRectItem virtualScrollRectItem = go.GetComponent<VirtualScrollRectItem>();
-                    virtualScrollRectItem.Init();
-                    virtualScrollRectItem.SetParent(VirtualScrollRectPlus.content);
-                    return virtualScrollRectItem;
-                }
-            }
-        }
-
-        private void Update()
-        {
-            if (Input.GetKeyDown(KeyCode.A))
-            {
-                ConfigData configData = new ConfigData
-                {
-                    Host = Host,
-                    Port = TcpPort,
-                    Zone = Zone
-                };
-
-                smartFox.Connect(configData);
-
-                Debug.Log("Send connect request");
+                Debug.Log(www.error);
             }
-
-            smartFox.ProcessEvents();
-        }
-
-        private void OnApplicationQuit()
-        {
-            smartFox.Disconnect();
-            //Debug.Log("Disconnect");
         }
     }
 }

Assets/Resource/Logo.unity

@@ -91,134 +91,6 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &171779423
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 171779425}
-  - component: {fileID: 171779424}
-  m_Layer: 0
-  m_Name: Flower46
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &171779424
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 171779423}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 63d0836f9f5007741971f9ae8adcdc9c, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &171779425
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 171779423}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.09, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &404551325
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 404551327}
-  - component: {fileID: 404551326}
-  m_Layer: 0
-  m_Name: Flower41
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &404551326
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 404551325}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: f57348d99d8cf9542af4de26b2763875, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &404551327
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 404551325}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.44, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -283,70 +155,6 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1 &625207371
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 625207373}
-  - component: {fileID: 625207372}
-  m_Layer: 0
-  m_Name: Flower48
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &625207372
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 625207371}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: a4b22903a4f12cc43bb6054b1d22962c, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &625207373
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 625207371}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 9.06, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &722194761
 GameObject:
   m_ObjectHideFlags: 0
@@ -514,70 +322,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!1 &1104380298
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1104380300}
-  - component: {fileID: 1104380299}
-  m_Layer: 0
-  m_Name: Flower37
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &1104380299
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1104380298}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: f96c9c8ba93438c49ad916f747d4c37d, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &1104380300
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1104380298}
-  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: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -870,7 +614,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 0
   DebugMode: 0
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
@@ -885,131 +629,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1952218298
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1952218300}
-  - component: {fileID: 1952218299}
-  m_Layer: 0
-  m_Name: Flower43
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &1952218299
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1952218298}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: f6d7d0280ec2e27479c2dc4a10583624, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &1952218300
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1952218298}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 6.09, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2070429468
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 2070429470}
-  - component: {fileID: 2070429469}
-  m_Layer: 0
-  m_Name: Flower36
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!212 &2070429469
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2070429468}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 39300fd0e860ea143850d7c4ec94625d, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
---- !u!4 &2070429470
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2070429468}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -6.51, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -263,7 +263,7 @@ GameObject:
   - component: {fileID: 222019461600080400}
   - component: {fileID: 114266384869856062}
   m_Layer: 5
-  m_Name: AJ_Content
+  m_Name: AJ_Progress
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2091,6 +2091,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1110319007002984
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224715527315653188}
+  - component: {fileID: 222622389929681704}
+  - component: {fileID: 114300617820865792}
+  m_Layer: 5
+  m_Name: AJ_Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1111933464690792
 GameObject:
   m_ObjectHideFlags: 1
@@ -29531,7 +29548,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5171%NUM%\u4E2A\u6587\u4EF6\u9700\u8981\u66F4\u65B0, \u5DF2\u66F4\u65B0%NUM%\u4E2A\u6587\u4EF6"
+  m_Text: "\u5F53\u524D\u8FDB\u5EA650%"
 --- !u!114 &114267641669012388
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -30838,6 +30855,39 @@ MonoBehaviour:
   m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &114300617820865792
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1110319007002984}
+  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: 1
+    m_MinSize: 2
+    m_MaxSize: 21
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u5171%NUM%\u4E2A\u6587\u4EF6\u9700\u8981\u66F4\u65B0, \u5DF2\u66F4\u65B0%NUM%\u4E2A\u6587\u4EF6"
 --- !u!114 &114301791723252810
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -65204,6 +65254,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1519330313381316}
+--- !u!222 &222622389929681704
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1110319007002984}
 --- !u!222 &222622448997408618
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -82446,6 +82502,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 154.12}
   m_SizeDelta: {x: 179.4, y: 33.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224715527315653188
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1110319007002984}
+  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: 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.50002, y: -118}
+  m_SizeDelta: {x: 416, y: 82}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224716162044755026
 RectTransform:
   m_ObjectHideFlags: 1
@@ -85600,15 +85674,15 @@ RectTransform:
   m_GameObject: {fileID: 1010846332249092}
   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: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 224903696752996094}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 214.50002, y: -158}
-  m_SizeDelta: {x: 416.1, y: 161}
+  m_AnchoredPosition: {x: 214.50003, y: -177.5}
+  m_SizeDelta: {x: 416, y: 37}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224880598090394370
 RectTransform:
@@ -86204,6 +86278,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 224618837436774070}
+  - {fileID: 224715527315653188}
   - {fileID: 224880109309308150}
   m_Father: {fileID: 224444081237601850}
   m_RootOrder: 0

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Resource/XML/lan/default_ChineseSimplified.xml

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

Assets/Resource/XML/lan/default_ChineseTraditional.xml

@@ -1,7 +1,8 @@
 <lan>
   <UI>
-    <AJ_Title desc=""><![CDATA[]]></AJ_Title>
-    <AJ_Content desc=""><![CDATA[]]></AJ_Content>
-    <AJ_UpdateFailed desc=""><![CDATA[]]></AJ_UpdateFailed>
+    <AJ_Title desc=""><![CDATA[更新游戏中]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
+    <AJ_Progress desc=""><![CDATA[更新进度%NUM%%]]></AJ_Progress>
   </UI>
 </lan>

Assets/Resource/XML/lan/default_English.xml

@@ -1,7 +1,8 @@
 <lan>
   <UI>
-    <AJ_Title desc=""><![CDATA[]]></AJ_Title>
-    <AJ_Content desc=""><![CDATA[]]></AJ_Content>
-    <AJ_UpdateFailed desc=""><![CDATA[]]></AJ_UpdateFailed>
+    <AJ_Title desc=""><![CDATA[更新游戏中]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
+    <AJ_Progress desc=""><![CDATA[更新进度%NUM%%]]></AJ_Progress>
   </UI>
 </lan>

Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -1,3 +1,5 @@
+using UnityEngine.UI;
+
 namespace assetBundleUtility
 {
 
@@ -74,7 +76,7 @@ namespace assetBundleUtility
             {
                 AssetBundleSet assetBundleSet = new AssetBundleSet();
                 string[] strings = items[i].Split('|');
-                assetBundleSet.Name = strings[0];
+                assetBundleSet.Name = strings[0].Replace("1.3", "");
                 assetBundleSet.MD5 = strings[1];
                 //assetBundleSet.URL = strings[2];
                 assetBundleSets.Add(assetBundleSet);
@@ -167,7 +169,7 @@ namespace assetBundleUtility
 	        int remainAmount = upToDateAssetBundleSets.Count + staleAssetBundleSets.Count;
             //Debug.Log(staleAssetBundleSets.Count);
             //Debug.Log(upToDateAssetBundleSets.Count);
-	        bool failedFlag = false;
+            bool failedFlag = false;
 	        foreach (var assetBundleSets in upToDateAssetBundleSets)
 	        {
 	            LoadBundle
@@ -334,7 +336,8 @@ namespace assetBundleUtility
             assetBundleSet.GetSucceedCallback.Invoke(assetBundleSet, false);
             succeedCallback.Invoke();
         }
-	
+
+	    private static Dictionary<WWW, float> progressDict = new Dictionary<WWW, float>();
 	    private static IEnumerator downloadBundle(AssetBundleSet assetBundleSet, Action succeedCallback, Action failedCallback)
 	    {
             string folder;
@@ -352,15 +355,38 @@ namespace assetBundleUtility
             }
 	        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))
+            WWW www = new WWW(assetBundleSet.URL + "1.3");
+
+	        while (www.isDone == false)
+	        {
+	            if (progressDict.ContainsKey(www))
+	            {
+	                progressDict[www] = www.progress;
+	            }
+	            else
+	            {
+                    progressDict.Add(www, www.progress);
+                }
+	            float minProgress = 1f;
+	            foreach (var kv in progressDict)
+	            {
+	                if (kv.Value < minProgress)
+	                {
+	                    minProgress = kv.Value;
+	                }
+	            }
+                UpdatePanel.SetProgress(minProgress);
+                yield return null;
+            }
+	        progressDict[www] = 1f;
+
+            if (!string.IsNullOrEmpty(www.error))
 	        {
                 assetBundleSet.GetFailedCallback.Invoke(assetBundleSet, www.error);
                 failedCallback.Invoke();
                 yield break;
 	        }
-	        if (!Directory.Exists(assetBundleSet.PersistentPath))
+            if (!Directory.Exists(assetBundleSet.PersistentPath))
 	        {
 	            Directory.CreateDirectory(Path.GetDirectoryName(assetBundleSet.PersistentPath));
 	        }

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -52,51 +52,39 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AssetBundleGroups:
-  - MD5FileName: AndroidMD5.txt
-    MD5DictionaryFileName: AndroidMD5Dictionary.txt
+  - MD5FileName: AndroidMD51.3.txt
+    MD5DictionaryFileName: AndroidMD5Dictionary1.3.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 46a699a86f13316489a948f63bfaf901, type: 3}
+    - Object: {fileID: 102900000, guid: 77fd64e7b3708484a9c744e105248200, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 33466405b7ecc6b4c901205ff5be2667, type: 3}
+    - Object: {fileID: 102900000, guid: 8cdda597a784fa44098f091fab3fb829, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 1a49bf28873b63346a9d25a39c921fa7, type: 3}
+    - Object: {fileID: 102900000, guid: d205a191403fc2a4c9e9cbfd84e6a204, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 93b2fda5a42fe4a4cb89c237fd0e01ec, type: 3}
-      URL: null
-    - Object: {fileID: 102900000, guid: 5b8c44112f2fe534c9dfaa0a6dfc0cf5, type: 3}
-      URL: null
-    - Object: {fileID: 102900000, guid: 53f574c01e2650046b757b46d3da7100, type: 3}
+    - Object: {fileID: 102900000, guid: 6d9c13d607d91c746877e21c80481636, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
     OutputPath: Assets\HotUpdate\IOS
     AssetBundleSets:
     - Object: {fileID: 102900000, guid: 1f03e821e1ebdc24e9f0fa80e2efcc0c, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_config
+      URL: null
     - Object: {fileID: 102900000, guid: 46e6bdba81cd7ce4695e7e3b87409b5b, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_ske
+      URL: null
     - Object: {fileID: 102900000, guid: de2a2ad7ab38f9e4b80402dc8153ccbe, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_dress_tex
+      URL: null
     - Object: {fileID: 102900000, guid: 2322ebf659ac53340bfdc21c831c6f31, type: 3}
-      URL: file://E:\UnityProject\Garden5\Assets\HotUpdateTest\new_flower_config
-    - Object: {fileID: 102900000, guid: b2d57842484c01a4ea3a286143207ee1, type: 3}
-      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
+      URL: null
+  - MD5FileName: WindowsMD51.3.txt
+    MD5DictionaryFileName: WindowsMD5Dictionary1.3.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: ba7281a1ab56d604c95686e9e6dbfee4, type: 3}
+    - Object: {fileID: 102900000, guid: b9d1f83b796cad440bb4ebed51087d9a, 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

@@ -442,7 +442,6 @@ public class CanvasLabel
     public static string P_Return = "P_Return";
     public static string P_Tutorial = "P_Tutorial";
     public static string P_TutorialBg = "P_TutorialBg";
-    public static string P_CloseTipBtn = "P_CloseTipBtn";
     public static string P_CloseTipBK = "P_CloseTipBK";
     public static string P_CloseTip = "P_CloseTip";
     public static string P_CreateTipBK = "P_CreateTipBK";
@@ -489,6 +488,7 @@ public class CanvasLabel
     public static string Pf_ShoeTab = "Pf_ShoeTab";
     public static string Pf_ShoeGrid = "Pf_ShoeGrid";
     public static string P_CancelShare = "P_CancelShare";
+    public static string P_CloseTipBtn = "P_CloseTipBtn";
     public static string Pi_FashionShowHomePanel = "Pi_FashionShowHomePanel";
     public static string Pi_FashionShowHomePanelPosition = "Pi_FashionShowHomePanelPosition";
     public static string Pi_FashionShowHomeSidePanel = "Pi_FashionShowHomeSidePanel";
@@ -1102,5 +1102,6 @@ public class CanvasLabel
     public static string AJ_bg = "AJ_bg";
     public static string AJ_Title = "AJ_Title";
     public static string AJ_Content = "AJ_Content";
+    public static string AJ_Progress = "AJ_Progress";
     //EndMark-Used by LabelUtility-Do not remove
 }

Assets/Script/Label/LanguageLabel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;
@@ -19,8 +19,9 @@ 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";
+    public static string UI__AJ_Progress = "UI__AJ_Progress";
     //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/Manage/ConfigManager.cs

@@ -1491,6 +1491,13 @@ public class ConfigManager : Regist
             ToVersion29(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 30)
+        {
+            Debug.LogWarning("UpdateArchive to 30");
+
+            ToVersion30(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1922,4 +1929,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion30(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 30.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/HttpManager.cs

@@ -1304,7 +1304,7 @@ public class HttpManager : Regist
 
         Bubble.Show
         (
-            hint, null, null, null,
+            null, hint, null, null,
             () =>
             {
                 DelayCall.Call(2, () => Manager.SwitchConfigCallback(jsonData));
@@ -1832,15 +1832,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD5";
+            fileName = "AndroidMD51.3";
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD5";
+            fileName = "IOSMD51.3";
         }
         else
         {
-            fileName = "WindowsMD5";
+            fileName = "WindowsMD51.3";
         }
         if (string.IsNullOrEmpty(fileName))
         {
@@ -1857,15 +1857,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD5Dictionary";
+            fileName = "AndroidMD5Dictionary1.3";
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD5Dictionary";
+            fileName = "IOSMD5Dictionary1.3";
         }
         else
         {
-            fileName = "WindowsMD5Dictionary";
+            fileName = "WindowsMD5Dictionary1.3";
         }
         if (string.IsNullOrEmpty(fileName))
         {
@@ -1881,7 +1881,7 @@ public class HttpManager : Regist
     {
         URLRequestData urlData = new URLRequestData();
         urlData.Add("f", fileName);
-
+        
         URLRequest.CreateURLRequest
         (
             true,
@@ -1895,6 +1895,7 @@ public class HttpManager : Regist
                 }
                 else
                 {
+                    Debug.Log(fileName);
                     failedCallback.Invoke();
                 }
             },

Assets/Script/Tool/Auxiliary.cs

@@ -154,67 +154,67 @@ public class Auxiliary : Regist
         //    RobotManager.DeactivateAllRobots(false);
         //}
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            DebugManager.ResetGardenLevel(100);
-            //Manager.Coin = 0;
-            //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
-            //GardenManager.CreateElfTimer = 0;
-            //DebugManager.ResetGardenLevel(50);
-            //foreach (var skill in Manager.UsingSkillList)
-            //{
-            //    skill.UseTimer = 0;
-            //}
-            //foreach (var skill in Manager.CoolSkillList)
-            //{
-            //    skill.CoolTimer = 0;
-            //}
-            //HttpManager.GetTargetConfig
-            //(
-            //    "1801134288353834791",
-            //    data =>
-            //    {
-            //        VisitManager.VisiteeSerialNumber = "1801134288353834791";
-            //        VisitManager.SavePulledConfig(data);
-            //    }
-            //);
-            //PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-            //Debug.Log(screenPosition);
-            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            //DebugManager.ResetMemoryGameTutorial();/
-            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        }
-
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            TutorialManager.fashionShowTutorial = true;
-            //XmlDocument document = new XmlDocument();
-            //Debug.Log(ConfigManager.ConfigDocument.InnerXml);
-            //Debug.Log(ConfigManager.ConfigDocument.OuterXml);
-            //document.LoadXml(ConfigManager.ConfigDocument.InnerXml);
-            //XmlNode rootNode = document.SelectSingleNode(PlayerConfigLabel.RootNode);
-            //rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorial));
-            //rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorialIndex));
-            //rootNode.SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 15.ToString();
-            //rootNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = "jrjL84";
-            //rootNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = "1708014471457405866";
-
-            //URLRequestData urlData = new URLRequestData();
-            //urlData.Add("u", "1708014471457405866");
-            //urlData.Add("v", "1");
-            //urlData.Add("l", rootNode.OuterXml);
-            //URLRequest.CreateStrURLRequest(false, HttpManager.SaveURL, urlData, data => { Debug.Log(data); }, URLRequest.Method.POST);
-
-            //StringFilter.ContainSensitiveWord("真");
-            //TutorialManager.findMissingMinigameTutorial = true;
-            //DebugManager.ResetGardenLevel(30);
-            //Manager.Diamond = 1000;
-            //PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
-            //FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    DebugManager.ResetGardenLevel(100);
+        //    Manager.Coin = 0;
+        //    Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
+        //    GardenManager.CreateElfTimer = 0;
+        //    DebugManager.ResetGardenLevel(50);
+        //    foreach (var skill in Manager.UsingSkillList)
+        //    {
+        //        skill.UseTimer = 0;
+        //    }
+        //    foreach (var skill in Manager.CoolSkillList)
+        //    {
+        //        skill.CoolTimer = 0;
+        //    }
+        //    HttpManager.GetTargetConfig
+        //    (
+        //        "1801134288353834791",
+        //        data =>
+        //        {
+        //            VisitManager.VisiteeSerialNumber = "1801134288353834791";
+        //            VisitManager.SavePulledConfig(data);
+        //        }
+        //    );
+        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+        //    Debug.Log(screenPosition);
+        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+        //    DebugManager.ResetMemoryGameTutorial();/
+        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        //}
+
+        //if (Input.GetKeyDown(KeyCode.A))
+        //{
+        //    TutorialManager.fashionShowTutorial = true;
+        //    XmlDocument document = new XmlDocument();
+        //    Debug.Log(ConfigManager.ConfigDocument.InnerXml);
+        //    Debug.Log(ConfigManager.ConfigDocument.OuterXml);
+        //    document.LoadXml(ConfigManager.ConfigDocument.InnerXml);
+        //    XmlNode rootNode = document.SelectSingleNode(PlayerConfigLabel.RootNode);
+        //    rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorial));
+        //    rootNode.RemoveChild(rootNode.SelectSingleNode(PlayerConfigLabel.FindMissingMinigameTutorialIndex));
+        //    rootNode.SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 15.ToString();
+        //    rootNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = "jrjL84";
+        //    rootNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = "1708014471457405866";
+
+        //    URLRequestData urlData = new URLRequestData();
+        //    urlData.Add("u", "1708014471457405866");
+        //    urlData.Add("v", "1");
+        //    urlData.Add("l", rootNode.OuterXml);
+        //    URLRequest.CreateStrURLRequest(false, HttpManager.SaveURL, urlData, data => { Debug.Log(data); }, URLRequest.Method.POST);
+
+        //    StringFilter.ContainSensitiveWord("真");
+        //    TutorialManager.findMissingMinigameTutorial = true;
+        //    DebugManager.ResetGardenLevel(30);
+        //    Manager.Diamond = 1000;
+        //    PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
+        //    FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
+        //}
 
         //if (Input.GetKeyDown(KeyCode.S))
         //{

Assets/Script/Tool/Bundle.cs

@@ -825,12 +825,12 @@ public class Bundle : MonoBehaviour
                 //Debug.Log(localMD5);
                 //Debug.Log(HttpManager.Md5);
                 needUpdate = localMD5 != HttpManager.Md5;
-                //Debug.LogWarning($"NeedUpdate : {needUpdate}");
-            }
-            if (Application.isEditor || Application.isMobilePlatform)
-            {
-                needUpdate = false;
+                Debug.LogWarning($"NeedUpdate : {needUpdate}");
             }
+            //if (Application.isEditor)
+            //{
+            //    needUpdate = false;
+            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {
@@ -1009,7 +1009,7 @@ public class Bundle : MonoBehaviour
 
     public static void DownloadAssetBundleFailed(AssetBundleSet assetBundleSet, string error)
     {
-        Debug.Log(error);
+        Debug.Log(assetBundleSet.Name + "  " + error);
         string path = assetBundleSet.PersistentPath;
         path = path.Replace("/", Path.DirectorySeparatorChar.ToString());
         path = path.Replace("\\", Path.DirectorySeparatorChar.ToString());

Assets/Script/UI/UpdatePanel.cs

@@ -11,6 +11,10 @@ public class UpdatePanel : MonoBehaviour
     [SerializeField] private Text content;
     [SerializeField] private Transform bg;
 
+    private Text progressTxt;
+
+
+
     private TweenCG alphaAnim;
     private TweenScale scaleAnim;
 
@@ -21,6 +25,7 @@ public class UpdatePanel : MonoBehaviour
         title = ResourceManager.Get<Text>(CanvasLabel.AJ_Title);
         content = ResourceManager.Get<Text>(CanvasLabel.AJ_Content);
         bg = ResourceManager.Get(CanvasLabel.AJ_bg);
+        progressTxt = ResourceManager.Get<Text>(CanvasLabel.AJ_Progress);
 
         alphaAnim = transform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         scaleAnim = bg.CreateTweenScale(Vector3.zero, Vector3.one, 0.25f, false, true, Curve.EaseOutQuad);
@@ -56,13 +61,31 @@ public class UpdatePanel : MonoBehaviour
 
     public static void SetProgress(int updateAmt, int finishAmt)
     {
+        if (instance == null)
+        {
+            return;
+        }
         string str = Language.GetStr(LanguageLabel.UI__AJ_Content, Application.systemLanguage);
         str = str.Replace("%NUM0%", updateAmt.ToString()).Replace("%NUM1%", finishAmt.ToString());
         instance.content.text = str;
     }
 
+    public static void SetProgress(float progress)
+    {
+        if (instance == null)
+        {
+            return;
+        }
+        string str = Language.GetStr(LanguageLabel.UI__AJ_Progress, Application.systemLanguage);
+        instance.progressTxt.text = str.Replace("%NUM%", (progress * 100).ToString("0"));
+    }
+
     public static void SetContent(string str)
     {
+        if (instance == null)
+        {
+            return;
+        }
         instance.content.text = str;
     }
 }

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: []

第五期.txt

@@ -6,18 +6,20 @@
 
 
 
-//关闭DebugMode 开启CatchException
+开启热更新
 
-//切换到远程服务器 正常Zone
+关闭DebugMode 开启CatchException
 
-//关闭调试按键和界面
+切换到远程服务器 正常Zone
+
+关闭调试按键和界面
 
 开启Service再打包
 
-//更新Bundle
+更新Bundle
 
-//更新服务器MD5
+更新服务器MD5
 
-//更新版本号
+更新版本号
 
 IOS设置Team