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

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -20,7 +20,25 @@ MonoBehaviour:
     m_RotationOrder: 4
   InExpo:
     serializedVersion: 2
-    m_Curve: []
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4

Assets/Res/Config/PlayerGuideConfig.json

@@ -143,7 +143,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -182,7 +182,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -221,7 +221,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -260,7 +260,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -299,7 +299,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -338,7 +338,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -377,7 +377,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -416,7 +416,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -455,7 +455,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -494,7 +494,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -533,7 +533,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -572,7 +572,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -611,7 +611,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -650,7 +650,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -689,7 +689,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -728,7 +728,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -767,7 +767,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -806,7 +806,7 @@
         "0"
       ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -857,6 +857,45 @@
       "ForceOnclick": 0,
       "forceText": 1,
       "voiceFile": ""
+    },
+    {
+      "ID": 502,
+      "Index": 2,
+      "NeedLevel": 0,
+      "groupID": 5,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 4,
+      "SpeakerImage": 3,
+      "desc": -1,
+      "ExtraShow": [
+        "0"
+      ],
+      "Highlighting": 1,
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 0,
+      "forceText": 1,
+      "voiceFile": ""
     }
   ]
 }

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -109,8 +109,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 378, y: 83.3183}
+  m_AnchoredPosition: {x: 0, y: 3.4199}
+  m_SizeDelta: {x: 542.1544, y: 76.4785}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -319,7 +319,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.020126343, y: -0.05529785}
+  m_AnchoredPosition: {x: 0.020111084, y: -0.05529785}
   m_SizeDelta: {x: -8.092957, y: -6.725498}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8441070473825213442
@@ -447,8 +447,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1, y: 0}
-  m_SizeDelta: {x: 342.3, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 510, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1634987077912709362
 CanvasRenderer:
@@ -480,7 +480,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 18
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1

Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs

@@ -55,7 +55,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///手指类型 1. 手指&光圈 2. 手指 3. 光圈 4. 长按 -1：不要特效的光圈
+		///手指类型 1. 手指&光圈 2. 手指 3. 光圈 -1：不要特效的光圈
 		/// </summary>
 #if !COMBAT_SERVER
 		public int FingerType;

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1131,8 +1131,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
             eventList.isCompleted = true;
         }
 
-        RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
-        await rewardsPanel.UIClosed();
+        if (itemInfos != null || itemInfos.Count > 0)
+        {
+            RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
+            await rewardsPanel.UIClosed();
+        }
+
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
         {

Assets/Scripts/GameUI/GameApplction.cs

@@ -171,10 +171,10 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            if (!PlayerGuideManager.Instance.GuideIsCanDo(5))
+            MainPanel mainPanel = await MainPanel.OpenPanel();
+            if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                MainPanel mainPanel = await MainPanel.OpenPanel();
-                // mainPanel.GObjectPoolInterface.SetActive(false);
+                mainPanel.GObjectPoolInterface.SetActive(false);
             }
         }
 
@@ -187,26 +187,31 @@ public class GameApplction : IGameStart
 
     public async void XinShouCombat()
     {
-        if (PlayerGuideManager.Instance.GuideIsCanDo(5))
+        if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
+            AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
+            await EventSystemManager.Instance.TriggerEvent(eventList2);
             CTask cTask = CTask.Create();
-            CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
+            await CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
                 delegate(bool isWin)
                 {
                     LogTool.Log("战斗完成" + isWin);
                     cTask.SetResult();
                 });
-            
+
             await cTask;
 
             AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(10000);
             await EventSystemManager.Instance.TriggerEvent(eventList1);
-            AccountFileInfo.Instance.playerData.isTiggerPlot = true;
+          
 
             AccountFileInfo.Instance.SavePlayerData();
 
