cdk

2023-09-10 20:52:26 +08:00 · 2023-09-10 20:52:26 +08:00 · 4dd143bb34
parent ea4a0326c5
commit 4dd143bb34
21 changed files with 120 additions and 94 deletions
--- a/Server/Hotfix/Game/System/Other/CDKComponentSystem.cs
+++ b/Server/Hotfix/Game/System/Other/CDKComponentSystem.cs
@ -36,40 +36,62 @@ static class CDKComponentSystem

    private static async ETVoid LoadAsync(this CDKComponent self)
    {
+        self.allCdkList.Clear();
+        self.gotCdkList.Clear();
+        var cdkConfigs = DataTableHelper.GetAll<CdkConfig>().ToArray();
+        
+        
+        int? version =cdkConfigs.Length>0? cdkConfigs[0].Version:null;
        using CDKComponent cdkInDatabase = await UnitHelper.Query<CDKComponent>(self.DomainZone(), 0);
-        Dictionary<string, long> toAddDictionary = null;
-        HashSet<string> gotList = null;
        if (cdkInDatabase != null)
        {
-            toAddDictionary = cdkInDatabase.nameList;
-            gotList = cdkInDatabase.gotList;
-        }
+            self.allCdkList = cdkInDatabase.allCdkList;
+            self.gotCdkList = cdkInDatabase.gotCdkList;

-        var cdkConfigs = DataTableHelper.GetAll<CdkConfig>().ToArray();
-        self.nameList.Clear();
-        if (toAddDictionary != null)
+            if (version != null && version.Value != cdkInDatabase.version)
+            {
+                foreach (CdkConfig cdkConfig in cdkConfigs)
+                {
+                    if (cdkInDatabase.gotCdkList.Contains(cdkConfig.Cdk))
+                    {
+                        Log.Error($"config's cdk is already in set where id is {cdkConfig.Id}");
+                        return;
+                    }
+
+                    var cdkRewards = new List<CDKReward>();
+                    foreach (CdkConfig.Reward reward in cdkConfig.RewardArr)
+                    {
+                        cdkRewards.Add(new CDKReward(reward));
+                    }
+                    bool add = self.allCdkList.TryAdd(cdkConfig.Cdk, cdkRewards.ToArray());
+                    if (!add)
+                    {
+                        Log.Error($"config's cdk is already in set where id is {cdkConfig.Id}");
+                        return;
+                    }
+                }
+            }
+        }
+        else
        {
-            foreach (var keyValuePair in toAddDictionary)
+            foreach (CdkConfig cdkConfig in cdkConfigs)
            {
-                self.nameList.Add(keyValuePair.Key, keyValuePair.Value);
-            }
-        }
-
-        foreach (CdkConfig cdkConfig in cdkConfigs)
-        {
-            if ( gotList!=null && gotList.Contains(cdkConfig.Cdk))
-            {
-                continue;
-            }
-            bool add = self.nameList.TryAdd(cdkConfig.Cdk, cdkConfig.Id);
-            if (!add)
-            {
-                Log.Error($"config's cdk is already in set where id is {cdkConfig.Id}");
-                self.nameList.Clear();
-                return;
+                var cdkRewards = new List<CDKReward>();
+                foreach (CdkConfig.Reward reward in cdkConfig.RewardArr)
+                {
+                    cdkRewards.Add(new CDKReward(reward));
+                }
+                bool add = self.allCdkList.TryAdd(cdkConfig.Cdk, cdkRewards.ToArray());
+                if (!add)
+                {
+                    Log.Error($"config's cdk is already in set where id is {cdkConfig.Id}");
+                    return;
+                }
            }
+
        }

+        self.version = version ?? 0;
        self.Save();
    }

@ -85,22 +107,15 @@ static class CDKComponentSystem
            return "cdk 为空";
        }

-        if (!self.nameList.TryGetValue(cdk, out var id))
+        if (!self.allCdkList.TryGetValue(cdk, out var rewards))
        {
            return "cdk 无效";
        }
-
-        CdkConfig cdkConfig = DataTableHelper.Get<CdkConfig>(id);
-        if (cdkConfig == null)
-        {
-            return "cdk 系统错误";
-        }
-
        try
        {
-            foreach (CdkConfig.Reward reward in cdkConfig.RewardArr)
+            foreach (CDKReward reward in rewards)
            {
-                await MailHelper.AddItem(unit.Id, reward._Id, reward.Count, true, getSource: "CDK获取", "GM邮件", "CDK获取的物品。", "CDK");
+                await MailHelper.AddItem(unit.Id, reward.ItemId, reward.Count, true, getSource: "CDK获取", "CDK", "CDK获取的物品。", "CDK");
            }
        }
        catch (Exception e)
