Browse Source

界面优化

liuqilin 7 years ago
parent
commit
912cc05aff

+ 3 - 4
Assets/Resource/Logo.unity

@@ -613,10 +613,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 0
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 553 - 150
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


+ 2 - 1
Assets/Resource/Prefab/PrefabUI/FashionShowCloseItem.prefab

@@ -310,6 +310,7 @@ MonoBehaviour:
   Y: 0
   LineHeight: 0
   MaxLineHeight: Infinity
+  Scale: 1
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -449,7 +450,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.43137255, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:

+ 159 - 14
Assets/Resource/Prefab/PrefabUI/FriendItem.prefab

@@ -96,6 +96,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1188117488562816
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224868494086587220}
+  - component: {fileID: 222850650044703208}
+  - component: {fileID: 114180935591379796}
+  m_Layer: 5
+  m_Name: NewMessageFlagText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1219559371557482
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224308682776634196}
+  - component: {fileID: 222099729623672412}
+  - component: {fileID: 114013336871970902}
+  m_Layer: 5
+  m_Name: NewMessageFlag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1411948730818144
 GameObject:
   m_ObjectHideFlags: 1
@@ -263,6 +297,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114013336871970902
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
+  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: 1e0c425d384f8644282ea5d7104860e4, 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 &114084414480707920
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -364,6 +425,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 123uyl
+--- !u!114 &114180935591379796
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u65B0\u6D88\u606F"
 --- !u!114 &114308872634755384
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -562,25 +656,26 @@ MonoBehaviour:
   Draw: 0
   SetY: 0
   Y: 0
-  LineHeight: 16.6998
+  LineHeight: 16.271185
   MaxLineHeight: Infinity
+  Scale: 1
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
   NewTextIndex: 0600000007000000
   NewTextPos:
-  - {x: -1.495573, y: 7.1570573, z: 0}
-  - {x: 8.842398, y: 7.1570573, z: 0}
-  - {x: 8.842398, y: -7.1570573, z: 0}
-  - {x: 8.842398, y: -7.1570573, z: 0}
-  - {x: -1.495573, y: -7.1570573, z: 0}
-  - {x: -1.495573, y: 7.1570573, z: 0}
-  - {x: 8.047171, y: 7.1570573, z: 0}
-  - {x: 18.385141, y: 7.1570573, z: 0}
-  - {x: 18.385141, y: -7.1570573, z: 0}
-  - {x: 18.385141, y: -7.1570573, z: 0}
-  - {x: 8.047171, y: -7.1570573, z: 0}
-  - {x: 8.047171, y: 7.1570573, z: 0}
+  - {x: -1.7154598, y: 7.231638, z: 0}
+  - {x: 9.131998, y: 7.231638, z: 0}
+  - {x: 9.131998, y: -7.231638, z: 0}
+  - {x: 9.131998, y: -7.231638, z: 0}
+  - {x: -1.7154598, y: -7.231638, z: 0}
+  - {x: -1.7154598, y: 7.231638, z: 0}
+  - {x: 7.324089, y: 7.231638, z: 0}
+  - {x: 18.171545, y: 7.231638, z: 0}
+  - {x: 18.171545, y: -7.231638, z: 0}
+  - {x: 18.171545, y: -7.231638, z: 0}
+  - {x: 7.324089, y: -7.231638, z: 0}
+  - {x: 7.324089, y: 7.231638, z: 0}
 --- !u!114 &114448456380351586
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -766,6 +861,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1626347861987158}
+--- !u!222 &222099729623672412
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
 --- !u!222 &222107185164028080
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -820,6 +921,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1052832695094368}
+--- !u!222 &222850650044703208
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
 --- !u!222 &222858963629077324
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -907,9 +1014,28 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -421, y: 156}
   m_SizeDelta: {x: 637.4, y: 71}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224308682776634196
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
+  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: 224868494086587220}
+  m_Father: {fileID: 224926007496139162}
+  m_RootOrder: 1
+  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: -58.14, y: -0.0000023842}
+  m_SizeDelta: {x: 40.5, y: 16.9}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224328247138092648
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1004,6 +1130,24 @@ RectTransform:
   m_AnchoredPosition: {x: -180.2, y: 60.8}
   m_SizeDelta: {x: 17.6, y: 17.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224868494086587220
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224308682776634196}
+  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.0000019073486, y: 0.00000023841858}
+  m_SizeDelta: {x: 100.152, y: 32.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224915711695323370
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1053,6 +1197,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224659196923624864}
+  - {fileID: 224308682776634196}
   m_Father: {fileID: 224598877154918140}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

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

