Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -108,30 +108,30 @@ namespace Fort23.Mono
                     }
                 }
 
-                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
-
-                SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
-                int count = 0;
-                for (int i = 0; i < _skillInfo.skillConfig.level - 1; i++)
-                {
-                    count += skillConstant.SkillPromoteNeedPieceNum[i];
-                }
-
-                if (count > 0)
-                {
-                    if (itemInfo.ContainsKey(_skillInfo.skillConfig.PieceID))
-                    {
-                        itemInfo[_skillInfo.skillConfig.PieceID].count += count;
-                    }
-                    else
-                    {
-                        itemInfo.Add(_skillInfo.skillConfig.PieceID, new ItemInfo(_skillInfo.skillConfig.PieceID,
-                            count));
-                    }
-                }
-
-
-                _skillInfo.SkillData.star = 1;
+                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
+                //
+                // SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
+                // int count = 0;
+                // for (int i = 0; i < _skillInfo.skillConfig.level - 1; i++)
+                // {
+                //     count += skillConstant.SkillPromoteNeedPieceNum[i];
+                // }
+                //
+                // if (count > 0)
+                // {
+                //     if (itemInfo.ContainsKey(_skillInfo.skillConfig.PieceID))
+                //     {
+                //         itemInfo[_skillInfo.skillConfig.PieceID].count += count;
+                //     }
+                //     else
+                //     {
+                //         itemInfo.Add(_skillInfo.skillConfig.PieceID, new ItemInfo(_skillInfo.skillConfig.PieceID,
+                //             count));
+                //     }
+                // }
+
+
+                // _skillInfo.SkillData.star = 1;
                 _skillInfo.SkillData.level = 1;
                 _skillInfo.CustomInt(_skillInfo.SkillData);
                 PlayerManager.Instance.myHero.ComputeHeroInfo();

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -271,13 +271,18 @@ namespace Fort23.Mono
             xianTuSaiXuanWidget1.OnClick = OnClick;
 
             BigMapConfig[] bigMapConfigs = ConfigComponent.Instance.GetAll<BigMapConfig>();
-            foreach (var bigMapConfig in bigMapConfigs)
-            {
-                XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
-                xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
-                xianTuSaiXuanWidget.OnClick = OnClick;
-                bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
-            }
+            // foreach (var bigMapConfig in bigMapConfigs)
+            // {
+            //     XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            //     xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
+            //     xianTuSaiXuanWidget.OnClick = OnClick;
+            //     bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
+            // }
+            
+            XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            xianTuSaiXuanWidget.CustomInit(1, bigMapConfigs[0].ID);
+            xianTuSaiXuanWidget.OnClick = OnClick;
+            bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
 
             eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidgetGam, null);
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs

@@ -41,7 +41,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_Name.text = LanguageManager.Instance.Text(_bigMapConfig.mapName);
+                    string[] fruits =  LanguageManager.Instance.Text(_bigMapConfig.mapName).Split('.');
+                    Text_Name.text =fruits[1];
                 }
             }
             else if (type == 2)

ProjectSettings/TimeManager.asset

@@ -5,5 +5,5 @@ TimeManager:
   m_ObjectHideFlags: 0
   Fixed Timestep: 0.02
   Maximum Allowed Timestep: 0.33333334
-  m_TimeScale: 5
+  m_TimeScale: 1
   Maximum Particle Timestep: 0.03