Browse Source

增加重玩版本

LiuQilin 7 years ago
parent
commit
72b9585482

+ 4 - 3
Assets/Resource/Logo.unity

@@ -445,9 +445,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

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -7055,7 +7055,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.654902, b: 0.15294118, a: 1}
+  m_Color: {r: 0.64705884, g: 0.7529412, b: 0.78431374, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:

+ 1 - 1
Assets/Resource/XML/Config/plaza_room_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" create_cost_fml="h*50+p*5" cost_value_fml="c*0.8" />
+  <item id="1" create_cost_fml="h*50+p*10" cost_value_fml="c*0.8" />
   <comment>
     <id>
 id

+ 3 - 2
Assets/Resource/XML/PlayerConfig.xml

@@ -1,6 +1,7 @@
 <PlayerConfig>
-  <Version value="10" />
-
+  <Version value="11" />
+  <ReplayVersion value="0" />
+  
   <ID value="Default" />
   <SerialNumber value="Default" />
   

BIN
Assets/Resource/Xlsx/plaza_room_config.xlsx


+ 1 - 0
Assets/Script/Manage/ManaCenter.cs

@@ -714,6 +714,7 @@ public class ManaCenter : Regist
 
     public override void RegistValueA()
     {
+        //Debug.LogWarning(ManaData.GetPlayerInt("ReplayVersion"));
         ManaReso.Get<Graphic>("F_Elf").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Store").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Magic").material = ManaReso.Load<Material>("GrayMat", Folder.UI);

+ 29 - 3
Assets/Script/Manage/ManaData.cs

@@ -90,8 +90,15 @@ public class ManaData : Regist
                     else
                     {
                         nativeVersion = int.Parse(node.Attributes[0].Value);
-                        
-                        if (nativeVersion < defaultVersion)
+
+                        if (nativeVersion == -1000)
+                        {
+                            PlayerDoc_ = DefaultDoc;
+                            int currentReplayVersion = int.Parse(nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ReplayVersion").Attributes[0].Value);
+                            SavePlayerInt("ReplayVersion", currentReplayVersion+1);
+                            //Debug.Log(currentReplayVersion);
+                        }
+                        else if (nativeVersion < defaultVersion)
                         {
                             byte[] bytes;
 
@@ -588,7 +595,7 @@ public class ManaData : Regist
 
     public static void ResetPlayerConfig()
     {
-        PlayerNode.SelectSingleNode("Version").Attributes[0].Value = "10000";
+        PlayerNode.SelectSingleNode("Version").Attributes[0].Value = "-1000";
 
         SavePlayerConfig();
 
@@ -1133,6 +1140,9 @@ public class ManaData : Regist
     }
 
 
+    //玩家存档版本大于默认存档版本时需要清空
+    //玩家存档版本小于默认存档版本时需要合并
+    //玩家存档版本等于-1000时需要标记为重玩
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         if (nativeVersion < 0)
@@ -1212,6 +1222,13 @@ public class ManaData : Regist
             To10(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 11)
+        {
+            Debug.LogWarning("UpdateArchive to 11");
+
+            To11(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1426,4 +1443,13 @@ public class ManaData : Regist
         ChestMge.ClearRefundAndOperateData(nativeDoc.SelectSingleNode("PlayerConfig"));
         return nativeDoc;
     }
+
+    public static XmlDocument To11(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        XmlNode xmlNode = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ReplayVersion");
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode, true));
+
+        return nativeDoc;
+    }
 }

+ 4 - 4
Assets/Script/Manage/ManaSign.cs

@@ -691,10 +691,10 @@ public class ManaSign : Regist
             return true;
         }
 
-        if (ShowNotification())
-        {
-            return true;
-        }
+        //if (ShowNotification())
+        //{
+        //    return true;
+        //}
 
         if (ManaNickName.ShowNickNameSettingPanelFirstTime())
         {

+ 1 - 0
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -337,6 +337,7 @@ public class SFSPlazaRoomManager
                 ManaReso.Get("B_SignIn0").TweenForCG();
                 ManaReso.Get("T_NickName").TweenForCG();
 
+                ManaReso.Get<Text>("X_CurrentInfoLab").text = "";
                 Transform tra = ManaReso.Get("X_Info");
                 while (tra.childCount > 0)
                 {

+ 1 - 9
第三期.txt

@@ -10,12 +10,4 @@
 
 //更新版本号
 
-IOS设置Team
-
-
-内存优化(释放掉loading界面 教程中的选任务边框)
-
-Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)
-
-
-小任务-资源导入器(花园导入Dragonbones后自动进行后续处理)
+IOS设置Team