+ 2 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -282,6 +282,8 @@
     <AG_ConnectError desc=""><![CDATA[连接服务器失败]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[发送申请]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[昵称不能为空]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[新申请]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[新消息]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[发送者]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[内容]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[时间]]></AH_TimeTitle>

+ 2 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -282,6 +282,8 @@
     <AG_ConnectError desc=""><![CDATA[連接伺服器失敗]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[發送申請]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[昵稱不能為空]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[新申請]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[新訊息]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[發送者]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[內容]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[時間]]></AH_TimeTitle>

+ 2 - 0
Assets/Resource/XML/lan/English.xml

@@ -282,6 +282,8 @@ Program 水怪
     <AG_ConnectError desc=""><![CDATA[Failed]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[Send]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[Nickname can not be null]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[New]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[Message]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[Sender]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[Content]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[Time]]></AH_TimeTitle>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 3 - 1
Assets/Script/AssetBundleUtility/AssetBundleGroup.cs

@@ -1,3 +1,5 @@
+using UnityEngine;
+
 namespace assetBundleUtility
 {
 
@@ -34,7 +36,7 @@ namespace assetBundleUtility
 	        {
 	            AssetBundleSet assetBundleSet = AssetBundleSets[i];
 	            if (assetBundleSet.Object == null) continue;
-	            assetBundleSet.Name = assetBundleSet.Object.name;
+	            assetBundleSet.Name = assetBundleSet.Object.name.Replace(Bundle.version, "");
 	            assetBundleSet.StreamingPath = AssetDatabase.GetAssetPath(assetBundleSet.Object);
 	            assetBundleSet.MD5 = MD5Utility.GetMD5StringFromPath(assetBundleSet.StreamingPath);
 	            assetBundleSets.Add(assetBundleSet);

+ 2 - 2
Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -76,7 +76,7 @@ namespace assetBundleUtility
             {
                 AssetBundleSet assetBundleSet = new AssetBundleSet();
                 string[] strings = items[i].Split('|');
-                assetBundleSet.Name = strings[0].Replace("1.3", "");
+                assetBundleSet.Name = strings[0].Replace(Bundle.version, "");
                 assetBundleSet.MD5 = strings[1];
                 //assetBundleSet.URL = strings[2];
                 assetBundleSets.Add(assetBundleSet);
@@ -355,7 +355,7 @@ namespace assetBundleUtility
             }
 	        assetBundleSet.URL = HttpManager.AssetbundleUrl + folder + Path.DirectorySeparatorChar + assetBundleSet.Name;
             //Debug.Log(assetBundleSet.URL);
-            WWW www = new WWW(assetBundleSet.URL + "1.3");
+            WWW www = new WWW(assetBundleSet.URL + Bundle.version);
 
 	        while (www.isDone == false)
 	        {

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

@@ -52,17 +52,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AssetBundleGroups:
-  - MD5FileName: AndroidMD51.3.txt
-    MD5DictionaryFileName: AndroidMD5Dictionary1.3.txt
+  - MD5FileName: AndroidMD51_3_1.txt
+    MD5DictionaryFileName: AndroidMD5Dictionary1_3_1.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 77fd64e7b3708484a9c744e105248200, type: 3}
+    - Object: {fileID: 102900000, guid: d40906ea5bb958244896cd19338ee6c5, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 8cdda597a784fa44098f091fab3fb829, type: 3}
+    - Object: {fileID: 102900000, guid: c16cb5c126353b04facb75b638746bcd, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: d205a191403fc2a4c9e9cbfd84e6a204, type: 3}
+    - Object: {fileID: 102900000, guid: 8e1c9c8a34bf0604cb7c118a07439af4, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 6d9c13d607d91c746877e21c80481636, type: 3}
+    - Object: {fileID: 102900000, guid: 24e4f8d41f741764e9c8d72a15dcbbae, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
@@ -76,15 +76,15 @@ MonoBehaviour:
       URL: null
     - Object: {fileID: 102900000, guid: 2322ebf659ac53340bfdc21c831c6f31, type: 3}
       URL: null
-  - MD5FileName: WindowsMD51.3.txt
-    MD5DictionaryFileName: WindowsMD5Dictionary1.3.txt
+  - MD5FileName: WindowsMD51_3_1.txt
+    MD5DictionaryFileName: WindowsMD5Dictionary1_3_1.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: b9d1f83b796cad440bb4ebed51087d9a, type: 3}
+    - Object: {fileID: 102900000, guid: 470d0de5897adeb489b0ce8fec6663f9, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: a5fd5eee70dcf7146819a50e531b4f27, type: 3}
+    - Object: {fileID: 102900000, guid: 2a0ee40efadc3a749a90bd2c2f33b40b, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 5ca364cd037134c429eeeacb5f2ff0cb, type: 3}
+    - Object: {fileID: 102900000, guid: 23c77a155c1c00949a30fbcc5dc5a92a, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 3b87727f8d4abf84f85a6a101cf2d12b, type: 3}
+    - Object: {fileID: 102900000, guid: ecb11dda1c1174e4bb6944fe130f31a4, type: 3}
       URL: null

+ 1 - 1
Assets/Script/Editor/EditorBundle.cs

@@ -213,7 +213,7 @@ public class EditorBundle : Editor
             foreach (var name in names)
             {
                 byte[] bytes = File.ReadAllBytes($"{prefix}/HotUpdate/{name}");
-                File.WriteAllBytes(hotUpdateFolder + "/" + name, bytes);
+                File.WriteAllBytes(hotUpdateFolder + "/" + name + Bundle.version, bytes);
             }
         }
         AssetDatabase.Refresh();

+ 7 - 0
Assets/Script/Label/CanvasLabel.cs

@@ -103,6 +103,8 @@ public class CanvasLabel
     public static string C_Notify = "C_Notify";
     public static string C_FriendButtonParent = "C_FriendButtonParent";
     public static string C_FriendButton = "C_FriendButton";
+    public static string C_NewMessageFlag = "C_NewMessageFlag";
+    public static string C_NewMessageFlagText = "C_NewMessageFlagText";
     public static string C_RankRarent = "C_RankRarent";
     public static string C_Rank = "C_Rank";
     public static string C_Info = "C_Info";
@@ -413,6 +415,8 @@ public class CanvasLabel
     public static string H_UIParticleSystem = "H_UIParticleSystem";
     public static string H_Icon2 = "H_Icon2";
     public static string H_ArrowPos = "H_ArrowPos";
+    public static string H_ArrowParent = "H_ArrowParent";
+    public static string H_Arrow = "H_Arrow";
     public static string H_Close = "H_Close";
     public static string H_HGroup = "H_HGroup";
     public static string H_Btn = "H_Btn";
@@ -576,6 +580,7 @@ public class CanvasLabel
     public static string Pg_FashionTitle = "Pg_FashionTitle";
     public static string Pg_FashionTitlePlaceHolder = "Pg_FashionTitlePlaceHolder";
     public static string Pg_FashionTitleEditButton = "Pg_FashionTitleEditButton";
+    public static string Pg_Content = "Pg_Content";
     public static string Pg_FashionContentBackground = "Pg_FashionContentBackground";
     public static string Pg_FashionContentParent = "Pg_FashionContentParent";
     public static string Pg_FashionContent = "Pg_FashionContent";
@@ -923,6 +928,8 @@ public class CanvasLabel
     public static string AF_Frame = "AF_Frame";
     public static string AF_NicknameTitle = "AF_NicknameTitle";
     public static string AF_ContentTitle = "AF_ContentTitle";
+    public static string AF_NewMessageFlag = "AF_NewMessageFlag";
+    public static string AF_NewMessageFlagText = "AF_NewMessageFlagText";
     public static string AF_ApplicantButton = "AF_ApplicantButton";
     public static string AF_NewApplicantFlagImage = "AF_NewApplicantFlagImage";
     public static string AF_ApplicantIcon = "AF_ApplicantIcon";

+ 48 - 3
Assets/Script/Label/LanguageLabel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;
@@ -20,8 +20,9 @@ public class LanguageLabel
     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";
+    public static string UI__U_WarningText = "UI__U_WarningText";
     //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";
@@ -201,7 +202,6 @@ public class LanguageLabel
     	public static string UI__T_RepeatName = "UI__T_RepeatName";
     	public static string UI__U_Lab = "UI__U_Lab";
     	public static string UI__U_WarningTitle = "UI__U_WarningTitle";
-    	public static string UI__U_WarningText = "UI__U_WarningText";
     	public static string UI__X_Self = "UI__X_Self";
     	public static string UI__Y_GuessNumberDesc = "UI__Y_GuessNumberDesc";
     	public static string UI__Y_GuessColorDesc = "UI__Y_GuessColorDesc";
@@ -296,6 +296,8 @@ public class LanguageLabel
     	public static string UI__AG_ConnectError = "UI__AG_ConnectError";
     	public static string UI__AG_ApplyButtonTitle = "UI__AG_ApplyButtonTitle";
     	public static string UI__AG_SearchNameEmpty = "UI__AG_SearchNameEmpty";
+    	public static string UI__AH_NewApplicant = "UI__AH_NewApplicant";
+    	public static string UI__AH_NewMessage = "UI__AH_NewMessage";
     	public static string UI__AH_NicknameTitle = "UI__AH_NicknameTitle";
     	public static string UI__AH_ContentTitle = "UI__AH_ContentTitle";
     	public static string UI__AH_TimeTitle = "UI__AH_TimeTitle";
@@ -336,6 +338,7 @@ public class LanguageLabel
     	public static string PlazaroomMemberItem__ConnectError = "PlazaroomMemberItem__ConnectError";
     	public static string PlazaroomMemberItem__SendMessageSucceed = "PlazaroomMemberItem__SendMessageSucceed";
     	public static string FlowerName = "FlowerName";
+    	public static string FlowerName__Flower0 = "FlowerName__Flower0";
     	public static string FlowerName__Flower1 = "FlowerName__Flower1";
     	public static string FlowerName__Flower2 = "FlowerName__Flower2";
     	public static string FlowerName__Flower3 = "FlowerName__Flower3";
@@ -372,7 +375,22 @@ public class LanguageLabel
     	public static string FlowerName__Flower34 = "FlowerName__Flower34";
     	public static string FlowerName__Flower35 = "FlowerName__Flower35";
     	public static string FlowerName__Flower36 = "FlowerName__Flower36";
+    	public static string FlowerName__Flower37 = "FlowerName__Flower37";
+    	public static string FlowerName__Flower38 = "FlowerName__Flower38";
+    	public static string FlowerName__Flower39 = "FlowerName__Flower39";
+    	public static string FlowerName__Flower40 = "FlowerName__Flower40";
+    	public static string FlowerName__Flower41 = "FlowerName__Flower41";
+    	public static string FlowerName__Flower42 = "FlowerName__Flower42";
+    	public static string FlowerName__Flower43 = "FlowerName__Flower43";
+    	public static string FlowerName__Flower44 = "FlowerName__Flower44";
+    	public static string FlowerName__Flower45 = "FlowerName__Flower45";
+    	public static string FlowerName__Flower46 = "FlowerName__Flower46";
+    	public static string FlowerName__Flower47 = "FlowerName__Flower47";
+    	public static string FlowerName__Flower48 = "FlowerName__Flower48";
+    	public static string FlowerName__Flower49 = "FlowerName__Flower49";
+    	public static string FlowerName__Flower50 = "FlowerName__Flower50";
     	public static string FlowerColor = "FlowerColor";
+    	public static string FlowerColor__Flower0 = "FlowerColor__Flower0";
     	public static string FlowerColor__Flower1 = "FlowerColor__Flower1";
     	public static string FlowerColor__Flower2 = "FlowerColor__Flower2";
     	public static string FlowerColor__Flower3 = "FlowerColor__Flower3";
@@ -409,6 +427,20 @@ public class LanguageLabel
     	public static string FlowerColor__Flower34 = "FlowerColor__Flower34";
     	public static string FlowerColor__Flower35 = "FlowerColor__Flower35";
     	public static string FlowerColor__Flower36 = "FlowerColor__Flower36";
+    	public static string FlowerColor__Flower37 = "FlowerColor__Flower37";
+    	public static string FlowerColor__Flower38 = "FlowerColor__Flower38";
+    	public static string FlowerColor__Flower39 = "FlowerColor__Flower39";
+    	public static string FlowerColor__Flower40 = "FlowerColor__Flower40";
+    	public static string FlowerColor__Flower41 = "FlowerColor__Flower41";
+    	public static string FlowerColor__Flower42 = "FlowerColor__Flower42";
+    	public static string FlowerColor__Flower43 = "FlowerColor__Flower43";
+    	public static string FlowerColor__Flower44 = "FlowerColor__Flower44";
+    	public static string FlowerColor__Flower45 = "FlowerColor__Flower45";
+    	public static string FlowerColor__Flower46 = "FlowerColor__Flower46";
+    	public static string FlowerColor__Flower47 = "FlowerColor__Flower47";
+    	public static string FlowerColor__Flower48 = "FlowerColor__Flower48";
+    	public static string FlowerColor__Flower49 = "FlowerColor__Flower49";
+    	public static string FlowerColor__Flower50 = "FlowerColor__Flower50";
     	public static string SkillName = "SkillName";
     	public static string SkillName__Pack1 = "SkillName__Pack1";
     	public static string SkillName__Pack2 = "SkillName__Pack2";
@@ -830,6 +862,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature38 = "DressRoom__Armature38";
     	public static string DressRoom__Armature39 = "DressRoom__Armature39";
     	public static string DressRoom__Armature40 = "DressRoom__Armature40";
+    	public static string DressRoom__Armature41 = "DressRoom__Armature41";
+    	public static string DressRoom__Armature42 = "DressRoom__Armature42";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -852,6 +886,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature220 = "DressRoom__Armature220";
     	public static string DressRoom__Armature221 = "DressRoom__Armature221";
     	public static string DressRoom__Armature222 = "DressRoom__Armature222";
+    	public static string DressRoom__Armature223 = "DressRoom__Armature223";
+    	public static string DressRoom__Armature224 = "DressRoom__Armature224";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -872,6 +908,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature418 = "DressRoom__Armature418";
     	public static string DressRoom__Armature419 = "DressRoom__Armature419";
     	public static string DressRoom__Armature420 = "DressRoom__Armature420";
+    	public static string DressRoom__Armature421 = "DressRoom__Armature421";
+    	public static string DressRoom__Armature422 = "DressRoom__Armature422";
     	public static string DressRoom__Armature601 = "DressRoom__Armature601";
     	public static string DressRoom__Armature602 = "DressRoom__Armature602";
     	public static string DressRoom__Armature603 = "DressRoom__Armature603";
@@ -888,6 +926,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature614 = "DressRoom__Armature614";
     	public static string DressRoom__Armature615 = "DressRoom__Armature615";
     	public static string DressRoom__Armature616 = "DressRoom__Armature616";
+    	public static string DressRoom__Armature617 = "DressRoom__Armature617";
+    	public static string DressRoom__Armature618 = "DressRoom__Armature618";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -910,11 +950,15 @@ public class LanguageLabel
     	public static string DressRoom__Armature820 = "DressRoom__Armature820";
     	public static string DressRoom__Armature821 = "DressRoom__Armature821";
     	public static string DressRoom__Armature822 = "DressRoom__Armature822";
+    	public static string DressRoom__Armature823 = "DressRoom__Armature823";
+    	public static string DressRoom__Armature824 = "DressRoom__Armature824";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";
     	public static string DressRoom__Armature1004 = "DressRoom__Armature1004";
     	public static string DressRoom__Armature1005 = "DressRoom__Armature1005";
+    	public static string DressRoom__Armature1006 = "DressRoom__Armature1006";
+    	public static string DressRoom__Armature1007 = "DressRoom__Armature1007";
     	public static string DressRoom__DesignByKnife = "DressRoom__DesignByKnife";
     	public static string Tip = "Tip";
     	public static string Tip__Tip1 = "Tip__Tip1";
@@ -926,6 +970,7 @@ public class LanguageLabel
     	public static string Tip__Tip7 = "Tip__Tip7";
     	public static string Tip__Tip8 = "Tip__Tip8";
     	public static string Tip__Tip9 = "Tip__Tip9";
+    	public static string Tip__Tip10 = "Tip__Tip10";
     	public static string MinigameName = "MinigameName";
     	public static string MinigameName__Punch = "MinigameName__Punch";
     	public static string MinigameName__Memory = "MinigameName__Memory";

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

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

+ 2 - 0
Assets/Script/Manage/GardenManager.cs

@@ -538,6 +538,7 @@ public class GardenManager : Regist
             ResourceManager.Get<Button>(CanvasLabel.H_Icon2).interactable = false;
             ResourceManager.SetActive(CanvasLabel.H_AmtLab, false);
             ResourceManager.SetActive(CanvasLabel.H_Rotate, false);
+            ResourceManager.SetActive(CanvasLabel.H_ArrowParent, false);
             ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_AllPlanted));
         }
         else
