修改一些细节

Assets/Resource/Logo.unity

@@ -155,6 +155,106 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &857854188
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1749663445}
+    m_Modifications:
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,6 +518,115 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1749663444
+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: 3
+      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_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &1749663445 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 1749663444}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,9 +654,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  CatchException: 0
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -260,6 +260,8 @@ MonoBehaviour:
   - {fileID: 21300276, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
   - {fileID: 21300284, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
   - {fileID: 21300278, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}
+  - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}
@@ -285,7 +287,5 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 37311be8685a98c4a850ea2c4ecd7bb4, type: 3}
   - {fileID: 4900000, guid: 8d5d74d2d26a2be46a1f875c6130a57f, type: 3}
   - {fileID: 4900000, guid: b9413a82e8f919e46b0c37372b491307, type: 3}
-  DiscardList:
-  - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
-  - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}
+  DiscardList: []
   PlazaRoomList: []

Assets/Resource/Prefab/Object/DressRoom.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1499663011
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: discard
+  assetBundleName: scene
   assetBundleVariant: 

Assets/Resource/Prefab/Object/Garden.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486890531
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: discard
+  assetBundleName: scene
   assetBundleVariant: 

Assets/Script/Manage/Initializer.cs

@@ -305,9 +305,6 @@ public class Initializer : MonoBehaviour
         DebugLab.text = "Error code : 13";
         ManaSocial.InitializeRankPanel();
 
-        DebugLab.text = "Error code : 14";
-        ManaReso.Release();
-
         if (Instance.DebugMode)
         {
             ActivateGame();

Assets/Script/Manage/ManaGarden.cs

@@ -266,7 +266,7 @@ public class ManaGarden : Regist
 
     public override void Instantiate()
     {
-        ManaReso.Get("Garden", Folder.Discard, true, transform, true, ObjType.Garden).AddScript<Garden>();
+        ManaReso.Get("Garden", Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
         
         CreatePage();
         CreatePage();

Assets/Script/Manage/ManaPlayer.cs

@@ -105,7 +105,7 @@ public class ManaPlayer : Regist
 
 
         Initializer.DebugLab.text = "error : mp3";
-        DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
+        DressRoom = ManaReso.Get("DressRoom", Folder.Scene, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
         DontDestroyOnLoad(DressRoom);
 

Assets/Script/Manage/ManaReso.cs

@@ -222,7 +222,7 @@ public class ManaReso : Regist
 
     public static void Release()
     {
-        //Bundle.Discard.Unload(false);
+        Bundle.Discard.Unload(false);
     }
 
 

Assets/Script/Manage/ManaServer.cs

@@ -122,6 +122,13 @@ public class ManaServer : Regist
 
     public void Awake()
     {
+        //URLRequestData urlData = new URLRequestData();
+
+        //urlData.Add("u", "1710065808151506837");
+        //urlData.Add("t", "1710066204207012789");
+
+        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/praise/target", urlData, Debug.Log, URLRequest.Method.POST);
+
         //"1710065808151506837" "a54unp"
 
         //URLRequestData urlData = new URLRequestData();

Assets/Script/Manage/ManaUI.cs

@@ -3319,13 +3319,7 @@ public class ManaUI : Regist
 
         if (!ManaTutorial.TutorialA)
         {
-            HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
-
-            hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
-
-			hudTarget = ManaReso.Get("C_Tip").AddComponent<HudTarget>();
-
-			hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
+            SetEnterGameLabel();
         }
 
         ManaReso.Get("C_Group").GetTweenCG().InOrigin = true;
@@ -3337,13 +3331,19 @@ public class ManaUI : Regist
 
     public override void TutorialToRegular()
     {
+        SetEnterGameLabel();
+    }
+
+
+    public static void SetEnterGameLabel()
+    {
         HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
 
         hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
 
-		hudTarget = ManaReso.Get("C_Tip").AddComponent<HudTarget>();
+        hudTarget = ManaReso.Get("C_Tip").AddComponent<HudTarget>();
 
-		hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
+        hudTarget.PosTra = ManaPlayer.Player.ChildDic["EnterGameTra"];
     }
 
 

Assets/Script/Manage/ManaVisit.cs

@@ -299,6 +299,7 @@ public class ManaVisit : Regist
         ManaReso.TraDic.Remove("Player");
 
         ManaPlayer.Instance.GetPlayer();
+        ManaUI.SetEnterGameLabel();
 
         Garden.PlayerPos = new List<Vector3>();
 

Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -342,6 +342,15 @@ public class SFSPlazaRoomManager
                 UserInstanceDictionary = new Dictionary<int, PlazaRoomPlayer>();
             }
         );
+
+        tweenRoot.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                PlazaRoomMge.OpenPanel();
+            }
+        );
     }
 
     public void QuitPlazaRoom()

Assets/Script/Tool/Auxiliary.cs

@@ -142,9 +142,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            ChestMge.ClearRefundAndOperateData(ManaData.PlayerNode);
-            ChestMge.RefundRoomIDs = new List<int>();
-            ChestMge.OperateDataDictionary = new Dictionary<long, ChestOperateData>();
+            Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
             //foreach (var VARIABLE in ChestMge.PlazaRoomChests)
             //{
             //    VARIABLE.ShadowSR.material = UnityFactory.Materials[0];

Assets/Script/Tool/Bundle.cs

@@ -386,8 +386,8 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad("Flower", 9, Folder.Scene, ObjType.Flower);
 
             ManaReso.AddAsyncLoad("Page", 2, Folder.Scene, ObjType.Page);
-            ManaReso.AddAsyncLoad("Garden", 1, Folder.Discard, ObjType.Garden);
-            ManaReso.AddAsyncLoad("DressRoom", 1, Folder.Discard, ObjType.DressRoom);
+            ManaReso.AddAsyncLoad("Garden", 1, Folder.Scene, ObjType.Garden);
+            ManaReso.AddAsyncLoad("DressRoom", 1, Folder.Scene, ObjType.DressRoom);
         }
 
         yield return LoadAudio();

ProjectSettings/ProjectSettings.asset

@@ -122,7 +122,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.1.10
+  bundleVersion: 1.2.0
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1

第三期.txt

@@ -1,6 +1,3 @@
-宝箱 宝箱Timer深度细调(利用shader控制深度)
-
-
 关闭ManaDebug 开启CatchException
 
 切换到远程服务器
@@ -16,19 +13,9 @@
 IOS设置Team
 
 
-缺排行榜按钮 公告按钮
-
-Dragonbones 使用tight
-
 内存优化(释放掉loading界面 教程中的选任务边框)
 
 Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)
 
-图片尺寸优化(自动调整尺寸-包括DragonBones)
-
-
-AtlasUtility SpriteUtility 中的UseSelectedPath UseSelectedName改为AutoPath AutoName
-检查文件夹路径和文件名是否合法应该提取出来
-
 
 小任务-资源导入器(花园导入Dragonbones后自动进行后续处理)