修复小熊界面字体过小Bug

Assets/HotUpdate/Android.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 9d06c4ce1b052f748a55d54ee897edc8
+guid: 406218a5d0be1aa4ab4a955579ee9174
 folderAsset: yes
-timeCreated: 1516931711
+timeCreated: 1517110419
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/HotUpdate/IOS.meta

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

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

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

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -6881,7 +6881,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224872852296835126}
   - component: {fileID: 222676064432700284}
-  - component: {fileID: 114766117895674090}
+  - component: {fileID: 114809424989483452}
   m_Layer: 5
   m_Name: K_Lab
   m_TagString: Untagged
@@ -7131,6 +7131,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1389131358915916
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224800375159776288}
+  - component: {fileID: 222104387534678510}
+  - component: {fileID: 114766117895674090}
+  m_Layer: 5
+  m_Name: K_Lab2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1390427693799442
 GameObject:
   m_ObjectHideFlags: 1
@@ -9582,7 +9599,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1521274425437900
 GameObject:
   m_ObjectHideFlags: 1
@@ -15078,7 +15095,7 @@ GameObject:
   - component: {fileID: 222780651229517556}
   - component: {fileID: 114882972988494494}
   m_Layer: 0
-  m_Name: K_ImagePlus
+  m_Name: K_ImagePlus2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -16041,7 +16058,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1887168982244380
 GameObject:
   m_ObjectHideFlags: 1
@@ -47522,7 +47539,7 @@ MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1378070778157544}
+  m_GameObject: {fileID: 1389131358915916}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
@@ -49195,6 +49212,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: _
+--- !u!114 &114809424989483452
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378070778157544}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 21
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114810431899310808
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -59982,6 +60032,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1109195639167772}
+--- !u!222 &222104387534678510
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1389131358915916}
 --- !u!222 &222104888584602070
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -72959,7 +73015,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 1.9728832e-32, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -74202,7 +74258,7 @@ RectTransform:
   m_Children:
   - {fileID: 224030841416356944}
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -74542,7 +74598,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224872852296835126}
+  m_Father: {fileID: 224800375159776288}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -76559,7 +76615,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -40.931667}
+  m_AnchoredPosition: {x: 50, y: -40.5}
   m_SizeDelta: {x: 80.563, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224593876219169764
@@ -80601,6 +80657,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224800375159776288
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1389131358915916}
+  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: 224503840076283096}
+  m_Father: {fileID: 224986266947929816}
+  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: 50, y: -231}
+  m_SizeDelta: {x: 384, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224801280922468344
 RectTransform:
   m_ObjectHideFlags: 1
@@ -80912,11 +80987,11 @@ RectTransform:
   m_Children:
   - {fileID: 224008124608359800}
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -143.15833}
+  m_AnchoredPosition: {x: 50, y: -271}
   m_SizeDelta: {x: 384, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224817432261611738
@@ -82039,16 +82114,15 @@ RectTransform:
   m_GameObject: {fileID: 1378070778157544}
   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: 224503840076283096}
+  m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+  m_Children: []
   m_Father: {fileID: 224986266947929816}
   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: 50, y: -102.295}
-  m_SizeDelta: {x: 384, y: 40}
+  m_AnchoredPosition: {x: 50, y: -81.795}
+  m_SizeDelta: {x: 384, y: 148}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224873532853391380
 RectTransform:
@@ -84340,6 +84414,7 @@ RectTransform:
   m_Children:
   - {fileID: 224593503811426000}
   - {fileID: 224872852296835126}
+  - {fileID: 224800375159776288}
   - {fileID: 224815988563629826}
   - {fileID: 224439401636557830}
   - {fileID: 224490149669999908}

Assets/Script/Editor/EditorBundle.cs