@@ -546,6 +547,7 @@ public class GardenManager : Regist
             ResourceManager.SetActive(CanvasLabel.H_AmtLab, true);
             ResourceManager.SetText(CanvasLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
             ResourceManager.SetActive(CanvasLabel.H_Rotate, true);
+            ResourceManager.SetActive(CanvasLabel.H_ArrowParent, true);
             ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_PlantTip));
         }
     }

+ 6 - 6
Assets/Script/Manage/HttpManager.cs

@@ -1840,15 +1840,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD51.3";
+            fileName = "AndroidMD5" + Bundle.version;
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD51.3";
+            fileName = "IOSMD5" + Bundle.version;
         }
         else
         {
-            fileName = "WindowsMD51.3";
+            fileName = "WindowsMD5" + Bundle.version;
         }
         if (string.IsNullOrEmpty(fileName))
         {
@@ -1865,15 +1865,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD5Dictionary1.3";
+            fileName = "AndroidMD5Dictionary" + Bundle.version;
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD5Dictionary1.3";
+            fileName = "IOSMD5Dictionary" + Bundle.version;
         }
         else
         {
-            fileName = "WindowsMD5Dictionary1.3";
+            fileName = "WindowsMD5Dictionary" + Bundle.version;
         }
         if (string.IsNullOrEmpty(fileName))
         {

+ 4 - 1
Assets/Script/Social/FashionShowCloseBox.cs

@@ -79,21 +79,24 @@ public class FashionShowCloseCell
         PraiseShowHttp.Praise(HttpManager.GetPlayerId(), FashionShowData.showId, null, null);
     }
 
