修复访问时侧边栏被隐藏的Bug

Assets/AtlasUtility/SerializeObject.prefab

@@ -53,8 +53,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PackAtlasFunction: 0
   SliceAtlasFunction: 0
-  SearchReferenceFunction: 0
-  PlatformControllFunction: 1
+  SearchReferenceFunction: 1
+  PlatformControllFunction: 0
   ScaleTextureFunction: 0
   DebugFunction: 0
   PackSize: 2048
@@ -109,7 +109,7 @@ MonoBehaviour:
   SlicePadding: 0
   SlicePath: Assets/ZTemp
   SliceAtlas: {fileID: 2800000, guid: a27b5521f1d8a6b40ae582a27ff88ca4, type: 3}
-  SearchTarget: {fileID: 2800000, guid: 896d2ef2d74c6054a8071b2d2b30fb23, type: 3}
+  SearchTarget: {fileID: 2800000, guid: 980c962c52249774e9266e82d2496d13, type: 3}
   ScalePadding: 1
   ScaleFactor: 0.7
   ScalePath: Assets/Resource/Sprite/Mobile/UI

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

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

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -140,6 +140,7 @@ MonoBehaviour:
   - {fileID: 2100000, guid: f8bc4b3c19eb03c4b9ff2ba146b5faf9, type: 2}
   - {fileID: 1266546654056180, guid: 7f826c7f4c27c8d44afe9f47f9705a59, type: 2}
   - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}
+  - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -72960,10 +72960,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224986266947929816}
   m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 1.9728832e-32, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 221.14, y: -142.29}
+  m_AnchoredPosition: {x: 183.32, y: -142.29}
   m_SizeDelta: {x: 76.2, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224439514348262432

Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 980c962c52249774e9266e82d2496d13
-timeCreated: 1509116443
+timeCreated: 1516764851
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -69,6 +69,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 1024
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -14,10 +14,10 @@
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[参观人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园[&value&]]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园 [&value&]]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费[&value&]]]></F_CoinPersonBtn1>
-    <F_IncreaseSource desc=""><![CDATA[加成来源[&value&]]]></F_IncreaseSource>
+    <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费 [&value&]]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[加成来源 [&value&]]]></F_IncreaseSource>
     <F_LinkButton desc=""><![CDATA[显示所有]]></F_LinkButton>
     <F_Tip desc=""><![CDATA[这是一款健康游戏，不在线也可以持续获得金币。如果觉得暂时没什么可做的，可以过一段时间再来玩]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>

Assets/Script/Label/ResourceLabel.cs

@@ -10,6 +10,7 @@ public class ResourceLabel
     public static string PlazaRoom = "PlazaRoom";
     public static string ObjPool = "ObjPool";
 
+    public static string SkillAtlas = "SkillAtlas";
     public static string Atlas = "Atlas";
     public static string TimerMat = "TimerMat";
     public static string EventSystem = "EventSystem";
@@ -52,6 +53,18 @@ public class ResourceLabel
     public static string Tutorial = "Tutorial";
     public static string DressRoom = "DressRoom";
 
+    public static string Expression_BlueFace = "郁闷按钮";
+    public static string Expression_SweatFace = "汗颜按钮";
+    public static string Expression_SurpriseFace = "惊讶按钮";
+    public static string Expression_HappyFace = "开心按钮";
+    public static string Expression_CryFace = "哭按钮";
+    public static string Expression_HopeFace = "期待按钮";
+    public static string Expression_OgleFace = "色咪咪按钮";
+    public static string Expression_ChagrinFace = "委屈按钮";
+    public static string Expression_SendPublicMessage = "发送按钮";
+    public static string Expression_Expression = "表情按钮";
+    public static string Expression_InputField = "打字框";
+
     public static string WifiOn = "wifi_ok";
     public static string WifiOff = "wifi_lost";
     public static string Expression = "Expression";

Assets/Script/Manage/Manager.cs

@@ -343,7 +343,7 @@ public class Manager : Regist
         set
         {
             person = value;
-            ResourceManager.SetText(CanvasLabel.F_PersonLab,  Auxiliary.ShrinkAllNumberStr(CurrentPerson*60));
+            ResourceManager.SetText(CanvasLabel.F_PersonLab,  Auxiliary.ShrinkBigNumberStr(CurrentPerson*60));
         }
     }
     private static float person;
@@ -356,7 +356,7 @@ public class Manager : Regist
         {
             coinPerson = value;
 
-            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, Auxiliary.ShrinkAllNumberStr(CurrentCoinPerson));
+            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, Auxiliary.ShrinkBigNumberStr(CurrentCoinPerson));
         }
     }
     private static float coinPerson;