@ -109,8 +124,8 @@ static class CDKComponentSystem
            return "cdk 获取物品错误";
        }

-        self.nameList.Remove(cdk);
-        self.gotList.Add(cdk);
+        self.allCdkList.Remove(cdk);
+        self.gotCdkList.Add(cdk);
        self.Save();
        return "获取物品成功";
    }
--- a/Server/Model/Game/Entity/User/CDKComponent.cs
+++ b/Server/Model/Game/Entity/User/CDKComponent.cs
@ -1,14 +1,25 @@
 using System.Collections.Generic;
+using Cal.DataTable;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;

 namespace ET;

+public class CDKReward(int id, int count)
+{
+    public int ItemId { get; set; } = id;
+    public int Count { get; set; } = count;
+
+    public CDKReward(CdkConfig.Reward reward):this(reward._Id,reward.Count)
+    {
+        
+    }
+}
 public class CDKComponent:Entity
 {
    public int version;
    [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-    public Dictionary<string,long> nameList = new();
+    public Dictionary<string,CDKReward[]> allCdkList = new();

-    public HashSet<string> gotList = new();
+    public HashSet<string> gotCdkList = new();
 }
--- a/Tools/ExcelTool/Excel/CdkConfig.xlsx
+++ b/Tools/ExcelTool/Excel/CdkConfig.xlsx
--- a/Tools/ExcelTool/Excel/EquipBase.xlsx
+++ b/Tools/ExcelTool/Excel/EquipBase.xlsx
--- a/Tools/ExcelTool/Excel/SonSet.xlsx
+++ b/Tools/ExcelTool/Excel/SonSet.xlsx
--- a/Tools/ExcelTool/Excel/TaskBase.xlsx
+++ b/Tools/ExcelTool/Excel/TaskBase.xlsx
--- a/Tools/ExcelTool/Excel/md5.txt
+++ b/Tools/ExcelTool/Excel/md5.txt
@ -1 +1 @@
-{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "902b5cd733d84a68f2302d378c6e20c3", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "da9f0549ef0065abd3855a641e656ce5", "EquipBase.xlsx" : "f4f487282643c88891c7e3b707210358", "EquipForge.xlsx" : "07f95c17dbb4f730dc8f58fc3271f49a", "FamilyBossConfig.xlsx" : "d352193ce71553185693460104c5945f", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "0cad5c0a7d89c07ebd5d408962d3896d", "ItemUpgrade.xlsx" : "64be93aaa1949954a6f92221accd8e9d", "MainStory.xlsx" : "b95ed8b061996738dea12eb10e86e9e8", "MarketBase.xlsx" : "88c2848b8ccfb7668f0daa813fd5c83e", "MaterialBase.xlsx" : "9fa60128363f4c7a16f56cf91b5b5265", "MonsterBase.xlsx" : "e9e99b21ad30d81f57015f31f931f418", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "b0c4bf13454e0dbb32e6feceeca5c8dc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "abba4baee0ac2e7ef1716e1aabc80714", "SkillConfig.xlsx" : "2e444b8c038494fbf2b53035598161ab", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "aae232a5a6fab28a0316ba4b12baf95c", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "a1ac8c0cb7a7660deeffca392f3d2723", "Sys_Scene.xlsx" : "e4fd86aa97c4d1e820581395947dc337", "TaskBase.xlsx" : "ef167475afa77bf11b9635d4aa6420f8", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "6e62dc6824fd7df463ceeb8a5a576b92", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "6a6487aab46ca0fdcb977d1badc9481f", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "f9a1fbf212490b3d230a4b3b201fccb1", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "d7998ca3073a40e87a3268b3df27261e", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "666d467e6ec392432b32a739fea8e64c", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "e9b8f9e4a52fa446fc7e5b63ad8d2aec", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "45c7411492e8501beeaedb8df0601908", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "094c6284e0e19757498ad2bdce3648a6", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "48398b4ca3926a465515eaf047dca937", "PetConfig.xlsx" : "99345c8836027cb36e42764b78cdd798", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "843c0c8009ee0d3615496b9226b2ee3b", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "ccce19f15dcbc9cbc37aa18009218b04", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "a0c3da23ad62817ab5340b7dc041b777", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "90a3cc2fd11e85ab41cefe884c80e7de", "WorldBossConfig.xlsx" : "7fd89d1cef779c5e1b77219492342f6d", "SignInRewardConfig.xlsx" : "764fd0701bc476594a6333f0b5159c8a", "SignInRewardMonth.xlsx" : "b5a731d9c61a176517d051a1d98e0a87", "MaintainRewardConfig.xlsx" : "be43f0bef4ab224efc978a5c45e20e19", "DeahtCopyConfig.xlsx" : "37c1d4e56559f10a9cb8210fd0242092", "JourneyOfDeathCopyConfig.xlsx" : "0a7961ba1b30e3ff9c96793bd40c0517", "ServerItemLimit.xlsx" : "9e63ab0ecbf6ad20cee94e9351dc99e1", "StrengthPlusConfig.xlsx" : "ad43d8985980dc7f1fa7e32b2c78e44a", "CdkConfig.xlsx" : "2e5bec3c673abeb388a8b74b09a7f0ee" } }
+{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "902b5cd733d84a68f2302d378c6e20c3", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "da9f0549ef0065abd3855a641e656ce5", "EquipBase.xlsx" : "ae8c03e3a200bde0cd4f0f7833857222", "EquipForge.xlsx" : "07f95c17dbb4f730dc8f58fc3271f49a", "FamilyBossConfig.xlsx" : "d352193ce71553185693460104c5945f", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "0cad5c0a7d89c07ebd5d408962d3896d", "ItemUpgrade.xlsx" : "64be93aaa1949954a6f92221accd8e9d", "MainStory.xlsx" : "b95ed8b061996738dea12eb10e86e9e8", "MarketBase.xlsx" : "88c2848b8ccfb7668f0daa813fd5c83e", "MaterialBase.xlsx" : "9fa60128363f4c7a16f56cf91b5b5265", "MonsterBase.xlsx" : "e9e99b21ad30d81f57015f31f931f418", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "b0c4bf13454e0dbb32e6feceeca5c8dc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "abba4baee0ac2e7ef1716e1aabc80714", "SkillConfig.xlsx" : "2e444b8c038494fbf2b53035598161ab", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "aae232a5a6fab28a0316ba4b12baf95c", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "a1ac8c0cb7a7660deeffca392f3d2723", "Sys_Scene.xlsx" : "e4fd86aa97c4d1e820581395947dc337", "TaskBase.xlsx" : "83c30be22e28181020b173eb34562c40", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "6e62dc6824fd7df463ceeb8a5a576b92", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "74c9a5ea7565455324fbb965f282ec37", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "f9a1fbf212490b3d230a4b3b201fccb1", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "d7998ca3073a40e87a3268b3df27261e", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "666d467e6ec392432b32a739fea8e64c", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "e9b8f9e4a52fa446fc7e5b63ad8d2aec", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "45c7411492e8501beeaedb8df0601908", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "094c6284e0e19757498ad2bdce3648a6", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "48398b4ca3926a465515eaf047dca937", "PetConfig.xlsx" : "99345c8836027cb36e42764b78cdd798", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "843c0c8009ee0d3615496b9226b2ee3b", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "ccce19f15dcbc9cbc37aa18009218b04", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "a0c3da23ad62817ab5340b7dc041b777", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "90a3cc2fd11e85ab41cefe884c80e7de", "WorldBossConfig.xlsx" : "7fd89d1cef779c5e1b77219492342f6d", "SignInRewardConfig.xlsx" : "764fd0701bc476594a6333f0b5159c8a", "SignInRewardMonth.xlsx" : "b5a731d9c61a176517d051a1d98e0a87", "MaintainRewardConfig.xlsx" : "be43f0bef4ab224efc978a5c45e20e19", "DeahtCopyConfig.xlsx" : "37c1d4e56559f10a9cb8210fd0242092", "JourneyOfDeathCopyConfig.xlsx" : "0a7961ba1b30e3ff9c96793bd40c0517", "ServerItemLimit.xlsx" : "9e63ab0ecbf6ad20cee94e9351dc99e1", "StrengthPlusConfig.xlsx" : "ad43d8985980dc7f1fa7e32b2c78e44a", "CdkConfig.xlsx" : "dd35e93974d7b6045de9b0d7793e93f9" } }
--- a/Unity/Assets/Download/Config/Hotfix.dll.bytes
+++ b/Unity/Assets/Download/Config/Hotfix.dll.bytes
--- a/Unity/Assets/Download/Config/Hotfix.pdb.bytes
+++ b/Unity/Assets/Download/Config/Hotfix.pdb.bytes
--- a/Unity/Assets/Download/Config/HotfixView.dll.bytes
+++ b/Unity/Assets/Download/Config/HotfixView.dll.bytes
--- a/Unity/Assets/Download/Config/HotfixView.pdb.bytes
+++ b/Unity/Assets/Download/Config/HotfixView.pdb.bytes
--- a/Unity/Assets/Download/DataTable/CdkConfig.json
+++ b/Unity/Assets/Download/DataTable/CdkConfig.json
@ -1 +1 @@
-eNoljbEKAjEQRPtA/kG2NUV2NznOdHKVrYVNCIeQU4KQQFQs5P7dVcth5s2LWkW0Fs3mDXPJEH4BpnyDAM4O3nnneGQij8wOeWctI45g4LT0e2lVEAGOy+vc8753CFGeHkLLx9TqpVy3/1KQ+fA1EBIN4mjPKjtcTVqT0Spp9QHidSUX
+eNoljb0KAjEQhPtA3kG2NcVm8yNJJ1fZWtiEcAg5JQgJRMVC7t1dtRxm5vuSFEkjarV5w1wLxF+AqdwggiaPO28QrQvOoEPEYDUZImODBwWnZdxrb/wiBcfldR5lPwbExLAHAxgz9Xap1+2/5Mt8+EpIE3nW9GfjnV5VXrOSIkvxATrZJbE=
--- a/Unity/Assets/Download/DataTable/EquipBase.json
+++ b/Unity/Assets/Download/DataTable/EquipBase.json
--- a/Unity/Assets/Download/DataTable/SonSet.json
+++ b/Unity/Assets/Download/DataTable/SonSet.json
--- a/Unity/Assets/Download/DataTable/TaskBase.json
+++ b/Unity/Assets/Download/DataTable/TaskBase.json
--- a/Unity/Assets/Model/Cal/CalAssets/BulildAB.asset
+++ b/Unity/Assets/Model/Cal/CalAssets/BulildAB.asset
@ -22,8 +22,8 @@ MonoBehaviour:
    PrefabModifications: []
    SerializationNodes: []
  ClientVersion: 2.3
-  IsEditorMode: 1
-  IsLocal: 1
+  IsEditorMode: 0
+  IsLocal: 0
  LocalResPath: http://127.0.0.1:2083/
  LocalServerPath: 127.0.0.1:7756
  ResPath: http://121.196.171.57:2085/
--- a/Unity/Assets/Res/Common/Manifest.asset
+++ b/Unity/Assets/Res/Common/Manifest.asset
@ -34261,8 +34261,8 @@ MonoBehaviour:
  - name: 7bba97da09e898c0a507c930bb6ab053.unity3d
    id: 460
    deps: 
-    len: 341649
-    hash: 36692f4d450d81c981d404426f6f6f69
+    len: 341119
+    hash: 50e26a87cf73a85930d461044599bdd4
  - name: 7be71ac0d2e2e7fcfd5858b91b279f01.unity3d
    id: 461
    deps: 02020000
--- a/Unity/Assets/Res/Common/Rules.asset
+++ b/Unity/Assets/Res/Common/Rules.asset
@ -29,7 +29,7 @@ MonoBehaviour:
  searchPatternPrefab: '*.prefab'
  searchPatternScene: '*.unity'
  searchPatternText: '*.txt,*.bytes,*.json,*.csv,*.xml,*htm,*.html,*.yaml,*.fnt'
-  version: 466
+  version: 469
  scenesInBuild:
  - {fileID: 102900000, guid: e0d691ac8c1d0454ba07089ea820e18a, type: 3}
  - {fileID: 102900000, guid: d378f07356e960549add8141397b1462, type: 3}
--- a/Unity/Assets/Res/Config/GlobalProto.txt
+++ b/Unity/Assets/Res/Config/GlobalProto.txt
@ -1 +1 @@
-{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2083/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : true, "ClientVersion" : "2.3" }
+{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2083/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : false, "isEditorMode" : false, "ClientVersion" : "2.3" }
--- a/Unity/ProjectSettings/EditorBuildSettings.asset
+++ b/Unity/ProjectSettings/EditorBuildSettings.asset
@ -11,133 +11,133 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Res/Common/Splash.unity
    guid: d378f07356e960549add8141397b1462
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_ActiveTask.unity
    guid: 45280bed83d2e344590ce61ace27b83c
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_BattleIdle.unity
    guid: ae137edf722298941944efba11422c1d
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Beach.unity
    guid: d46ff12dcf1834b4dad6ddfe45458e65
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Boss.unity
    guid: dd04855bd8f8a8c4083a5f4482ac7258
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Challenge.unity
    guid: 01f636e71f5382b4687e608ccd7c47e6
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_CreateRole.unity
    guid: 6f3aa9ba25869814fb05cf1fe1cab8ff
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_EnterGame.unity
    guid: b6b5bad50076adc4d9a975c98327a073
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_FimalyBattle.unity
    guid: b03d5f9f8d2f95d4c894089ad4840c60
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_GuardianPark.unity
    guid: dfdfb988ae306cc4699ad910ce5f5f82
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_HonorTemple.unity
    guid: 6a434142803416748a830775403bb331
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Login.unity
    guid: 30dd40811005c814f807648e46cb03ed
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainCity.unity
    guid: 5ea4281985825f54c844f0404bedb358
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory1.unity
    guid: c57b27b08ffaa8a4f91a15c02d5de805
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory2.unity
    guid: 99b174b0ca8cbf048a57ef0576a69da0
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory3.unity
    guid: e13303a3e71f0f84fb7f9070100ac6e4
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory4.unity
    guid: 52af5cd6587f9da4ba46b77e0e94ffe8
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory5.unity
    guid: 610bb772748d9e14b900c143561e8aaa
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory6.unity
    guid: 47d839d999f6edc41a9f70755023b7e8
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory7.unity
    guid: 9d72f13296e57cd4ab4452b6e96a7a87
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory8.unity
    guid: e4c4febf70bcd034099ac0ed0ba69d24
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory9.unity
    guid: 782d2e6a67496b442b64d76a0d3989c0
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory10.unity
    guid: 4203f3f88fec5654f909cbe5982fcb9c
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory11.unity
    guid: 31ac6240fd8b27444b56b6f62de91781
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory12.unity
    guid: eb554d641fba0f8409680b8f8d0b9d5e
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory13.unity
    guid: 3531d4659f140034d9263756f5f58a6c
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory14.unity
    guid: 56cf57dd7aea50d489258cd408bd6520
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory15.unity
    guid: 7961e32a2d901654787d54b8fb764e23
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MainStory16.unity
    guid: 5e537e3afb972e44baed795a51cbe939
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_SpaceTravel.unity
    guid: 287d198c9a3c048258470a9336253cc5
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_StarSoul.unity
    guid: a8e745dfd7e2d434a925d37781af77f5
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_WorldBoss.unity
    guid: 9268d7a39379947e3b8cba62bc75d789
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_MarvellousSquare.unity
    guid: 1e11547db33b2ee439e611d01dcc9f0d
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Pve.unity
    guid: e415bacbb0283f24baca2c264f9ccfd1
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_PersonalPvp1.unity
    guid: 0e3f95dffb62df641b220bf8ccc1b7f8
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_PersonalPvp2.unity
    guid: 9ccf7a60ffac9be4ab3263a3b67cf9bf
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_PersonalPvp3.unity
    guid: 5f618dca93745264f8fb5261621a3bcb
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_ManulEquip1.unity
    guid: cb98f349f62e32d45a0a8ef57a0b6633
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_ManulEquip2.unity
    guid: 8981e7a1731d15c4caa1479fb37223c4
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_ManulEquip3.unity
    guid: aab02a6706a731043add237eab876f6c
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_PersonalBoss.unity
    guid: e971fbe570ac7284baffa4db1e8b7cbc
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Challenge_Middle.unity
    guid: 2d2d745676fe74945894a6d128bd1851
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Challenge_Hard.unity
    guid: 2c493ca3d57147a41b50962f3e421e56
-  - enabled: 1
+  - enabled: 0
    path: Assets/Download/Scenes/Scene_Death.unity
    guid: 6c04cf06a2bd99045b769746dbf3fa95
  m_configObjects:
--- a/Unity/ProjectSettings/ProjectSettings.asset
+++ b/Unity/ProjectSettings/ProjectSettings.asset
@ -13,7 +13,7 @@ PlayerSettings:
  useOnDemandResources: 0
  accelerometerFrequency: 60
  companyName: CTT
-  productName: "\u68A6\u5E7B\u5947\u9047\u8BB0\u672C\u5730\u6D4B\u8BD5"
+  productName: "\u68A6\u5E7B\u5947\u9047\u8BB0"
  defaultCursor: {fileID: 2800000, guid: c638315465f73de4fbe8503c28859260, type: 3}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}