-    private void RefreshPraiseButton()
+    public void RefreshPraiseButton()
     {
         if (FashionShowData.praised)
         {
             PraiseButton.image.color = Lib.Pink;
+            PraiseText.color = Color.white;
         }
         else
         {
             PraiseButton.image.color = Color.white;
+            PraiseText.color = Lib.PraiseTextBlue;
         }
         PraiseText.text = FashionShowData.praiseCnt.ToString();
     }
 
     private void OnDisplayButtonClick()
     {
+        FashionShowEditPage.closeCell = this;
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         TweenRoot tween = FashionShowHomePage.HideSidePanel();
         bool belongSelf = FashionShowData.playerId == long.Parse(HttpManager.SerialNumber);

+ 5 - 1
Assets/Script/Social/FashionShowEditPage.cs

@@ -77,6 +77,7 @@ public class FashionShowEditPage : Regist
     private static Transform SimpleSliderBg;
     private static Transform GlorySliderBg;
 
+    public static FashionShowCloseCell closeCell;
     //private static bool Praised;
     private static bool BelongSelf;
     private static bool LeaveToRateMode;
@@ -371,7 +372,7 @@ public class FashionShowEditPage : Regist
         FashionTitleInputField.SetActive(false);
         FashionContentInputField.SetActive(false);
 
-        if (FashionShowData.rated == false)
+        if (FashionShowData.rated == false && FashionShowData.playerId != HttpManager.GetPlayerId())
         {
             ShowRateButton();
         }
@@ -462,6 +463,7 @@ public class FashionShowEditPage : Regist
             FashionShowData.praiseCnt--;
         }
         RefreshPraiseButton();