@@ -201,7 +201,7 @@ public class EditorBundle : Editor
         }
         else if (buildTarget == BuildTarget.iOS)
         {
-            hotUpdateFolder = Application.dataPath + "/HotUpdate/Windows";
+            hotUpdateFolder = Application.dataPath + "/HotUpdate/IOS";
         }
         if (!string.IsNullOrEmpty(hotUpdateFolder))
         {

Assets/Script/Label/CanvasLabel.cs

@@ -1027,7 +1027,8 @@ public class CanvasLabel
     public static string K_VGroup = "K_VGroup";
     public static string K_Icon = "K_Icon";
     public static string K_Lab = "K_Lab";
-    public static string K_ImagePlus = "K_ImagePlus";
+    public static string K_Lab2 = "K_Lab2";
+    public static string K_ImagePlus2 = "K_ImagePlus2";
     public static string K_Lab1 = "K_Lab1";
     public static string K_ImagePlus1 = "K_ImagePlus1";
     public static string K_LinkButton = "K_LinkButton";
@@ -1049,6 +1050,7 @@ public class CanvasLabel
     public static string AI_CancelLab = "AI_CancelLab";
     public static string A_HudParent = "A_HudParent";
     public static string U_LoadingPanel = "U_LoadingPanel";
+    public static string U_Parent = "U_Parent";
     public static string U_DebugLab = "U_DebugLab";
     public static string U_VGroup = "U_VGroup";
     public static string U_WarningTitle = "U_WarningTitle";

Assets/Script/Manage/GardenManager.cs

@@ -356,7 +356,6 @@ public class GardenManager : Regist
             {
                 TotalNormalFlower++;
             }
-
             FlowerInfoDictionary.Add(flowerInfo.ID, flowerInfo);
         }
 

Assets/Script/Manage/HttpManager.cs

@@ -171,7 +171,26 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //GetConfigBySerialNumber("1801104863982007122", data => Debug.Log(data.ToJson()));
+        //GetConfigByID
+        //(
+        //    "rr1WP4",
+        //    data =>
+        //    {
+        //        //XmlDocument document = new XmlDocument();
+        //        string str = data["l"].ToString().Replace("HOCen5", "rr1WP4");
+        //        Debug.Log(str);
+
+        //        //document.LoadXml(data["l"].ToString());
+        //        //Debug.Log(document);
+
+        //        URLRequestData urlData = new URLRequestData();
+        //        urlData.Add("u", "1712103823186989213");
+        //        urlData.Add("v", 1);
+        //        urlData.Add("l", str);
+        //        URLRequest.CreateStrURLRequest(false, SaveURL, urlData, d => { Debug.Log(d); }, URLRequest.Method.POST);
+        //    }
+        //);
+
         //台式机 1709207727231988804
         //笔记本 1710065808151506837
         //阔达的网络 1709110751808885702 

Assets/Script/Manage/Initializer.cs

@@ -294,6 +294,13 @@ public class Initializer : MonoBehaviour
         DebugText.text = "Error code : 1-10-1";
 
         Bundle.LoadAtlasSprites();
+
+        DebugText.text = "Error code : 7";
+        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
+        attributeList.RemoveAt(0);
+        attributeList.AddRange(Bundle.NewDressroomConfigs);
+        PlayerManager.CreateCloseItems(attributeList);
+
         DebugText.text = "Error code : 1-11";
         //Bundle.LoadAllDressBundleAssetsIntoDragonbone();
         DebugText.text = "Error code : 1-11-1";
@@ -354,13 +361,6 @@ public class Initializer : MonoBehaviour
             ResourceManager.Get(CanvasLabel.C_Notify).TweenForCG();
         }
 
-        DebugText.text = "Error code : 7";
-
-        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
-        attributeList.RemoveAt(0);
-        attributeList.AddRange(Bundle.NewDressroomConfigs);
-        PlayerManager.CreateCloseItems(attributeList);
-
         DebugText.text = "Error code : 7-1";
         PlayerManager.InitDressRoom();
 

Assets/Script/Manage/Manager.cs

@@ -1410,7 +1410,8 @@ public class Manager : Regist
 
             HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
             HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
-
+            Debug.Log(HttpManager.ID);
+            Debug.Log(HttpManager.SerialNumber);
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__La_Lab0), null, null, () => { Application.Quit(); }, null, false);
 
 

Assets/Script/Manage/PlayerManager.cs

@@ -160,7 +160,9 @@ public class PlayerManager : Regist
             string armatureName = DressData[i];
             if (!CloseItemDictionary.Values.ToList().MyContains(item => item.ArmatureName == armatureName))
             {
+                Debug.Log(armatureName);
                 DressData = ConfigManager.GetDefaultDressDatas();
+                break;
             }
         }
         BuildPlayer(DressData);

Assets/Script/Manage/UIManager.cs

@@ -1697,7 +1697,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_PersonBtn0), "missing topic", null, ResourceManager.LoadSprite("4大技能1", Folder.UI));
+                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_PersonBtn0), null, null, ResourceManager.LoadSprite("4大技能1", Folder.UI));
                 string content0 = Language.GetStr(LanguageLabel.UI__F_PersonBtn1);
                 string person = "";
                 Ability gardenAbility = Manager.SkillDictionary["Ability1"] as Ability;
