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

Assets/Res/Config/EventConfig.json

@@ -12,11 +12,11 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 3,
       "EventValue": [
-        0
+        5
       ],
       "EventCount": null,
       "EventName": 174,
@@ -36,12 +36,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -57,16 +54,16 @@
         1025,
         1026
       ],
-      "EventTriggerType": 3,
+      "EventTriggerType": 99,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 1,
       "EventValue": [
-        0
+        10007
       ],
-      "EventCount": null,
+      "EventCount": 1,
       "EventName": 176,
       "Description": 1938
     },
@@ -78,11 +75,11 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 7,
       "EventValue": [
-        0
+        500
       ],
       "EventCount": null,
       "EventName": 217,
@@ -96,12 +93,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 218,
       "Description": 1940
@@ -114,12 +108,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 219,
       "Description": 1941
@@ -132,12 +123,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 220,
       "Description": 1942
@@ -150,7 +138,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -165,7 +153,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -180,7 +168,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -195,7 +183,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -210,7 +198,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -225,7 +213,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -240,7 +228,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -255,7 +243,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -270,7 +258,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -268,7 +268,7 @@
       ],
       "ConditionType": 1,
       "ConditionPara": [
-        1002
+        10007
       ],
       "finishCount": 1,
       "optionType": 4,
@@ -554,7 +554,7 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 1,
+      "finishCount": 1000,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -568,7 +568,7 @@
       "ConditionPara": [
         10
       ],
-      "finishCount": 1,
+      "finishCount": null,
       "optionType": null,
       "ResultType": null
     }

Assets/Res/Config/PlacesConfig.json

@@ -7,17 +7,23 @@
       "bigMapID": 1,
       "to3DPrefab": "a",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 4,
+      "MainTaskID": [
+        10001,
+        10002,
+        10003,
+        10004
+      ],
       "ZhixianID": [
-        10,
-        15,
-        20
+        3
+      ],
+      "ZhixianActivatedPercentage": [
+        25
       ],
       "DivineSenseGeneralProbability": 40,
       "SpecialTaskID": [
         1,
-        2,
-        3
+        2
       ]
     },
     {
@@ -28,17 +34,7 @@
       "to3DPrefab": "b",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 3,
@@ -48,17 +44,7 @@
       "to3DPrefab": "c",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 4,
@@ -68,17 +54,7 @@
       "to3DPrefab": "h",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 5,

Assets/Scripts/GameLogic/Combat/CombatTool/AttType.cs

@@ -8,5 +8,6 @@ namespace GameLogic.Combat.CombatTool
         Normal = 0,
         Skill = 1,
         Buff=2,
+        FaBao=4,
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -160,10 +160,10 @@ namespace GameLogic.Combat.Hero
         /// <returns></returns>
         public SkillBasic CanReleaseSkill()
         {
-            // if (_combatHeroEntity.IsControl())
-            // {
-            //     return null;
-            // }
+            if (_combatHeroEntity.IsControl())
+            {
+                return null;
+            }
             if (!_combatHeroEntity.IsEnemy && _combatHeroEntity.CombatAIBasic.currFocusTarget is BannerHero)
             {
                 return null;

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs

@@ -63,19 +63,20 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 };
             }
 
+            // 
+            Debug.Log("法宝对敌人照成伤害");
+            ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            if (lifetCycleHitPoint == null)
+            {
+                SkillPlayFinish();
+                return;
+            }
+            
+            BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
+            cBetterList.Add(lifetCycleHitPoint);
+            ActivationTimeLineData("gongji", currTarget: cBetterList);
             SkillPlayFinish();
-            // Debug.Log("法宝对敌人照成伤害");
-            // ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
-            // if (lifetCycleHitPoint == null)
-            // {
-            //     return;
-            // }
-            //
-            // BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
-            // cBetterList.Add(lifetCycleHitPoint);
-            // ActivationTimeLineData("gongji", currTarget: cBetterList);
-            // SkillPlayFinish();
-            //
+            
             // HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
             // harmReturnInfo.source = CombatHeroEntity;
             // harmReturnInfo.target = target.GetMainHotPoin<CombatHeroHitPoint>();
@@ -84,8 +85,8 @@ namespace GameLogic.Combat.Skill.MagicSkill
             // harmReturnInfo.harmType = HarmType.Default;
             // harmReturnInfo.triggerData = triggerData;
             // target.HeroHurt(harmReturnInfo);
-            // CombatCalculateTool.Instance.Harm(CombatHeroEntity, lifetCycleHitPoint as CombatHeroHitPoint, 200, AttType.Normal, triggerData,
-            //     HarmType.Default);
+            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity, lifetCycleHitPoint as CombatHeroHitPoint, 1, AttType.FaBao, triggerData,wuXingType,null,
+                HarmType.Default);
         }
     }
 }

Assets/Scripts/GameLogic/Paritcle/GameTimeLineParticleFactory.cs

@@ -157,6 +157,17 @@ public class GameTimeLineParticleFactory : ITimeLineParticleFactory
                     // {
                     //     pool.transform.SetParent(targetSpecialDotInfo.targetTran);
                     // }
+                }else if (fxTarget != null)
+                {
+                    if (!timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isNotRotate)
+                    {
+                        pool.transform.eulerAngles = fxTarget.GetSpecialDotInfo("").GetEulerAngles();
+                        pool.isNotRotion = false;
+                    }
+                    else
+                    {
+                        pool.isNotRotion = true;
+                    }
                 }
 
                 if (combatHeroEntity != null && timeLineEventParticleLogicBasic.timeLinePlayFxSerializtion.isLoop)

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

@@ -471,7 +471,7 @@ namespace Fort23.Mono
             for (int i = 0; i < 10; i++)
             {
                 int index = i;
-                double hd = (-36 * i) * Math.PI / 180f;
+                double hd = (36 * i) * Math.PI / 180f;
                 double a = Math.Cos(hd);
                 double b = -Math.Sin(hd);
                 double c = Math.Sin(hd);