+        closeCell.RefreshPraiseButton();
         PraiseShowHttp.Praise(HttpManager.GetPlayerId(), FashionShowData.showId, null, null);
     }
 
@@ -470,10 +472,12 @@ public class FashionShowEditPage : Regist
         if (FashionShowData.praised)
         {
             PraiseButton.image.color = Lib.Pink;
+            PraiseText.color = Color.white;
         }
         else
         {
             PraiseButton.image.color = Color.white;
+            PraiseText.color = Lib.PraiseTextBlue;
         }
         PraiseText.text = FashionShowData.praiseCnt.ToString();
     }

+ 4 - 4
Assets/Script/Social/FashionShowHomePage.cs

@@ -46,7 +46,7 @@ public class FashionShowHomePage : Regist
     private static bool requesting;
     private static ShowListHttp http;
     private static FashionShowType currentType;
-    private static Button CurrentTabButton;
+    //private static Button CurrentTabButton;
     private static VirtualScrollRectPlus CurrentScrollRect;
     private static List<GetFashionShowData> CurrentDatas = new List<GetFashionShowData>();
 
@@ -109,7 +109,7 @@ public class FashionShowHomePage : Regist
         SidePanel = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomeSidePanel);
         OpenHomePageButton = ResourceManager.Get<Button>(CanvasLabel.C_FashionShowButton);
 
