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

Assets/Art/ArtHero/FaBao/fb_wulonglun.prefab

@@ -206,6 +206,7 @@ PlayableDirector:
     - 24c777ba6a11d1d47b125d6c7abfed05: {fileID: 0}
     - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 249382729463692455}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 4424423888198091675}
+    - 5325727dc162856468942a33edb34712: {fileID: 3833415742594987859}
 --- !u!1 &2261462105709969269
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/FaBaoMesh/2wulonglun/fb_wulonghuan.mat

@@ -143,7 +143,7 @@ Material:
     - _FlatSpecularSize: 0.1
     - _Flatness: 1
     - _FlatnessExtra: 1
-    - _Fresnel: 0.44
+    - _Fresnel: 0.14
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
@@ -206,7 +206,7 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
     - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
-    - _FresnelColor: {r: 0.91823894, g: 0.4376101, b: 0.020212654, a: 1}
+    - _FresnelColor: {r: 0.45700002, g: 0.1396487, b: 0.009764943, a: 1}
     - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

Assets/Art/FaBaoMesh/2wulonglun/fb_wulonghuan2.mat

@@ -195,7 +195,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 0.9716981, b: 0.9716981, a: 1}
-    - _Base_Map_Color: {r: 7.2, g: 3.9204187, b: 0, a: 1}
+    - _Base_Map_Color: {r: 2.9960785, g: 1.4065973, b: 0, a: 1}
     - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _ColorDim: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}

Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable

@@ -130,6 +130,98 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
+--- !u!114 &-8944634729296790106
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 4125267898300374450}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 6402728653791148440}
+    m_Duration: 2
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -8944634729296790106}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_fb_tw_jin
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-8734228703646629367
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -391,7 +483,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.55
+    m_Start: 0.25
     m_ClipIn: 0
     m_Asset: {fileID: 6585205517704036416}
     m_Duration: 1
@@ -670,7 +762,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -5214606025780425291}
-    m_Duration: 0.01666667
+    m_Duration: 0.02
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6697791818425324012}
     m_EaseInDuration: 0
@@ -895,9 +987,9 @@ MonoBehaviour:
   m_Clips:
   - m_Version: 1
     m_Start: 0
-    m_ClipIn: 0
+    m_ClipIn: 0.3
     m_Asset: {fileID: 1955103773411730313}
-    m_Duration: 0.8666666666666667
+    m_Duration: 0.566666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6338035570506245065}
     m_EaseInDuration: 0
@@ -1034,7 +1126,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -3608551095578131316}
-    m_Duration: 1
+    m_Duration: 2
     m_TimeScale: 1
     m_ParentTrack: {fileID: -5309653085008744609}
     m_EaseInDuration: 0
@@ -1584,7 +1676,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.55
+    m_Start: 0.25
     m_ClipIn: 0
     m_Asset: {fileID: 4328475218147270323}
     m_Duration: 1
@@ -1904,7 +1996,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.5
+    m_Start: 0.2
     m_ClipIn: 0
     m_Asset: {fileID: -1263126036946143950}
     m_Duration: 1
@@ -2387,6 +2479,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -5309653085008744609}
+  - {fileID: -8944634729296790106}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2770,9 +2863,9 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 0
-  LocationType: 0
-  targetSpecialDotName: 
+  targetType: 1
+  LocationType: 5
+  targetSpecialDotName: hitpos
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2784,6 +2877,43 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &6402728653791148440
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 5325727dc162856468942a33edb34712
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 689
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 5
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 1
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &6585205517704036416
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/FXPrefabs/fx_gf_jianjue.prefab

@@ -24687,8 +24687,8 @@ MonoBehaviour:
     isActive: 0
     controlPoints:
     - {x: 0, y: 0, z: 0}
-    - {x: -2.4016674, y: 1.8948584, z: -0.3446406}
-    - {x: -0.7815881, y: 0, z: 2.6557693}
+    - {x: -1.7328203, y: 0.7749173, z: 1.4223565}
+    - {x: 0.3307275, y: -0.0420354, z: 3.1231074}
     - {x: 0, y: 0, z: 5}
     allDis: 0
   maxDis: 20

Assets/Art/cs3.scene

@@ -236228,13 +236228,17 @@ PrefabInstance:
       propertyPath: m_ExposedReferences.m_References.Array.data[6].second
       value: 
       objectReference: {fileID: 2770692717778805916}