-            MainPanel mainPanel = await MainPanel.OpenPanel();
-    
+            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            mainPanel.GObjectPoolInterface.SetActive(true);
+            AccountFileInfo.Instance.playerData.isTiggerPlot = true;
+            // PlayerGuideManager.Instance.NextGuide();
+            mainPanel.GetFocus();
         }
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -41,10 +41,10 @@ namespace Fort23.Mono
                     CombatDrive.Instance.CombatController.CombatTypeBasic as LevelBattleCombatType;
                 if (levelBattleCombatType.levelbattleConfig.ID == 10001)
                 {
-                    if (PlayerGuideManager.Instance.GuideIsCanDo(5))
-                    {
-                        PlayerGuideManager.Instance.SetGuid(5);
-                    }
+                    // if (PlayerGuideManager.Instance.GuideIsCanDo(5))
+                    // {
+                    //     PlayerGuideManager.Instance.SetGuid(5);
+                    // }
                 }
             }
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -201,10 +201,11 @@ namespace Fort23.Mono
         {
             if (isOver)
                 return;
+            icon.gameObject.SetActive(false);
             if (eventConditionConfig.NPCID != 100 &&  eventConditionConfig.NPCID != 0)
             {
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-                icon.gameObject.SetActive(false);
+             
                 icon.onSpriteAlter = () =>
                 {
                     icon.SetNativeSize();

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs

@@ -139,8 +139,8 @@ namespace Fort23.Mono.Phases
 
             pgm.SetfxTransVisiable(true);
             // pgm.SetMaskTarget(gameObject);
-            size = new Vector2(718, 938);
-            localPos = new Vector2(0, -96);
+            size = new Vector2(718, 858);
+            localPos = new Vector2(0, -135);
             pgm.SetShowFramePosAndSize(localPos, size, 0, null);
 
             await pgm.ConfigLogic(204, delegate() { pgm.NextGuide(); });

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs

@@ -129,8 +129,8 @@ namespace Fort23.Mono.Phases
 
             pgm.SetfxTransVisiable(true);
             // pgm.SetMaskTarget(gameObject);
-            size = new Vector2(718, 938);
-            localPos = new Vector2(0, -96);
+            size = new Vector2(718, 858);
+            localPos = new Vector2(0, -135);
             pgm.SetShowFramePosAndSize(localPos, size, 0, null);
 
             await pgm.ConfigLogic(303, delegate() { pgm.NextGuide(); });

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs

@@ -27,7 +27,7 @@ namespace Fort23.Mono.Phases
         {
             base.Active();
             actionList.Add(OnStep501);
-
+            // actionList.Add(OnStep502);
             actionList.Add(OnStepEnd);
         }
 
@@ -80,12 +80,26 @@ namespace Fort23.Mono.Phases
             pgm.StepInit();
             pgm.SetBlackAlpha(0.05f);
             pgm.SetOnClickMask(true);
+            // CombatPanel combatPanel = UIManager.Instance.GetComponent<CombatPanel>();
+            // combatPanel.CameraSelect.value = 0.2f;
             await TimerComponent.Instance.WaitAsync(1000);
             pgm.SetOnClickMask(false);
+
             CombatDrive.Instance.CombatController.isUpdate = false;
             await pgm.ConfigLogic(501, delegate() { pgm.NextGuide(); });
         }
 
+        /// <summary>
+        /// 点击功法
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep502(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            CombatDrive.Instance.CombatController.isUpdate = true;
+            await pgm.ConfigLogic(502, delegate() { });
+        }
+
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();

Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -170,6 +170,11 @@ namespace Fort23.Mono
             //     return false;
             // }
 
+            // if (GuideIsCanDo(5))
+            // {
+            //     return false;
+            // }
+
             if (curstep > 1 && guideLogic == null)
             {
                 return false;
@@ -685,6 +690,7 @@ namespace Fort23.Mono
                         guideConfig.AwardItemNum[i]));
                 }
             }
+
             HideDialogBox(false);
             // if (guideConfig.SpeakerStyle == 3)
             // {

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -47,16 +47,20 @@ namespace Fort23.Mono
         {
             await AppBarPanel.OpenPanel(this);
             TitlePanel.ClosePanel();
-            if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+            if (AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                await PlayerGuideManager.Instance.SetGuid(1);
-            }
+                if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+                {
+                    await PlayerGuideManager.Instance.SetGuid(1);
+                }
 
-            if (PlayerGuideManager.Instance.GuideIsCanDo(4))
-            {
-                await PlayerGuideManager.Instance.SetGuid(4);
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4))
+                {
+                    await PlayerGuideManager.Instance.SetGuid(4);
+                }
             }
 
+
             base.GetFocus();
         }