-        CurrentTabButton = HomeTabButton;
+        //CurrentTabButton = HomeTabButton;
         TabButtons.Add(HomeTabButton);
         TabButtons.Add(CuteTabButton);
         TabButtons.Add(GraceTabButton);
@@ -221,7 +221,7 @@ public class FashionShowHomePage : Regist
         {
             tabButton.GetTweenScale().InOrigin = true;
         }
-        OnTabButtonClick(CurrentTabButton);
+        OnTabButtonClick(HomeTabButton);
     }
 
     public static void HidePanel()
@@ -288,7 +288,7 @@ public class FashionShowHomePage : Regist
         currentDataIndex = 0;
         currentPage = 0;
         currentType = (FashionShowType) index;
-        CurrentTabButton = button;
+        //CurrentTabButton = button;
         CurrentScrollRect = ScrollRects[index];
         CurrentDatas = TabDatasList[index];
         if (http != null)

+ 12 - 0
Assets/Script/Social/FriendItem.cs

@@ -22,6 +22,8 @@ public class FriendItemLabel
 	public static string DeleteButtonParent = "DeleteButtonParent";
 	public static string DeleteButton = "DeleteButton";
 	public static string DeleteButtonText = "DeleteButtonText";
+	public static string NewMessageText = "NewMessageFlagText";
+	public static string NewMessageImage = "NewMessageFlag";
 }
 
 public class FriendItem : VirtualScrollRectItem