+    - target: {fileID: 3726332751415733867, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8690168045956676201, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_Name
       value: fb_wulonglun
       objectReference: {fileID: 0}
     - target: {fileID: 8690168045956676201, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/Config/BigMap.json

@@ -14,6 +14,9 @@
         6,
         7
       ],
+      "DivineSenseGeneralEvent": [
+        1
+      ],
       "DivineSenseGeneralProbability": 50,
       "ulockFunction": [
         0

Assets/Res/Config/DialogueConfig.json

@@ -1,13 +0,0 @@
-{
-  "configList": [
-    {
-      "ID": 1,
-      "GroupId": 1,
-      "DialogueOptionId": [
-        1,
-        2
-      ],
-      "isEnd": false
-    }
-  ]
-}

Assets/Res/Config/DialogueConfig.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: B3gavCz/Un0JlgBzjCYeqsEHPrV+NxCgcgoNdDdP/aLxIuF/qvmt5DKsPd96
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/Config/DialogueOptionConfig.json

@@ -1,14 +0,0 @@
-{
-  "configList": [
-    {
-      "ID": 1,
-      "LanguageId": 1,
-      "DialogueConfigID": 0
-    },
-    {
-      "ID": 2,
-      "LanguageId": 2,
-      "DialogueConfigID": 0
-    }
-  ]
-}

Assets/Res/Config/DialogueOptionConfig.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CiwY5nj4AH+56r0yiTBf0ROgm8K4Dd+UXRNplzGB0uUsydE5M9zSXv+lX9eT
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/Config/DivineSenseConfig.json

@@ -4,7 +4,7 @@
       "ID": 1,
       "DetectEventCount": 3,
       "QualityBonusChance": [
-        10.0,
+        100.0,
         10.0,
         10.0,
         10.0,
@@ -21,7 +21,7 @@
       "ID": 2,
       "DetectEventCount": 3,
       "QualityBonusChance": [
-        10.0,
+        100.0,
         10.0,
         10.0,
         10.0,

Assets/Res/Config/EventConditionConfig.json

@@ -1,28 +1,103 @@
 {
   "configList": [
     {
-      "ID": 1,
-      "operation": 1
+      "ID": 1001,
+      "LanID": null,
+      "optionType": 1,
+      "optionPara1": [
+        1002,
+        1003
+      ]
     },
     {
-      "ID": 2,
-      "operation": 1
+      "ID": 1002,
+      "LanID": null,
+      "optionType": 2,
+      "optionPara1": [
+        702
+      ],
+      "PrizeIDs": [
+        1002
+      ],
+      "PrizeNums": [
+        100
+      ]
     },
     {
-      "ID": 11,
-      "operation": null
+      "ID": 1003,
+      "LanID": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        50
+      ]
     },
     {
-      "ID": 12,
-      "operation": null
+      "ID": 1010,
+      "LanID": null,
+      "optionType": 1,
+      "optionPara1": [
+        1011,
+        1012
+      ]
     },
     {
-      "ID": 101,
-      "operation": null
+      "ID": 1011,
+      "LanID": null,
+      "optionType": 1,
+      "optionPara1": [
+        1014,
+        1015
+      ]
     },
     {
-      "ID": 102,
-      "operation": null
+      "ID": 1012,
+      "LanID": null,
+      "optionType": 5,
+      "optionPara1": [
+        1
+      ],
+      "optionPara2": [
+        1,
+        1
+      ],
+      "PrizeIDs": [
+        1016
+      ],
+      "PrizeNums": [
+        10
+      ]
+    },
+    {
+      "ID": 1014,
+      "LanID": null,
+      "optionType": 4,
+      "optionPara1": [
+        2
+      ],
+      "optionPara2": [
+        4,
+        150
+      ],
+      "PrizeIDs": [
+        1016
+      ],
+      "PrizeNums": [
+        200
+      ]
+    },
+    {
+      "ID": 1015,
+      "LanID": null,
+      "optionType": 3,
+      "PrizeIDs": [
+        1002
+      ],
+      "PrizeNums": [
+        1000
+      ]
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -2,25 +2,22 @@
   "configList": [
     {
       "ID": 1,
-      "EventType": 1,
+      "EventType": 1001,
       "EventTriggerType": 1,
       "EventQuality": 1,
-      "EventCompleteCount": null,
       "EventConditionId": [
         2
       ],
       "EventVlaue": [
         2
       ],
-      "Description": null,
-      "DialogueID": null
+      "Description": null
     },
     {
       "ID": 2,
-      "EventType": 2,
-      "EventTriggerType": 1,
+      "EventType": 1010,
+      "EventTriggerType": 2,
       "EventQuality": 1,
-      "EventCompleteCount": null,
       "EventConditionId": [
         1
       ],
@@ -28,7 +25,6 @@
         5
       ],
       "Description": null,
-      "DialogueID": 1,
       "associateVlaue": [
         1
       ]

Assets/Scenes/testCombat.scene

@@ -211,10 +211,10 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints:
-    - {x: -16.310566, y: 0, z: 0}
-    - {x: -19.720566, y: 4, z: -7.2300005}
-    - {x: -13.670565, y: 1, z: 4.8900003}
-    - {x: -16.310566, y: 0, z: 9.89}
+    - {x: -16.310566, y: 11.139149, z: 0}
+    - {x: -19.720566, y: 15.139149, z: -7.2300005}
+    - {x: -13.670565, y: 12.139149, z: 4.8900003}
+    - {x: -16.310566, y: 11.139149, z: 9.89}
     allDis: 0
   isRun: 0
 --- !u!1 &21371307
@@ -1341,7 +1341,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 2
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
@@ -1363,6 +1363,18 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
       value: 10008
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[3]
+      value: 10008
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[4]
+      value: 10008
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[5]
+      value: 10008
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
       value: 10002
@@ -2063,10 +2075,10 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints:
-    - {x: -16.310566, y: 0, z: 9.89}
-    - {x: -24.810566, y: -3.93, z: 19.470001}
-    - {x: -14.860565, y: -3.0799997, z: 4.6}
-    - {x: -16.310566, y: 0, z: 0}
+    - {x: -16.310566, y: 11.139149, z: 9.89}
+    - {x: -24.810566, y: 7.2091484, z: 19.470001}
+    - {x: -14.860565, y: 8.059149, z: 4.6}
+    - {x: -16.310566, y: 11.139149, z: 0}
     allDis: 0
   isRun: 0
 --- !u!1 &611864968
@@ -2659,7 +2671,7 @@ Transform:
   m_GameObject: {fileID: 891104892}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -11.41, y: 1.4508517, z: 9.483113}
+  m_LocalPosition: {x: -11.41, y: 12.59, z: 9.483113}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Scripts/GameData/ExcelConfig/DialogueConfig.cs

@@ -1,50 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\DialogueConfig.xlsx. SheetName: DialogueConfig
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "DialogueConfig.json")]
-	public partial class DialogueConfigHolder : ConfigHolder<DialogueConfig>
	{
-	}
-
-
-	[Serializable]
-	public struct DialogueConfig : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///ID
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///对话组ID
-		/// </summary>
-public int GroupId;
-
-
-		/// <summary>
-		///内容ID
-		/// </summary>
-public int[] Content;
-
-
-		/// <summary>
-		///
-		/// </summary>
-public int[] DialogueOptionId;
-
-
-		/// <summary>
-		///是否结束对话 如果有选项需要填这个字段
-		/// </summary>
-public bool isEnd;
-
-
-	}
-
-}
-// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DialogueConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: WSkc5iivUSgdHHQXWpffKVXiJMayk2qmo0883Ued0a47pmyFjx9nfgKXYg1L
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/DialogueOptionConfig.cs

@@ -1,38 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\DialogueConfig.xlsx. SheetName: DialogueOptionConfig
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "DialogueOptionConfig.json")]
-	public partial class DialogueOptionConfigHolder : ConfigHolder<DialogueOptionConfig>
	{
-	}
-
-
-	[Serializable]
-	public struct DialogueOptionConfig : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///ID
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///选项文本
-		/// </summary>
-public int LanguageId;
-
-
-		/// <summary>
-		///下一节点ID 如果没有后续对话可以填0
-		/// </summary>
-public int DialogueConfigID;
-
-
-	}
-
-}
-// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/DialogueOptionConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: Cn9Ktnv8VX+YAbKlIVevrDIK05tDWrgRPlyD9dUG6uk+bFMXflGq6f6HOozb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -21,9 +21,45 @@ public int ID;
 
 
 		/// <summary>
