瀏覽代碼

优化找花朵小游戏

liuqilin 7 年之前
父節點
當前提交
5d44cbe871

+ 25 - 0
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: 

+ 0 - 104
Assets/Resource/Logo.unity

@@ -409,110 +409,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1315531080
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -64959,7 +64959,7 @@ RectTransform:
   m_Children:
   - {fileID: 224295974207997376}
   m_Father: {fileID: 224229560457679016}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -68226,8 +68226,8 @@ RectTransform:
   m_Children:
   - {fileID: 224522843245776806}
   - {fileID: 224244550881901290}
-  - {fileID: 224052078245249732}
   - {fileID: 224509309068479312}
+  - {fileID: 224052078245249732}
   - {fileID: 224441247632943000}
   - {fileID: 224301720278101990}
   - {fileID: 224083969509934846}
@@ -73729,7 +73729,7 @@ RectTransform:
   - {fileID: 224659296306368858}
   - {fileID: 224750082116704262}
   m_Father: {fileID: 224229560457679016}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

+ 5 - 1
Assets/Script/Manage/HttpManager.cs

@@ -171,6 +171,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
+        //GetConfigBySerialNumber("1708014471457405866", data => Debug.Log(data.ToJson()));
         //台式机 1709207727231988804
         //笔记本 1710065808151506837
         //阔达的网络 1709110751808885702 
@@ -1022,7 +1023,10 @@ public class HttpManager : Regist
                             if (config == null)
                             {
                                 Debug.LogWarning("Did not get");
-                                UploadConfig();
+                                if (isConnect)
+                                {
+                                    UploadConfig();
+                                }
                             }
                             else
                             {

+ 1 - 1
Assets/Script/Manage/Manager.cs

@@ -1142,7 +1142,7 @@ public class Manager : Regist
         {
             return;
         }
-
+        DebugManager.Log(PlayerPrefManager.GetBool(PlayerPrefManager.INTERACT_CONFIG, false).ToString());
         HttpManager.GetBuyPackLimitFlag();
 
         if (HttpManager.IsConnect)

+ 25 - 12
Assets/Script/Manage/MiniGameManager.cs

@@ -2098,6 +2098,10 @@ public class MiniGameManager : Regist
         {
             flowers[i].FlowerIcon.TweenBacSr();
         }
+        if (FindMissingNewFlower != null)
+        {
+            FindMissingNewFlower.PlayNewFlowerEffec();
+        }
         List<Flower> buttonFlowers = new List<Flower>();
         buttonFlowers.Add(flowers[0]);
         for (int i = 1; i < flowers.Count; i++)
@@ -2150,9 +2154,17 @@ public class MiniGameManager : Regist
 
     public static void FindMissingGameRoundEnd()
     {
+        if (FindMissingNewFlower != null)
+        {
+            FindMissingNewFlower.StopNewFlowerEffec();
+        }
+        for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
+        {
+            MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
+        }
         DelayCall.Call
         (
-            1f, () =>
+            0.5f, () =>
             {
                 FindMissingGameRoundReset(false);
                 FindMissingGameRoundBegin();
@@ -2176,6 +2188,7 @@ public class MiniGameManager : Regist
         Flower flower;
         if (MinigameAward.HaveNewFlowerFlag)
         {
+            FindMissingNewFlower = null;
             List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
             for (int i = 0; i < flowerInfos.Count; i++)
             {
@@ -2201,7 +2214,6 @@ public class MiniGameManager : Regist
         {
             int specialSlotID = idList.Random(1, true, true)[0];
             FindMissingNewFlower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
-            FindMissingNewFlower.PlayNewFlowerEffec();
             MinigameIdleFlowerList.Add(FindMissingNewFlower);
             List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
             for (int i = 0; i < flowerInfos.Count; i++)
@@ -2234,6 +2246,10 @@ public class MiniGameManager : Regist
 
     public static void FindMissingGameRoundBegin()
     {
+        if (FindMissingNewFlower != null)
+        {
+            FindMissingNewFlower.PlayNewFlowerEffec();
+        }
         FindMissingGameFadeTimer = FindMissingGameCurrentFadeTime;
         for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
         {
@@ -2248,6 +2264,11 @@ public class MiniGameManager : Regist
             MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
         }
 
+        if (FindMissingNewFlower != null)
+        {
+            FindMissingNewFlower.StopNewFlowerEffec();
+        }
+
         DelayCall.Call
         (
             FindMissingGameFlowerDisappearTime,
@@ -2272,6 +2293,7 @@ public class MiniGameManager : Regist
         Score += FindSoloCorrectScore;
 
         FindMissingCorrectFlower.PlayFlashLight();
+        FindMissingCorrectFlower.FlowerIcon.TweenBacSr();
 
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -2279,16 +2301,7 @@ public class MiniGameManager : Regist
         {
             D_FindMissingGameBtns[i].TweenBacCG();
         }
-        if (FindMissingNewFlower != null)
-        {
-            FindMissingNewFlower.StopNewFlowerEffec();
-            FindMissingNewFlower = null;
-        }
-        for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
-        {
-            MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
-        }
-        FindMissingGameRoundEnd();
+        DelayCall.Call(0.5f, FindMissingGameRoundEnd);
     }
 
     public static void OnFindMissingGameWrongButtonClick(Button button, Image icon)

+ 6 - 1
Assets/Script/Manage/NickNameManager.cs

@@ -148,6 +148,7 @@ public class NickNameManager : Regist
         NicknameInputField.text = NicknameInputField.text.Trim();
 
         int charCnt = 0;
+        int maxLengthIndex = 0;
 
         for (int i = 0; i < NicknameInputField.text.Length; i++)
         {
@@ -159,6 +160,10 @@ public class NickNameManager : Regist
             {
                 charCnt += 2;
             }
+            if (charCnt > MaxNicknameLength)
+            {
+                maxLengthIndex = i;
+            }
         }
 
         if (charCnt == 0)
@@ -169,7 +174,7 @@ public class NickNameManager : Regist
         else if (charCnt > MaxNicknameLength)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__T_TooLong));
-            NicknameInputField.text = NicknameInputField.text.Substring(0, 12);
+            NicknameInputField.text = NicknameInputField.text.Substring(0, maxLengthIndex);
             return false;
         }
         else

+ 19 - 2
Assets/Script/Tool/Auxiliary.cs

@@ -157,9 +157,26 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.A))
         {
+            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);
+            //TutorialManager.findMissingMinigameTutorial = true;
+            //DebugManager.ResetGardenLevel(30);
             //Manager.Diamond = 1000;
             //PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
             //FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");

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