@@ -33,6 +35,8 @@ public class FriendItem : VirtualScrollRectItem
     public Text VisitButtonTitle;
     public Text SendMessageButtonText;
     public Text DeleteButtonText;
+    public Text NewMessageText;
+    public Image NewMessageImage;
     public Image NewMessageFlagImage;
     public Button VisitButton;
     public Button SendMessageButton;
@@ -57,6 +61,8 @@ public class FriendItem : VirtualScrollRectItem
         VisitButtonTitle = childDictionary[FriendItemLabel.VisitButtonTitle].GetComponent<Text>();
         SendMessageButtonText = childDictionary[FriendItemLabel.SendMessageButtonText].GetComponent<Text>();
         DeleteButtonText = childDictionary[FriendItemLabel.DeleteButtonText].GetComponent<Text>();
+        NewMessageText = childDictionary[FriendItemLabel.NewMessageText].GetComponent<Text>();
+        NewMessageImage = childDictionary[FriendItemLabel.NewMessageImage].GetComponent<Image>();
         NewMessageFlagImage = childDictionary[FriendItemLabel.NewMessageFlagImage].GetComponent<Image>();
         VisitButton = childDictionary[FriendItemLabel.VisitButton].GetComponent<Button>();
         SendMessageButton = childDictionary[FriendItemLabel.SendMessageButton].GetComponent<Button>();
@@ -127,6 +133,10 @@ public class FriendItem : VirtualScrollRectItem
                 HttpManager.DeleteBuddy(AccountData.SerialNumber, DeleteFriendSucceed, DeleteFriendFailed);
             }
         );
+        if (FriendPanel.ApplicantItems.Count == 0)
+        {
+            ConfigManager.SaveStringToConfig(PlayerConfigLabel.LastApplicantSerialNumber, "");
+        }
     }
 
     public void DeleteFriendFailed()
@@ -156,6 +166,7 @@ public class FriendItem : VirtualScrollRectItem
         if (serialNumber == AccountData.SerialNumber)
         {
             NewMessageFlagImage.SetActive(true);
+            NewMessageImage.SetActive(true);
         }
         FriendPanel.UpdateFriendButtonOutlineStatus();
     }
@@ -165,6 +176,7 @@ public class FriendItem : VirtualScrollRectItem
         if (serialNumber == AccountData.SerialNumber)
         {
             NewMessageFlagImage.SetActive(false);
+            NewMessageImage.SetActive(false);
         }
         FriendPanel.UpdateFriendButtonOutlineStatus();
     }

+ 46 - 3
Assets/Script/Social/FriendPanel.cs

@@ -18,6 +18,12 @@ public class FriendPanel : Regist
 	public static Text AcceptAllButtonTitle;
 	public static Text AddFriendTitle;
 	public static Text FriendAmountText;
+
+    public static Text GardenNewMessageText;
+    public static Image GardenNewMessageImage;
+    public static Text PanelNewApplicantText;
+    public static Image PanelNewApplicantImage;
+
     public static Image NewApplicantFlagImage;
     public static Button OpenPanelButton;
     public static Button AcceptAllButton;
@@ -35,7 +41,7 @@ public class FriendPanel : Regist
 
     private static float RefreshApplicantTime = 15f;
     private static float RefreshApplicantTimer = RefreshApplicantTime;
-    private static List<ApplicantItem> ApplicantItems = new List<ApplicantItem>();
+    public static List<ApplicantItem> ApplicantItems = new List<ApplicantItem>();
     public static List<AccountData> ApplicantAccountDatas = new List<AccountData>();
 
     public static int MaxFriend
@@ -94,6 +100,12 @@ public class FriendPanel : Regist
         AcceptAllButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AcceptAllButtonTitle);
         AddFriendTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AddFriendTitle);
         FriendAmountText = ResourceManager.Get<Text>(CanvasLabel.AF_FriendAmountText);