-		///条件运算 1 =大于等于 2 =等于 3=小于等于
+		///文本语言表ID
 		/// </summary>
-public int operation;
+public int LanID;
+
+
+		/// <summary>
+		///事件类型 1=提供选项 2=进入战斗 3=直接获得奖励 4=条件判断后进入战斗 5=条件判断后获得奖励
+		/// </summary>
+public int optionType;
+
+
+		/// <summary>
+		///事件常量1 1=事件IDs 2=战斗ID 3= 4=条件类型s 5=条件类型s
+		/// </summary>
+public int[] optionPara1;
+
+
+		/// <summary>
+		///事件常量2 1=事件选择文本IDs 2= 3= 4=条件数值s 5=条件数值s
+		/// </summary>
+public int[] optionPara2;
+
+
+		/// <summary>
+		///事件结局奖励
+		/// </summary>
+public int[] PrizeIDs;
+
+
+		/// <summary>
+		///事件结局奖励数量
+		/// </summary>
+public int[] PrizeNums;
+
+
+		/// <summary>
+		///事件结局文本
+		/// </summary>
+public int[] ResultLanID;
 
 
 	}

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -21,13 +21,13 @@ public int ID;
 
 
 		/// <summary>
-		///事件类型： 1.获得奖励 2.触发战斗
+		///事件的起始ID
 		/// </summary>
 public int EventType;
 
 
 		/// <summary>