@@ -1740,7 +1740,8 @@ public class UIManager : Regist
                     Bubble.Lab1.text = content1;
                 }
                 content0 = content0.Replace(TransferLabel.Value, person);
-                Bubble.Lab.text = content0;
+                Bubble.Lab2.text = content0;
+                Bubble.Lab2.SetActive(true);
             }
         );
 
@@ -1764,7 +1765,7 @@ public class UIManager : Regist
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
 
-                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn0), "missing topic", null, ResourceManager.LoadSprite("绿-免费金币", Folder.UI));
+                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn0), null, null, ResourceManager.LoadSprite("绿-免费金币", Folder.UI));
                 string content0 = Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn1);
                 string coinPerson = "";
                 Ability gardenAbility = Manager.SkillDictionary["Ability1"] as Ability;
@@ -1807,7 +1808,8 @@ public class UIManager : Regist
                     Bubble.Lab1.text = content1;
                 }
                 content0 = content0.Replace(TransferLabel.Value, coinPerson);
-                Bubble.Lab.text = content0;
+                Bubble.Lab2.text = content0;
+                Bubble.Lab2.SetActive(true);
             }
         );
 

Assets/Script/Object/Player.cs

@@ -516,6 +516,9 @@ public class CloseItem
                 SaveDressData();
 
                 buySucceedCallback.SafeInvoke();
+
+                ConfigManager.SaveConfigDocument();
+                ConfigManager.SaveConfigDocumentToDisk();
             },
             StaticsManager.ItemID.解锁服装,
             StaticsManager.ConsumeModule.Shop,
@@ -534,8 +537,6 @@ public class CloseItem
         Unlock();
         AudioManager.PlayClip(AudioLabel.GetCurrent);
         PlayerManager.BoughtCloseIDs.UniqueAdd(ID);
-        ConfigManager.SaveConfigDocument();
-        ConfigManager.SaveConfigDocumentToDisk();
     }
 
     public void NavigateToChargeFromDressroom()

Assets/Script/Tool/Bundle.cs

@@ -968,7 +968,7 @@ public class Bundle : MonoBehaviour
             }
         }
 
-        NewDressroomConfigs = ConfigManager.GetDressRoomConfig(Instance.NewFlowerConfigList[0] as TextAsset);
+        NewFlowerConfigs = ConfigManager.GetDressRoomConfig(Instance.NewFlowerConfigList[0] as TextAsset);
 
         foreach (var obj in Instance.NewFlowerSpriteList)
         {

Assets/Script/Tool/UI/Bubble.cs

@@ -11,6 +11,7 @@ public class Bubble : Regist
     public static Text Tit;
     public static Text Lab;
     public static Text Lab1;
+    public static Text Lab2;
     public static Text NotifyLab;
     public static Image Icon;
     public static Button Cancel;
@@ -34,6 +35,7 @@ public class Bubble : Regist
         Tit = ResourceManager.Get<Text>(CanvasLabel.K_Tit);
         Lab = ResourceManager.Get<Text>(CanvasLabel.K_Lab);
         Lab1 = ResourceManager.Get<Text>(CanvasLabel.K_Lab1);
+        Lab2 = ResourceManager.Get<Text>(CanvasLabel.K_Lab2);
         NotifyLab = ResourceManager.Get<Text>(CanvasLabel.K_NotifyLab);
         Icon = ResourceManager.Get<Image>(CanvasLabel.K_Icon);
 
@@ -57,6 +59,7 @@ public class Bubble : Regist
     public static void Show(string tit = null, string lab = null, string notifyLab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
     {
         Lab1.SetActive(false);
+        Lab2.SetActive(false);
         LinkButton.SetActive(false);
 
         AudioManager.PlayClip(AudioLabel.Bubble);

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.6
+  bundleVersion: 1.2.7
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 18
+  AndroidBundleVersionCode: 19
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 12
+  iPhoneBuildNumber: 13
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

ProjectSettings/UnityConnectSettings.asset

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

第五期.txt

@@ -1,5 +1,9 @@
 ΢ÐÅÖ§¸¶
 
+rr1WP4
+
+alq5sc
+
 
 //¹Ø±ÕDebugMode ¿ªÆôCatchException