+
+        GardenNewMessageText = ResourceManager.Get<Text>(CanvasLabel.C_NewMessageFlagText);
+        GardenNewMessageImage = ResourceManager.Get<Image>(CanvasLabel.C_NewMessageFlag);
+        PanelNewApplicantText = ResourceManager.Get<Text>(CanvasLabel.AF_NewMessageFlagText);
+        PanelNewApplicantImage = ResourceManager.Get<Image>(CanvasLabel.AF_NewMessageFlag);
+
         NewApplicantFlagImage = ResourceManager.Get<Image>(CanvasLabel.AF_NewApplicantFlagImage);
         AcceptAllButton = ResourceManager.Get<Button>(CanvasLabel.AF_AcceptAllButton);
         AddFriendButton = ResourceManager.Get<Button>(CanvasLabel.AF_AddFriendButton);
@@ -116,6 +128,8 @@ public class FriendPanel : Regist
         LanguageManager.Add(PanelTitle, new MulLanStr(LanguageLabel.UI__AF_PanelTitle));
         LanguageManager.Add(AcceptAllButtonTitle, new MulLanStr(LanguageLabel.UI__AF_AcceptAllButtonTitle));
         LanguageManager.Add(AddFriendTitle, new MulLanStr(LanguageLabel.UI__AF_AddFriendTitle));
+        LanguageManager.Add(PanelNewApplicantText, new MulLanStr(LanguageLabel.UI__AH_NewApplicant));
+        LanguageManager.Add(GardenNewMessageText, new MulLanStr(LanguageLabel.UI__AH_NewMessage));
 
         OpenPanelButton.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         FriendPanelParentMask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -191,6 +205,24 @@ public class FriendPanel : Regist
 
     public static void UpdateFriendButtonOutlineStatus()
     {
+        if (HaveNewPrivateMessage)
+        {
+            GardenNewMessageImage.SetActive(true);
+        }
+        else
+        {
+            GardenNewMessageImage.SetActive(false);
+        }
+
+        if (HaveNewApplicant)
+        {
+            PanelNewApplicantImage.SetActive(true);
+        }
+        else
+        {
+            PanelNewApplicantImage.SetActive(false);
+        }
+
         if (HaveNewApplicant || HaveNewPrivateMessage)
         {
             PlayFriendButtonOutline();
@@ -365,7 +397,7 @@ public class FriendPanel : Regist
         UpdateFriendButtonOutlineStatus();
     }
 
-    private static void SaveLastApplicantSerialNumber()
+    public static void SaveLastApplicantSerialNumber()
     {
         if (ApplicantItems.Count > 0)
         {
@@ -385,8 +417,10 @@ public class FriendPanel : Regist
 
     public static void OpenRootFriendPanel()
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
         FriendPanelParentMask.TweenForCG();
+
+        ApplicantButton.isOn = false;
+        AfterApplicantToggleClick(false);
     }
 
     public static void CloseRootFriendPanel()
@@ -410,8 +444,15 @@ public class FriendPanel : Regist
     private static void OnApplicantToggleClick(bool value)
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
+        AfterApplicantToggleClick(value);
+    }
+
+    private static void AfterApplicantToggleClick(bool value)
+    {
         if (value)
         {
+            ResourceManager.Get(CanvasLabel.AF_ApplicantIcon).SetActive(true);
+
             SaveLastApplicantSerialNumber();
             SetNewApplicantStatus();
 
@@ -423,6 +464,8 @@ public class FriendPanel : Regist
         }
         else
         {
+            ResourceManager.Get(CanvasLabel.AF_ApplicantIcon).SetActive(false);
+
             AcceptAllButton.SetActive(false);
             AddFriendButton.SetActive(true);
             ApplicantScrollRect.SetActive(false);

+ 7 - 5
Assets/Script/Tool/Bundle.cs

@@ -20,6 +20,8 @@ public class Bundle : MonoBehaviour
 {
     #region
 
+    public static string version = "1_3_1";
+
     public static bool CopyComplete
     {
         get { return CopyCount == 0; }
@@ -825,12 +827,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 || Application.isMobilePlatform)
+            //{
+            //    needUpdate = false;
+            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.3.0
+  bundleVersion: 1.3.1
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 24
+  AndroidBundleVersionCode: 25
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 16
+  iPhoneBuildNumber: 17
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

+ 1 - 1
ProjectSettings/UnityConnectSettings.asset

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

+ 4 - 8
第五期.txt

@@ -2,12 +2,6 @@
 
 
 
-搭配秀排序不对?
-
-搭配秀在编辑界面点赞后回到主界面 点赞数没有更新
-
-
-
 存档要升级 重新复制AssetBundle
 
 开启热更新
@@ -20,10 +14,12 @@
 
 开启Service再打包
 
+更新版本号
+
+更新热更新版本
+
 更新Bundle
 
 更新服务器MD5
 
-更新版本号
-
 IOS设置Team

Some files were not shown because too many files changed in this diff