-		///触发事件类型： 1.场景事件 2.随机事件 3.通用事件
+		///触发事件类型： 1.循环事件 2.一次性事件
 		/// </summary>
 public int EventTriggerType;
 
@@ -38,12 +38,6 @@ public int EventTriggerType;
 public int EventQuality;
 
 
-		/// <summary>
-		///事件次数 -1无限
-		/// </summary>
-public int EventCompleteCount;
-
-
 		/// <summary>
 		///触发条件类型
 		/// </summary>
@@ -62,12 +56,6 @@ public int[] EventVlaue;
 public int Description;
 
 
-		/// <summary>
-		///对话ID
-		/// </summary>
-public int DialogueID;
-
-
 		/// <summary>
 		///特殊功能参数
 		/// </summary>

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -116,7 +116,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance && distance < 225f)
+                if (distance < minDistance && distance < 400)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -37,8 +37,9 @@ namespace GameLogic.Combat.Hero.State
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5: 5;
             float x = myCombatMagicWeaponEntity.useIndex*1.5f;
 
-
-            endPos = startPos + new Vector3(x-3, y, 0);
+            endPos= myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
+                new Vector3(x - 3, y, 0));
+            // endPos = startPos +  Vector3(x-3, y, 0);
             _addTime = 1.0f / (Vector3.Distance(startPos, endPos) / CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopSpeed);
             _currTime = 0;
             isUpdate = true;

Assets/Scripts/GameLogic/EventManager/EventManager.cs

@@ -32,7 +32,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         // 获取通用事件
-        List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 3 && CanTriggerEvent(e.ID) && e.EventQuality == quality).ToList();
+        List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality).ToList();
 
 
         //神识场景事件
@@ -46,7 +46,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         var triggeredEvents = new List<EventConfig>();
-        for (int i = 0; i >= divineSenseConfig.DetectEventCount; i++)
+        for (int i = 0; i < divineSenseConfig.DetectEventCount; i++)
         {
             int randomValue1 = Random.Range(0, 101);
             //刷场景事件
@@ -57,7 +57,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 triggeredEvents.Add(candidateEvents[randomValue2]);
                 candidateEvents.RemoveAll(ew => ew.ID == candidateEvents[randomValue2].ID);
             }
-            else
+            else if (globalEvents.Count > 0)
             {
                 int randomValue2 = Random.Range(0, globalEvents.Count);
 
@@ -107,10 +107,10 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public void TriggerEvent(EventConfig evt)
     {
         Debug.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
-        if (evt.DialogueID > 0)
-        {
-            // DialogueManager.Instance.StartDialogue(evt.DialogueID, evt.ID);
-        }
+        // if (evt.DialogueID > 0)
+        // {
+        // DialogueManager.Instance.StartDialogue(evt.DialogueID, evt.ID);
+        // }
 
         CompleteEvent(evt.ID);
     }
@@ -153,7 +153,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
 
-        return false;
+        return true;
     }
 
     /// <summary>