@@ -708,6 +708,11 @@ public class Manager : Regist
 
     private void InputDetectThread()
     {
+        if (VisitManager.InVisit)
+        {
+            return;
+        }
+
         if (Auxiliary.AnyKeyUp)
         {
             InputDetectTimer = 0;

Assets/Script/Manage/UIManager.cs

@@ -21,6 +21,7 @@ public class UIManager : Regist
 
     public static bool Initd;
 
+    private static int MaxSkillIconForIncomeDetailPanel = 4;
     private static int MaxSkillDisplayAmt = 2;
     private static int MaxAbilityDisplayAmt = 3;
     private static int MinigameDisplayCoinAwardRatio = 10;
@@ -1673,10 +1674,21 @@ public class UIManager : Regist
         }
         SpriteAsset.AddBundleSpriteInfo(spriteList.ToArray());
 
-        //Texture2D texture = ResourceManager.LoadSprite("SkillAtlas", Folder.Atlas2).texture;
-        //Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
+        Sprite sprite;
+        if (Initializer.Instance.DebugMode)
+        {
+            Texture2D texture = ResourceManager.LoadSprite("4大技能1", Folder.Atlas2).texture;
+            sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
+        }
+        else
+        {
+            sprite = ResourceManager.LoadSprite(ResourceLabel.SkillAtlas, Folder.Atlas2);
+        }
+
         ResourceManager.Get<TextPlus>(CanvasLabel.K_Lab1).Scale = 1.8f;
-        ResourceManager.Get<Image>(CanvasLabel.K_ImagePlus1).sprite = ResourceManager.LoadSprite("SkillAtlas", Folder.Atlas2);
+        ResourceManager.Get<TextPlus>(CanvasLabel.K_Lab1).SetY = true;
+        ResourceManager.Get<TextPlus>(CanvasLabel.K_Lab1).Y = 0;
+        ResourceManager.Get<Image>(CanvasLabel.K_ImagePlus1).sprite = sprite;
 
         ResourceManager.AddButtonEvent
         (
@@ -1697,17 +1709,19 @@ public class UIManager : Regist
                 if (Manager.ExtraPersonSourceSpritesName.Count > 0)
                 {
                     StringBuilder stringBuilder = new StringBuilder();
-                    for (int i = 0; i < 5; i++)
+                    for (int i = 0; i < MaxSkillIconForIncomeDetailPanel; i++)
                     {
                         if (i < Manager.ExtraPersonSourceSpritesName.Count)
                         {
                             stringBuilder.Append($"<({Manager.ExtraPersonSourceSpritesName[i]})>");
                         }
+                        if (i < MaxSkillIconForIncomeDetailPanel - 1)
+                        {
+                            stringBuilder.Append(" ");
+                        }
                     }
                     string content1 = Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, stringBuilder.ToString());
-                    Bubble.Lab1.SetActive(true);
-                    Bubble.Lab1.text = content1;
-                    if (Manager.ExtraPersonSourceSpritesName.Count > 5)
+                    if (Manager.ExtraPersonSourceSpritesName.Count > MaxSkillIconForIncomeDetailPanel)
                     {
                         Bubble.LinkButton.GetComponent<Text>().text = Language.GetStr(LanguageLabel.UI__F_LinkButton);
                         Bubble.LinkButton.SetActive(true);
@@ -1720,7 +1734,10 @@ public class UIManager : Regist
                                 AlertPanel.Show(Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, ""), Manager.ExtraPersonSourceSpritesName);
                             }
                         );
+                        content1 += "\u3000\u3000\u3000\u3000";
                     }
+                    Bubble.Lab1.SetActive(true);
+                    Bubble.Lab1.text = content1;
                 }
                 content0 = content0.Replace(TransferLabel.Value, person);
                 Bubble.Lab.text = content0;
@@ -1759,17 +1776,19 @@ public class UIManager : Regist
                 if (Manager.ExtraCoinPersonSourceSpritesName.Count > 0)
                 {
                     StringBuilder stringBuilder = new StringBuilder();
-                    for (int i = 0; i < 5; i++)
+                    for (int i = 0; i < MaxSkillIconForIncomeDetailPanel; i++)
                     {
                         if (i < Manager.ExtraCoinPersonSourceSpritesName.Count)
                         {
                             stringBuilder.Append($"<({Manager.ExtraCoinPersonSourceSpritesName[i]})>");
                         }
+                        if (i < MaxSkillIconForIncomeDetailPanel - 1)
+                        {
+                            stringBuilder.Append(" ");
+                        }
                     }
                     string content1 = Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, stringBuilder.ToString());
-                    Bubble.Lab1.SetActive(true);
-                    Bubble.Lab1.text = content1;
-                    if (Manager.ExtraCoinPersonSourceSpritesName.Count > 5)
+                    if (Manager.ExtraCoinPersonSourceSpritesName.Count > MaxSkillIconForIncomeDetailPanel)
                     {
                         Bubble.LinkButton.GetComponent<Text>().text = Language.GetStr(LanguageLabel.UI__F_LinkButton);
                         Bubble.LinkButton.SetActive(true);
@@ -1782,7 +1801,10 @@ public class UIManager : Regist
                                 AlertPanel.Show(Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, ""), Manager.ExtraCoinPersonSourceSpritesName);
                             }
                         );
