新手引导

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/EventLinkConfig.json

@@ -8604,10 +8604,7 @@
       "DialogueType": 0,
       "EventID": 1016,
       "optionType": 0,
-      "ResultType": 3,
-      "ResultOptions": [
-        30009
-      ]
+      "ResultType": 0
     },
     {
       "ID": 101701,
@@ -20655,6 +20652,1680 @@
       "EventID": 9146,
       "optionType": 0,
       "ResultType": 0
+    },
+    {
+      "ID": 914701,
+      "conciseEventMessage": 6474,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6475
+      ],
+      "DialogueType": 0,
+      "EventID": 9147,
+      "optionType": 1,
+      "optionPara1": [
+        914702,
+        914703,
+        914704
+      ],
+      "optionPara2": [
+        6476,
+        6477,
+        6478
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        914702
+      ]
+    },
+    {
+      "ID": 914702,
+      "conciseEventMessage": 6474,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6479
+      ],
+      "DialogueType": 0,
+      "EventID": 9147,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914703,
+      "conciseEventMessage": 6474,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6480
+      ],
+      "DialogueType": 0,
+      "EventID": 9147,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914704,
+      "conciseEventMessage": 6474,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6481
+      ],
+      "DialogueType": 0,
+      "EventID": 9147,
+      "optionType": 0,
+      "ResultType": 3,
+      "ResultOptions": [
+        101
+      ]
+    },
+    {
+      "ID": 914801,
+      "conciseEventMessage": 6482,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6483
+      ],
+      "DialogueType": 0,
+      "EventID": 9148,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914802
+      ]
+    },
+    {
+      "ID": 914802,
+      "conciseEventMessage": 6482,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6484
+      ],
+      "DialogueType": 0,
+      "EventID": 9148,
+      "optionType": 1,
+      "optionPara1": [
+        914803,
+        914803,
+        914804
+      ],
+      "optionPara2": [
+        6485,
+        6486,
+        6487
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        914803
+      ]
+    },
+    {
+      "ID": 914803,
+      "conciseEventMessage": 6482,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6488
+      ],
+      "DialogueType": 0,
+      "EventID": 9148,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 914804,
+      "conciseEventMessage": 6482,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6489
+      ],
+      "DialogueType": 0,
+      "EventID": 9148,
+      "optionType": 0,
+      "ResultType": 3,
+      "ResultOptions": [
+        101
+      ]
+    },
+    {
+      "ID": 914901,
+      "conciseEventMessage": 6490,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6491
+      ],
+      "DialogueType": 0,
+      "EventID": 9149,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914902
+      ]
+    },
+    {
+      "ID": 914902,
+      "conciseEventMessage": 6490,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6492
+      ],
+      "DialogueType": 0,
+      "EventID": 9149,
+      "optionType": 1,
+      "optionPara1": [
+        914903,
+        914903,
+        914903
+      ],
+      "optionPara2": [
+        6493,
+        6494,
+        6495
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        914903
+      ]
+    },
+    {
+      "ID": 914903,
+      "conciseEventMessage": 6490,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6496
+      ],
+      "DialogueType": 0,
+      "EventID": 9149,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        914905
+      ]
+    },
+    {
+      "ID": 914904,
+      "conciseEventMessage": 6490,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 146,
+      "LanID": [
+        6497
+      ],
+      "DialogueType": 0,
+      "EventID": 9149,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        101
+      ]
+    },
+    {
+      "ID": 914905,
+      "conciseEventMessage": 6490,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6498
+      ],
+      "DialogueType": 0,
+      "EventID": 9149,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915001,
+      "conciseEventMessage": 6499,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6500
+      ],
+      "DialogueType": 0,
+      "EventID": 9150,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915002
+      ]
+    },
+    {
+      "ID": 915002,
+      "conciseEventMessage": 6499,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6501
+      ],
+      "DialogueType": 0,
+      "EventID": 9150,
+      "optionType": 1,
+      "optionPara1": [
+        915003,
+        915004,
+        915005
+      ],
+      "optionPara2": [
+        6502,
+        6503,
+        6504
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915003
+      ]
+    },
+    {
+      "ID": 915003,
+      "conciseEventMessage": 6499,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6505
+      ],
+      "DialogueType": 0,
+      "EventID": 9150,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915004,
+      "conciseEventMessage": 6499,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6506
+      ],
+      "DialogueType": 0,
+      "EventID": 9150,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915005,
+      "conciseEventMessage": 6499,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6507
+      ],
+      "DialogueType": 0,
+      "EventID": 9150,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915101,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6509
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915102
+      ]
+    },
+    {
+      "ID": 915102,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6510
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 1,
+      "optionPara1": [
+        915103,
+        915105,
+        915107
+      ],
+      "optionPara2": [
+        6511,
+        6512,
+        6513
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915103
+      ]
+    },
+    {
+      "ID": 915103,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6514
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915104
+      ]
+    },
+    {
+      "ID": 915104,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6515
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915105,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6516
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915106
+      ]
+    },
+    {
+      "ID": 915106,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6517
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915107,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6518
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915108
+      ]
+    },
+    {
+      "ID": 915108,
+      "conciseEventMessage": 6508,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6519
+      ],
+      "DialogueType": 0,
+      "EventID": 9151,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915201,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6521
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915202
+      ]
+    },
+    {
+      "ID": 915202,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6522
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 1,
+      "optionPara1": [
+        915203,
+        915205,
+        915207
+      ],
+      "optionPara2": [
+        6523,
+        6524,
+        6525
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915203
+      ]
+    },
+    {
+      "ID": 915203,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6526
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915204
+      ]
+    },
+    {
+      "ID": 915204,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6527
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915205,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6528
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915206
+      ]
+    },
+    {
+      "ID": 915206,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6529
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915207,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6530
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915208
+      ]
+    },
+    {
+      "ID": 915208,
+      "conciseEventMessage": 6520,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6531
+      ],
+      "DialogueType": 0,
+      "EventID": 9152,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915301,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6533
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915302
+      ]
+    },
+    {
+      "ID": 915302,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6534
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 1,
+      "optionPara1": [
+        915303,
+        915305,
+        915307
+      ],
+      "optionPara2": [
+        6535,
+        6536,
+        6537
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915303
+      ]
+    },
+    {
+      "ID": 915303,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6538
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915304
+      ]
+    },
+    {
+      "ID": 915304,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6539
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915305,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6540
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915306
+      ]
+    },
+    {
+      "ID": 915306,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6541
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915307,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        6542
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915308
+      ]
+    },
+    {
+      "ID": 915308,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6543
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915309
+      ]
+    },
+    {
+      "ID": 915309,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6544
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915310
+      ]
+    },
+    {
+      "ID": 915310,
+      "conciseEventMessage": 6532,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6545
+      ],
+      "DialogueType": 0,
+      "EventID": 9153,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915401,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6547
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915402
+      ]
+    },
+    {
+      "ID": 915402,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6548
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915403
+      ]
+    },
+    {
+      "ID": 915403,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6549
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915404
+      ]
+    },
+    {
+      "ID": 915404,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6550
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915405
+      ]
+    },
+    {
+      "ID": 915405,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6551
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915406
+      ]
+    },
+    {
+      "ID": 915406,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6552
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915407
+      ]
+    },
+    {
+      "ID": 915407,
+      "conciseEventMessage": 6546,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6553
+      ],
+      "DialogueType": 0,
+      "EventID": 9154,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915501,
+      "conciseEventMessage": 6554,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6555
+      ],
+      "DialogueType": 0,
+      "EventID": 9155,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915502
+      ]
+    },
+    {
+      "ID": 915502,
+      "conciseEventMessage": 6554,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 148,
+      "LanID": [
+        6556
+      ],
+      "DialogueType": 0,
+      "EventID": 9155,
+      "optionType": 1,
+      "optionPara1": [
+        915503,
+        915504,
+        915505
+      ],
+      "optionPara2": [
+        6557,
+        6558,
+        6559
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915503
+      ]
+    },
+    {
+      "ID": 915503,
+      "conciseEventMessage": 6554,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 148,
+      "LanID": [
+        6560
+      ],
+      "DialogueType": 0,
+      "EventID": 9155,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915504,
+      "conciseEventMessage": 6554,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 148,
+      "LanID": [
+        6561
+      ],
+      "DialogueType": 0,
+      "EventID": 9155,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915505,
+      "conciseEventMessage": 6554,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 148,
+      "LanID": [
+        6562
+      ],
+      "DialogueType": 0,
+      "EventID": 9155,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915601,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 149,
+      "LanID": [
+        6564
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915602
+      ]
+    },
+    {
+      "ID": 915602,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6565
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 1,
+      "optionPara1": [
+        915603,
+        915604,
+        915606
+      ],
+      "optionPara2": [
+        6566,
+        6567,
+        6568
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915603
+      ]
+    },
+    {
+      "ID": 915603,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 149,
+      "LanID": [
+        6569
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 1,
+      "optionPara1": [
+        915605,
+        915606
+      ],
+      "optionPara2": [
+        6570,
+        6571
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915604
+      ]
+    },
+    {
+      "ID": 915604,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6572
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915607
+      ]
+    },
+    {
+      "ID": 915605,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6573
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915606
+      ]
+    },
+    {
+      "ID": 915606,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6574
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        915607
+      ]
+    },
+    {
+      "ID": 915607,
+      "conciseEventMessage": 6563,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6575
+      ],
+      "DialogueType": 0,
+      "EventID": 9156,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915701,
+      "conciseEventMessage": 6576,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 150,
+      "LanID": [
+        6577
+      ],
+      "DialogueType": 0,
+      "EventID": 9157,
+      "optionType": 1,
+      "optionPara1": [
+        915702,
+        915703,
+        915704
+      ],
+      "optionPara2": [
+        6578,
+        6579,
+        6580
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915702
+      ]
+    },
+    {
+      "ID": 915702,
+      "conciseEventMessage": 6576,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6581
+      ],
+      "DialogueType": 0,
+      "EventID": 9157,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915703,
+      "conciseEventMessage": 6576,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6582
+      ],
+      "DialogueType": 0,
+      "EventID": 9157,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915704,
+      "conciseEventMessage": 6576,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6583
+      ],
+      "DialogueType": 0,
+      "EventID": 9157,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915801,
+      "conciseEventMessage": 6584,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6585
+      ],
+      "DialogueType": 0,
+      "EventID": 9158,
+      "optionType": 1,
+      "optionPara1": [
+        915802,
+        915803,
+        915804
+      ],
+      "optionPara2": [
+        6586,
+        6587,
+        6588
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915802
+      ]
+    },
+    {
+      "ID": 915802,
+      "conciseEventMessage": 6584,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6589
+      ],
+      "DialogueType": 0,
+      "EventID": 9158,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915803,
+      "conciseEventMessage": 6584,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6590
+      ],
+      "DialogueType": 0,
+      "EventID": 9158,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915804,
+      "conciseEventMessage": 6584,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6591
+      ],
+      "DialogueType": 0,
+      "EventID": 9158,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915901,
+      "conciseEventMessage": 6592,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6593
+      ],
+      "DialogueType": 0,
+      "EventID": 9159,
+      "optionType": 1,
+      "optionPara1": [
+        915902,
+        915903,
+        915904
+      ],
+      "optionPara2": [
+        6594,
+        6595,
+        6596
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915902
+      ]
+    },
+    {
+      "ID": 915902,
+      "conciseEventMessage": 6592,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6597
+      ],
+      "DialogueType": 0,
+      "EventID": 9159,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915903,
+      "conciseEventMessage": 6592,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6598
+      ],
+      "DialogueType": 0,
+      "EventID": 9159,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 915904,
+      "conciseEventMessage": 6592,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6599
+      ],
+      "DialogueType": 0,
+      "EventID": 9159,
+      "optionType": 2,
+      "optionPara1": [
+        4026
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        915905,
+        101
+      ]
+    },
+    {
+      "ID": 916001,
+      "conciseEventMessage": 6600,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6601
+      ],
+      "DialogueType": 0,
+      "EventID": 9160,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        916002
+      ]
+    },
+    {
+      "ID": 916002,
+      "conciseEventMessage": 6600,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 153,
+      "LanID": [
+        6602
+      ],
+      "DialogueType": 0,
+      "EventID": 9160,
+      "optionType": 1,
+      "optionPara1": [
+        916003,
+        916004,
+        916005
+      ],
+      "optionPara2": [
+        6603,
+        6604,
+        6605
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        916003
+      ]
+    },
+    {
+      "ID": 916003,
+      "conciseEventMessage": 6600,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6606
+      ],
+      "DialogueType": 0,
+      "EventID": 9160,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916004,
+      "conciseEventMessage": 6600,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6607
+      ],
+      "DialogueType": 0,
+      "EventID": 9160,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916005,
+      "conciseEventMessage": 6600,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6608
+      ],
+      "DialogueType": 0,
+      "EventID": 9160,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916101,
+      "conciseEventMessage": 6609,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6610
+      ],
+      "DialogueType": 0,
+      "EventID": 9161,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        916102
+      ]
+    },
+    {
+      "ID": 916102,
+      "conciseEventMessage": 6609,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 154,
+      "LanID": [
+        6611
+      ],
+      "DialogueType": 0,
+      "EventID": 9161,
+      "optionType": 1,
+      "optionPara1": [
+        916103,
+        916104,
+        916105
+      ],
+      "optionPara2": [
+        6612,
+        6613,
+        6614
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        916103
+      ]
+    },
+    {
+      "ID": 916103,
+      "conciseEventMessage": 6609,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6615
+      ],
+      "DialogueType": 0,
+      "EventID": 9161,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916104,
+      "conciseEventMessage": 6609,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6616
+      ],
+      "DialogueType": 0,
+      "EventID": 9161,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916105,
+      "conciseEventMessage": 6609,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6617
+      ],
+      "DialogueType": 0,
+      "EventID": 9161,
+      "optionType": 0,
+      "ResultType": 0
+    },
+    {
+      "ID": 916201,
+      "conciseEventMessage": 6618,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6619
+      ],
+      "DialogueType": 0,
+      "EventID": 9162,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        916202
+      ]
+    },
+    {
+      "ID": 916202,
+      "conciseEventMessage": 6618,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6620
+      ],
+      "DialogueType": 0,
+      "EventID": 9162,
+      "optionType": 1,
+      "optionPara1": [
+        916203,
+        916204,
+        916205
+      ],
+      "optionPara2": [
+        6621,
+        6622,
+        6623
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        916203
+      ]
+    },
+    {
+      "ID": 916203,
+      "conciseEventMessage": 6618,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6624
+      ],
+      "DialogueType": 0,
+      "EventID": 9162,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        916204
+      ]
+    },
+    {
+      "ID": 916204,
+      "conciseEventMessage": 6618,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6625
+      ],
+      "DialogueType": 0,
+      "EventID": 9162,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        916205
+      ]
+    },
+    {
+      "ID": 916205,
+      "conciseEventMessage": 6618,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 147,
+      "LanID": [
+        6626
+      ],
+      "DialogueType": 0,
+      "EventID": 9162,
+      "optionType": 0,
+      "ResultType": 0
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -341,6 +341,60 @@
       "name": 0,
       "icon": "",
       "DaoyouID": 0
+    },
+    {
+      "ID": 146,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 147,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 148,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 149,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 150,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 151,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 152,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 153,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 154,
+      "name": 0,
+      "icon": "",
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -14166,67 +14166,67 @@
     },
     {
       "ID": 4282,
-      "txt": ""
+      "txt": "发光的鱼"
     },
     {
       "ID": 4283,
-      "txt": ""
+      "txt": "发光的鱼2"
     },
     {
       "ID": 4284,
-      "txt": ""
+      "txt": "发光的鱼3"
     },
     {
       "ID": 4285,
-      "txt": ""
+      "txt": "自称剑仙的石头"
     },
     {
       "ID": 4286,
-      "txt": ""
+      "txt": "石精的赌局"
     },
     {
       "ID": 4287,
-      "txt": ""
+      "txt": "石头精的不服"
     },
     {
       "ID": 4288,
-      "txt": ""
+      "txt": "石头精的作弊"
     },
     {
       "ID": 4289,
-      "txt": ""
+      "txt": "石头精"
     },
     {
       "ID": 4290,
-      "txt": ""
+      "txt": "胆小的雷霆兽"
     },
     {
       "ID": 4291,
-      "txt": ""
+      "txt": "自称神兽的蚊子"
     },
     {
       "ID": 4292,
-      "txt": ""
+      "txt": "折翅的灵雀"
     },
     {
       "ID": 4293,
-      "txt": ""
+      "txt": "守墓的老犬"
     },
     {
       "ID": 4294,
-      "txt": ""
+      "txt": "被困的萤火虫"
     },
     {
       "ID": 4295,
-      "txt": ""
+      "txt": "掉牙的小妖"
     },
     {
       "ID": 4296,
-      "txt": ""
+      "txt": "藏石的老乌龟"
     },
     {
       "ID": 4297,
-      "txt": ""
+      "txt": "奇怪的歌声"
     },
     {
       "ID": 4298,
@@ -22934,19 +22934,19 @@
     },
     {
       "ID": 6474,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6475,
-      "txt": ""
+      "txt": "一条大眼睛的鱼扑腾冒头，居然开口说话：\n “仙长啊！小鱼本是鲤族，误吞污水，灵脉受损，如今奄奄一息……若有灵丹一颗，或许能续命！”\n 鱼还挤了几滴“眼泪”，浮在水面打滚。"
     },
     {
       "ID": 6476,
-      "txt": ""
+      "txt": "给它 1 颗增元丹"
     },
     {
       "ID": 6477,
-      "txt": ""
+      "txt": "给它 2 颗增元丹"
     },
     {
       "ID": 6478,
@@ -22954,35 +22954,35 @@
     },
     {
       "ID": 6479,
-      "txt": ""
+      "txt": "鱼激动得直翻白肚皮，多谢仙长！小鱼会记下这份恩德！"
     },
     {
       "ID": 6480,
-      "txt": ""
+      "txt": "鱼两眼放光，两颗！仙长大恩大德，小鱼来世当牛做马报答！"
     },
     {
       "ID": 6481,
-      "txt": ""
+      "txt": "愣了下，翻个身装死：“呃……好吧，真是冷漠……”\n 鱼还挤了几滴“眼泪”，浮在水面打滚。"
     },
     {
       "ID": 6482,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6483,
-      "txt": ""
+      "txt": "那条鱼又蹦了出来"
     },
     {
       "ID": 6484,
-      "txt": ""
+      "txt": "仙长！上回的灵丹果然救了我，可是——咳咳！丹力不够，小鱼差点没挺过来，再给一颗吧？就一颗！"
     },
     {
       "ID": 6485,
-      "txt": ""
+      "txt": "再给1颗"
     },
     {
       "ID": 6486,
-      "txt": ""
+      "txt": "再给2颗"
     },
     {
       "ID": 6487,
@@ -22990,31 +22990,31 @@
     },
     {
       "ID": 6488,
-      "txt": ""
+      "txt": "鱼立刻精神百倍，翻腾打滚：“仙长真是鱼界福星！”"
     },
     {
       "ID": 6489,
-      "txt": ""
+      "txt": "（委屈巴巴）仙长竟不信我！呜呜呜——那小鱼就此别过！”"
     },
     {
       "ID": 6490,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6491,
-      "txt": ""
+      "txt": "水面灵光一闪，鱼浑身金鳞微现，竟露出“即将化龙”的气象。"
     },
     {
       "ID": 6492,
-      "txt": ""
+      "txt": "“仙长！这就是最后一步！只需再得一颗灵丹，小鱼必定飞升成龙，到时定感激图报！”"
     },
     {
       "ID": 6493,
-      "txt": ""
+      "txt": "再给1颗"
     },
     {
       "ID": 6494,
-      "txt": ""
+      "txt": "再给2颗"
     },
     {
       "ID": 6495,
@@ -23022,35 +23022,35 @@
     },
     {
       "ID": 6496,
-      "txt": ""
+      "txt": "鱼猛地吸收灵丹，身上金光大作，随即一个猛子钻入水中，再没露头。只留下回声：“哈哈哈哈！真是个傻子！”"
     },
     {
       "ID": 6497,
-      "txt": ""
+      "txt": "鱼僵在水里尴尬：“呃……仙长真冷漠……那小鱼走了……”"
     },
     {
       "ID": 6498,
-      "txt": ""
+      "txt": "你似乎被耍了"
     },
     {
       "ID": 6499,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6500,
-      "txt": ""
+      "txt": "神识探查到一块巨石，忽然传出声音：\n “吾曾为剑仙！因修炼出了差错，如今化作顽石。只要给我些灵气，我必重现昔日锋芒！”"
     },
     {
       "ID": 6501,
-      "txt": ""
+      "txt": "巨石震得嗡嗡作响，看上去倒像在撒娇。"
     },
     {
       "ID": 6502,
-      "txt": ""
+      "txt": "【输入一丝灵气】消耗1颗修为丹"
     },
     {
       "ID": 6503,
-      "txt": ""
+      "txt": "【狠狠一脚踢它】"
     },
     {
       "ID": 6504,
@@ -23058,35 +23058,35 @@
     },
     {
       "ID": 6505,
-      "txt": ""
+      "txt": "石头颤抖几下，吐出一句：“嗯…舒服！下次记得再来！”然后一动不动。"
     },
     {
       "ID": 6506,
-      "txt": ""
+      "txt": "石头怒吼：“欺剑仙太甚！”随即崩裂成碎石，掉出一只石头虫，爬走了。（碎石里有不少灵石）"
     },
     {
       "ID": 6507,
-      "txt": ""
+      "txt": "石头小声嘀咕：“没人理我，好寂寞……”"
     },
     {
       "ID": 6508,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6509,
-      "txt": ""
+      "txt": "神识捕捉到一块奇怪的石头。它忽然“咔”地裂开，露出一张憨厚的脸"
     },
     {
       "ID": 6510,
-      "txt": ""
+      "txt": "“嘿嘿，仙长，要不要跟我赌一场？猜拳！赢了我给你灵石，输了你给我灵石！”石头精兴奋地挥着自己唯一的拳头。"
     },
     {
       "ID": 6511,
-      "txt": ""
+      "txt": "283. 【出石头】"
     },
     {
       "ID": 6512,
-      "txt": ""
+      "txt": "2. 【出剪刀】"
     },
     {
       "ID": 6513,
@@ -23094,47 +23094,47 @@
     },
     {
       "ID": 6514,
-      "txt": ""
+      "txt": "「我也出石头！」"
     },
     {
       "ID": 6515,
-      "txt": ""
+      "txt": "平手！不算不算，再来一次！"
     },
     {
       "ID": 6516,
-      "txt": ""
+      "txt": "剪刀！"
     },
     {
       "ID": 6517,
-      "txt": ""
+      "txt": "拳头！赢啦！灵石，快拿来！"
     },
     {
       "ID": 6518,
-      "txt": ""
+      "txt": "哼，你只有拳头，那我出布"
     },
     {
       "ID": 6519,
-      "txt": ""
+      "txt": "啊？这……不公平啊！- 它勉强掏出几颗灵石递上来。"
     },
     {
       "ID": 6520,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6521,
-      "txt": ""
+      "txt": "神识又捕捉到那块石头，它气呼呼地蹦出来。它勉强掏出几颗灵石递上来。"
     },
     {
       "ID": 6522,
-      "txt": ""
+      "txt": "仙长！上次算我大意！这次我一定能赢！” 它还是挥舞着那只拳头……"
     },
     {
       "ID": 6523,
-      "txt": ""
+      "txt": "再出布"
     },
     {
       "ID": 6524,
-      "txt": ""
+      "txt": "出石头"
     },
     {
       "ID": 6525,
@@ -23142,47 +23142,47 @@
     },
     {
       "ID": 6526,
-      "txt": ""
+      "txt": "老套路，你还是拳头吧？来。"
     },
     {
       "ID": 6527,
-      "txt": ""
+      "txt": "可恶，又输了！石头精羞愤难当"
     },
     {
       "ID": 6528,
-      "txt": ""
+      "txt": "好吧，这次我出石头。"
     },
     {
       "ID": 6529,
-      "txt": ""
+      "txt": "嘿嘿，平局！仙长果然讲义气！"
     },
     {
       "ID": 6530,
-      "txt": ""
+      "txt": "还是剪刀！"
     },
     {
       "ID": 6531,
-      "txt": ""
+      "txt": "拳头赢啦！快快交灵石！"
     },
     {
       "ID": 6532,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6533,
-      "txt": ""
+      "txt": "神识探到，那块石头正鬼鬼祟祟画着什么。见到你，它立刻站直，神情自信"
     },
     {
       "ID": 6534,
-      "txt": ""
+      "txt": "仙长！这次我学会了新招数！我可不止拳头了"
     },
     {
       "ID": 6535,
-      "txt": ""
+      "txt": "出剪刀"
     },
     {
       "ID": 6536,
-      "txt": ""
+      "txt": "出石头"
     },
     {
       "ID": 6537,
@@ -23190,87 +23190,87 @@
     },
     {
       "ID": 6538,
-      "txt": ""
+      "txt": "剪刀，对付你画的‘布’"
     },
     {
       "ID": 6539,
-      "txt": ""
+      "txt": "（大笑）骗到你了！我还是拳头！"
     },
     {
       "ID": 6540,
-      "txt": ""
+      "txt": "我也出石头。"
     },
     {
       "ID": 6541,
-      "txt": ""
+      "txt": "哈哈！平手，但这次我至少不输！"
     },
     {
       "ID": 6542,
-      "txt": ""
+      "txt": "石头精，你再怎么装，终究还是拳头。"
     },
     {
       "ID": 6543,
-      "txt": ""
+      "txt": "石头精一愣，咬牙切齿，最后瘫倒在地"
     },
     {
       "ID": 6544,
-      "txt": ""
+      "txt": "仙长太狡猾了……我认输。"
     },
     {
       "ID": 6545,
-      "txt": ""
+      "txt": "它掏出一堆灵石，嘀咕着：我还是去练习别的游戏吧……"
     },
     {
       "ID": 6546,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6547,
-      "txt": ""
+      "txt": "石头精抱着一堆灵石，愣愣地看着你。"
     },
     {
       "ID": 6548,
-      "txt": ""
+      "txt": "仙长……你每次都输。"
     },
     {
       "ID": 6549,
-      "txt": ""
+      "txt": "我……我本来是想多赢几次灵石的，可你总是出剪刀，好像是……故意让我赢的？"
     },
     {
       "ID": 6550,
-      "txt": ""
+      "txt": "它小心翼翼地把灵石推到你面前"
     },
     {
       "ID": 6551,
-      "txt": ""
+      "txt": "这些……还是还给你吧。我石头精傻是傻，但也知道，若不是你让我，哪有我连赢三次的道理？仙长你是个好人，我……我不占你便宜。"
     },
     {
       "ID": 6552,
-      "txt": ""
+      "txt": "石头精憨笑着，身体慢慢沉入土中，最后只留下一句声音"
     },
     {
       "ID": 6553,
-      "txt": ""
+      "txt": "以后……我也要学会输一输，才能算是真正的游戏吧"
     },
     {
       "ID": 6554,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6555,
-      "txt": ""
+      "txt": "一只浑身带电的小兽蜷缩在树洞，神识扫过，它尖叫：“别过来！我会放电的！”"
     },
     {
       "ID": 6556,
-      "txt": ""
+      "txt": "然而它抖得厉害，电花四溅，明显吓坏了。"
     },
     {
       "ID": 6557,
-      "txt": ""
+      "txt": "安抚它：“我不会伤害你”"
     },
     {
       "ID": 6558,
-      "txt": ""
+      "txt": "伸手过去，试探一下"
     },
     {
       "ID": 6559,
@@ -23278,35 +23278,35 @@
     },
     {
       "ID": 6560,
-      "txt": ""
+      "txt": "小兽感动得嗡嗡响，掉下一根带电的胡须给你。"
     },
     {
       "ID": 6561,
-      "txt": ""
+      "txt": "被电得头发炸开，小兽惊叫：“对不起对不起！”"
     },
     {
       "ID": 6562,
-      "txt": ""
+      "txt": "小兽吓晕过去，留下一股焦糊味。"
     },
     {
       "ID": 6563,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6564,
-      "txt": ""
+      "txt": "一只肥大的蚊子在你神识中嗡嗡直叫：\n “大胆修士！吾乃上古神兽转世，赐我些灵丹，我便能恢复真身！”"
     },
     {
       "ID": 6565,
-      "txt": ""
+      "txt": "它拍着翅膀，表情却一本正经"
     },
     {
       "ID": 6566,
-      "txt": ""
+      "txt": "给它一颗灵丹"
     },
     {
       "ID": 6567,
-      "txt": ""
+      "txt": "给它两颗灵丹"
     },
     {
       "ID": 6568,
@@ -23314,47 +23314,47 @@
     },
     {
       "ID": 6569,
-      "txt": ""
+      "txt": "蚊子吸收后体型变大：“再来！再来！我快要恢复了！”"
     },
     {
       "ID": 6570,
-      "txt": ""
+      "txt": "再给它一颗灵丹"
     },
     {
       "ID": 6571,
-      "txt": ""
+      "txt": "直接一巴掌拍死"
     },
     {
       "ID": 6572,
-      "txt": ""
+      "txt": "蚊子吸收后身体开始肿胀起来，不一会儿，爆成一团血雾。"
     },
     {
       "ID": 6573,
-      "txt": ""
+      "txt": "蚊子兴奋变得拳头大小，结果被风一吹，直接拍在岩石上，黏住不动。"
     },
     {
       "ID": 6574,
-      "txt": ""
+      "txt": "你一巴掌拍下去，蚊子爆成一滩血迹"
     },
     {
       "ID": 6575,
-      "txt": ""
+      "txt": "你拯救了无数凡人。"
     },
     {
       "ID": 6576,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6577,
-      "txt": ""
+      "txt": "神识探查到一只小灵雀坠落在林间，翅膀骨折。它虚弱地啾啾叫着，眼中满是祈求。"
     },
     {
       "ID": 6578,
-      "txt": ""
+      "txt": "为它疗伤"
     },
     {
       "ID": 6579,
-      "txt": ""
+      "txt": "无视"
     },
     {
       "ID": 6580,
@@ -23362,31 +23362,31 @@
     },
     {
       "ID": 6581,
-      "txt": ""
+      "txt": "灵雀恢复后绕你飞翔，化作灵光钻入你识海。"
     },
     {
       "ID": 6582,
-      "txt": ""
+      "txt": "灵雀痛苦死去，你心神微受压抑。"
     },
     {
       "ID": 6583,
-      "txt": ""
+      "txt": "你尝试点火，灵雀化作火羽爆散，灼伤神识。"
     },
     {
       "ID": 6584,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6585,
-      "txt": ""
+      "txt": "一只瘦骨嶙峋的老犬趴在一座坟前，眼神坚毅。神识触及，它发出低吼，但尾巴在轻轻摇动。"
     },
     {
       "ID": 6586,
-      "txt": ""
+      "txt": "留下些食物"
     },
     {
       "ID": 6587,
-      "txt": ""
+      "txt": "抚慰它的心灵"
     },
     {
       "ID": 6588,
@@ -23394,31 +23394,31 @@
     },
     {
       "ID": 6589,
-      "txt": ""
+      "txt": "老犬舔了舔食物，眼中闪过光彩，墓上灵气流转。"
     },
     {
       "ID": 6590,
-      "txt": ""
+      "txt": "老犬安静下来，伏地而眠，化作灵气融入大地。"
     },
     {
       "ID": 6591,
-      "txt": ""
+      "txt": "老犬孤独死去，你心头一沉。"
     },
     {
       "ID": 6592,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6593,
-      "txt": ""
+      "txt": "一群萤火虫被困在蛛网中，光点微弱，拼命闪烁，仿佛在呼救。"
     },
     {
       "ID": 6594,
-      "txt": ""
+      "txt": "用灵力解开蛛丝"
     },
     {
       "ID": 6595,
-      "txt": ""
+      "txt": "任其消亡"
     },
     {
       "ID": 6596,
@@ -23426,35 +23426,35 @@
     },
     {
       "ID": 6597,
-      "txt": ""
+      "txt": "萤火虫振翅而飞，化作灵光聚拢，温润你。"
     },
     {
       "ID": 6598,
-      "txt": ""
+      "txt": "光点渐渐熄灭，你心中一阵沉重。"
     },
     {
       "ID": 6599,
-      "txt": ""
+      "txt": "击败蜘蛛"
     },
     {
       "ID": 6600,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6601,
-      "txt": ""
+      "txt": "神识探查到一只小妖在地上嚎啕大哭，手里攥着一颗掉落的尖牙。"
     },
     {
       "ID": 6602,
-      "txt": ""
+      "txt": "“呜呜……我以后还怎么吓人啊？仙长，你能帮帮我吗？”"
     },
     {
       "ID": 6603,
-      "txt": ""
+      "txt": "安慰它，并告诉它掉牙还能再长"
     },
     {
       "ID": 6604,
-      "txt": ""
+      "txt": "送它一颗灵石当“新牙”"
     },
     {
       "ID": 6605,
@@ -23462,35 +23462,35 @@
     },
     {
       "ID": 6606,
-      "txt": ""
+      "txt": "小妖破涕为笑，拍拍屁股跑了，留下一个闪亮的小袋子。"
     },
     {
       "ID": 6607,
-      "txt": ""
+      "txt": "小妖开心极了，把原本偷偷藏着的灵石全给你。"
     },
     {
       "ID": 6608,
-      "txt": ""
+      "txt": "小妖嚎得更大声，掀翻地面，惊跑灵气，你神识受到轻微干扰。"
     },
     {
       "ID": 6609,
-      "txt": ""
+      "txt": "完成对话"
     },
     {
       "ID": 6610,
-      "txt": ""
+      "txt": "只老龟趴在溪水边，神识触及"
     },
     {
       "ID": 6611,
-      "txt": ""
+      "txt": "它慢悠悠说：\n “年轻人，帮我挠挠背，我的壳里有宝贝。”"
     },
     {
       "ID": 6612,
-      "txt": ""
+      "txt": "耐心替它挠"
     },
     {
       "ID": 6613,
-      "txt": ""
+      "txt": "翻翻它的龟壳"
     },
     {
       "ID": 6614,
@@ -23498,15 +23498,15 @@
     },
     {
       "ID": 6615,
-      "txt": ""
+      "txt": "老龟舒服得打瞌睡，壳中滚出几颗灵石。"
     },
     {
       "ID": 6616,
-      "txt": ""
+      "txt": "老龟大怒，猛一甩头把你掀翻，灵石掉进河里。"
     },
     {
       "ID": 6617,
-      "txt": ""
+      "txt": "老龟“哼”了一声，慢慢游走。"
     },
     {
       "ID": 6618,

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();
         }