@@ -163,7 +163,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public void CompleteEvent(int eventID)
     {
         LogTool.Log($"完成任务{eventID}");
-        AccountFileInfo.EventData eventData =  AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventID);
+        AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventID);
         if (eventData == null)
         {
             eventData = new AccountFileInfo.EventData();
@@ -173,6 +173,5 @@ public class EventSystemManager : Singleton<EventSystemManager>
         eventData.completeCount++;
         AccountFileInfo.Instance.playerData.events.Add(eventData);
         AccountFileInfo.Instance.SavePlayerData();
-        
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -30,6 +30,7 @@ public class PlayerManager : Singleton<PlayerManager>
         SetConfigs();
         AccountFileInfo.Instance.LoadPlayerData();
         InitGameData();
+        EventSystemManager.Instance.CustomInit();
     }
 
     private void SetConfigs()

Assets/Scripts/GameUI/DialogueManager/DialogueManager.cs

@@ -17,14 +17,14 @@ public class DialogueManager : Singleton<DialogueManager>
     private int currentNodeID;
     private int currentEventID;
 
-    private List<DialogueConfig> dialogueConfigs;
-    private List<DialogueOptionConfig> dialogueOptionConfigs;
+    // private List<DialogueConfig> dialogueConfigs;
+    // private List<DialogueOptionConfig> dialogueOptionConfigs;
 
 
     public void CustomInit()
     {
-        dialogueConfigs = ConfigComponent.Instance.GetAll<DialogueConfig>().ToList();
-        dialogueOptionConfigs = ConfigComponent.Instance.GetAll<DialogueOptionConfig>().ToList();
+        // dialogueConfigs = ConfigComponent.Instance.GetAll<DialogueConfig>().ToList();
+        // dialogueOptionConfigs = ConfigComponent.Instance.GetAll<DialogueOptionConfig>().ToList();
     }
 
     /// <summary>
@@ -44,20 +44,20 @@ public class DialogueManager : Singleton<DialogueManager>
     private void ShowDialogue()
     {
         //找到当前对话组
-        var dialogueConfig = dialogueConfigs.Find(n =>
-            n.ID == currentDialogueID && n.GroupId == currentNodeID);
-        if (dialogueConfig.ID == 0)
-        {
-            EndDialogue();
-            return;
-        }
+        // var dialogueConfig = dialogueConfigs.Find(n =>
+        //     n.ID == currentDialogueID && n.GroupId == currentNodeID);
+        // if (dialogueConfig.ID == 0)
+        // {
+        //     EndDialogue();
+        //     return;
+        // }
 
 
         //todo 加载对话ui
-        DialoguePanel.OpenDialoguePanel(dialogueConfig.Content, null, ShowDialogueEventData.MessageShowType.Default, () =>
-        {
-
-        });
+        // DialoguePanel.OpenDialoguePanel(dialogueConfig.Content, null, ShowDialogueEventData.MessageShowType.Default, () =>
+        // {
+        //
+        // });
         currentNodeID++;
     }
 
@@ -67,22 +67,22 @@ public class DialogueManager : Singleton<DialogueManager>
     /// <param name="optionID">选项ID</param>
     public void SelectOption(int optionID)
     {
-        var option = dialogueOptionConfigs.Find(o => o.ID == optionID);
-        if (option.ID == 0)
-        {
-            EndDialogue();
-            return;
-        }
-
-        if (option.DialogueConfigID > 0)
-        {
-            currentNodeID = option.DialogueConfigID;
-            ShowDialogue();
-        }
-        else
-        {
-            EndDialogue();
-        }
+        // var option = dialogueOptionConfigs.Find(o => o.ID == optionID);
+        // if (option.ID == 0)
+        // {
+        //     EndDialogue();
+        //     return;
+        // }
+        //
+        // if (option.DialogueConfigID > 0)
+        // {
+        //     currentNodeID = option.DialogueConfigID;
+        //     ShowDialogue();
+        // }
+        // else
+        // {
+        //     EndDialogue();
+        // }
     }
 
     /// <summary>

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615