+                        content1 += "\u3000\u3000\u3000\u3000";
                     }
+                    Bubble.Lab1.SetActive(true);
+                    Bubble.Lab1.text = content1;
                 }
                 content0 = content0.Replace(TransferLabel.Value, coinPerson);
                 Bubble.Lab.text = content0;
@@ -3065,6 +3087,8 @@ public class UIManager : Regist
         //ManaLan.Add(ManaReso.Get<Text>("T_RandomLab"), new LanStr("UI", PrefabLabel.T_Random));
         LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.T_ConfirmLab), new MulLanStr(LanguageLabel.Common__Confirm));
 
+        ResourceManager.SetSprite(CanvasLabel.T_InputField, ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene));
+        
         ResourceManager.Get(CanvasLabel.T_NickName).CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(CanvasLabel.T_NickNameBK).CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -3122,6 +3146,18 @@ public class UIManager : Regist
         ResourceManager.Get<Image>(CanvasLabel.X_CreateChest).sprite = ResourceManager.LoadSprite("宝箱", Folder.Scene);
         ResourceManager.Get<ImagePlus>(CanvasLabel.X_CurrentInfoImagePlus).sprite = ResourceManager.LoadSprite("Expression", Folder.Scene);
 
+        ResourceManager.SetSprite(CanvasLabel.X_SendPublicMessage, ResourceManager.LoadSprite(ResourceLabel.Expression_SendPublicMessage, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_CryFace, ResourceManager.LoadSprite(ResourceLabel.Expression_CryFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_ChagrinFace, ResourceManager.LoadSprite(ResourceLabel.Expression_ChagrinFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_HappyFace, ResourceManager.LoadSprite(ResourceLabel.Expression_HappyFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_SurpriseFace, ResourceManager.LoadSprite(ResourceLabel.Expression_SurpriseFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_InputField, ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_HopeFace, ResourceManager.LoadSprite(ResourceLabel.Expression_HopeFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_SweatFace, ResourceManager.LoadSprite(ResourceLabel.Expression_SweatFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_OgleFace, ResourceManager.LoadSprite(ResourceLabel.Expression_OgleFace, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_Expression, ResourceManager.LoadSprite(ResourceLabel.Expression_Expression, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.X_BlueFace, ResourceManager.LoadSprite(ResourceLabel.Expression_BlueFace, Folder.Scene));
+
         #region X_CreateChest
 
         ResourceManager.SetButtonEvent
@@ -3334,6 +3370,10 @@ public class UIManager : Regist
         LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Ya_BtnLab), new MulLanStr(LanguageLabel.Common__Confirm));
 
 
+        ResourceManager.SetSprite(CanvasLabel.Y_InputField, ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene));
+        ResourceManager.SetSprite(CanvasLabel.Yb_InputField, ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene));
+
+
         ResourceManager.Get(CanvasLabel.Y_Tip).CreateTweenCG(0, 1, 0.5f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(CanvasLabel.Y_Chest).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -3482,6 +3522,8 @@ public class UIManager : Regist
         LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AAa_Tit), new MulLanStr(LanguageLabel.UI__AAa_Tit));
         LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AAb_Tit), new MulLanStr(LanguageLabel.UI__AAb_Tit));
 
+        ResourceManager.SetSprite(CanvasLabel.AA_InputField, ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene));
+
         ResourceManager.Get(CanvasLabel.AA_Tip).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(CanvasLabel.AA_CreatePlazaRoom).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 

Assets/Script/Manage/VisitManager.cs

@@ -197,6 +197,7 @@ public class VisitManager : Regist
         OnEnterVisteeGarden += () =>
         {
             ResourceManager.SetActive(CanvasLabel.C_OpenCloseRightSidePanelButtons, false);
+            ResourceManager.Get<Button>(CanvasLabel.C_OpenSidePanelButton).onClick.Invoke();
         };
 
         OnExitVisteeGarden += () =>

Assets/Script/Social/AddFriendPanel.cs

@@ -67,6 +67,8 @@ public class AddFriendPanel : Regist
         InputField = ResourceManager.Get<InputField>(CanvasLabel.AG_InputField);
         ChangeButtonTitle = ChangeButton.GetComponent<Text>();
 
+        InputField.image.sprite = ResourceManager.LoadSprite(ResourceLabel.Expression_InputField, Folder.Scene);
+
         AddFriendPanelMask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         LanguageManager.Add(Title, new MulLanStr(LanguageLabel.UI__AG_Title));

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

第五期.txt

@@ -1,5 +1,7 @@
 微信支付
 
+热更新要考虑到花朵配置 服装配置
+
 
 //关闭DebugMode 开启CatchException