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

# Conflicts:
#	Assets/Scripts/GameLogic/EventManager/DialogueManager.cs   resolved by origin/master(远端) version

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -82,6 +82,39 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  JumpY:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1.4183592
+      outSlope: 1.4183592
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.5990832
+      value: 0.8497151
+      inSlope: 1.0030364
+      outSlope: 1.0030364
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.48756155
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0.13476646
+      outSlope: 0.13476646
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.5600396
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   fabaoAtt:
     serializedVersion: 2
     m_Curve:

Assets/Res/Config/DivineSenseConfig.json

@@ -3,10 +3,10 @@
     {
       "ID": 1,
       "QualityBonusChance": [
-        400.0,
-        300.0,
-        200.0,
-        100.0,
+        1000.0,
+        0.0,
+        0.0,
+        0.0,
         0.0,
         0.0
       ],
@@ -15,228 +15,228 @@
     {
       "ID": 2,
       "QualityBonusChance": [
-        379.0,
-        305.0,
-        205.0,
-        105.0,
-        4.0,
-        2.0
+        800.0,
+        200.0,
+        0.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 2000
     },
     {
       "ID": 3,
       "QualityBonusChance": [
-        358.0,
-        310.0,
-        210.0,
-        110.0,
-        8.0,
-        4.0
+        550.0,
+        300.0,
+        150.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 3000
     },
     {
       "ID": 4,
       "QualityBonusChance": [
-        337.0,
-        315.0,
-        215.0,
-        115.0,
-        12.0,
-        6.0
+        535.0,
+        310.0,
+        155.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 4000
     },
     {
       "ID": 5,
       "QualityBonusChance": [
-        316.0,
+        520.0,
         320.0,
-        220.0,
-        120.0,
-        16.0,
-        8.0
+        160.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 5000
     },
     {
       "ID": 6,
       "QualityBonusChance": [
-        295.0,
-        325.0,
-        225.0,
-        125.0,
-        20.0,
-        10.0
+        505.0,
+        330.0,
+        165.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 6000
     },
     {
       "ID": 7,
       "QualityBonusChance": [
-        274.0,
-        330.0,
-        230.0,
-        130.0,
-        24.0,
-        12.0
+        490.0,
+        340.0,
+        170.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 7000
     },
     {
       "ID": 8,
       "QualityBonusChance": [
-        253.0,
-        335.0,
-        235.0,
-        135.0,
-        28.0,
-        14.0
+        475.0,
+        350.0,
+        175.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 8000
     },
     {
       "ID": 9,
       "QualityBonusChance": [
-        232.0,
-        340.0,
-        240.0,
-        140.0,
-        32.0,
-        16.0
+        460.0,
+        360.0,
+        180.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 9000
     },
     {
       "ID": 10,
       "QualityBonusChance": [
-        211.0,
-        345.0,
-        245.0,
-        145.0,
-        36.0,
-        18.0
+        445.0,
+        370.0,
+        185.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 10000
     },
     {
       "ID": 11,
       "QualityBonusChance": [
+        430.0,
+        380.0,
         190.0,
-        350.0,
-        250.0,
-        150.0,
-        40.0,
-        20.0
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 11000
     },
     {
       "ID": 12,
       "QualityBonusChance": [
-        169.0,
-        355.0,
-        255.0,
-        155.0,
-        44.0,
-        22.0
+        415.0,
+        390.0,
+        195.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 12000
     },
     {
       "ID": 13,
       "QualityBonusChance": [
-        148.0,
-        360.0,
-        260.0,
-        160.0,
-        48.0,
-        24.0
+        400.0,
+        400.0,
+        200.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 13000
     },
     {
       "ID": 14,
       "QualityBonusChance": [
-        127.0,
-        365.0,
-        265.0,
-        165.0,
-        52.0,
-        26.0
+        385.0,
+        410.0,
+        205.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 14000
     },
     {
       "ID": 15,
       "QualityBonusChance": [
-        106.0,
         370.0,
-        270.0,
-        170.0,
-        56.0,
-        28.0
+        420.0,
+        210.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 15000
     },
     {
       "ID": 16,
       "QualityBonusChance": [
-        85.0,
-        375.0,
-        275.0,
-        175.0,
-        60.0,
-        30.0
+        355.0,
+        430.0,
+        215.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 16000
     },
     {
       "ID": 17,
       "QualityBonusChance": [
-        64.0,
-        380.0,
-        280.0,
-        180.0,
-        64.0,
-        32.0
+        340.0,
+        440.0,
+        220.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 17000
     },
     {
       "ID": 18,
       "QualityBonusChance": [
-        43.0,
-        385.0,
-        285.0,
-        185.0,
-        68.0,
-        34.0
+        325.0,
+        450.0,
+        225.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 18000
     },
     {
       "ID": 19,
       "QualityBonusChance": [
-        22.0,
-        390.0,
-        290.0,
-        190.0,
-        72.0,
-        36.0
+        310.0,
+        460.0,
+        230.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 19000
     },
     {
       "ID": 20,
       "QualityBonusChance": [
-        0.0,
-        395.0,
         295.0,
-        195.0,
-        76.0,
-        39.0
+        470.0,
+        235.0,
+        0.0,
+        0.0,
+        0.0
       ],
       "exp": 20000
     }

Assets/Res/Config/EventConfig.json

@@ -30,7 +30,7 @@
       "ID": 3,
       "EventType": 1020,
       "EventTriggerType": 3,
-      "EventQuality": 1,
+      "EventQuality": 2,
       "EventConditionId": [
         0
       ],
@@ -43,21 +43,21 @@
       "ID": 11,
       "EventType": 10001,
       "EventTriggerType": 2,
-      "EventQuality": null,
+      "EventQuality": 1,
       "Description": null
     },
     {
       "ID": 12,
       "EventType": 10003,
       "EventTriggerType": 2,
-      "EventQuality": null,
+      "EventQuality": 2,
       "Description": null
     },
     {
       "ID": 13,
       "EventType": 10004,
       "EventTriggerType": 2,
-      "EventQuality": null,
+      "EventQuality": 3,
       "Description": null
     }
   ]

Assets/Res/Config/FabaoConfig.json

@@ -7,39 +7,45 @@
       "magicAttribute": 1,
       "model": "fb_yuping",
       "cd": 5.0,
-      "fragmentID": 10120,
-      "Star": 1,
+      "fragmentID": 11001,
+      "Star": 3,
       "ShuxingIDs": [
         1,
         2
       ],
       "ShuxingPara": [
-        100,
+        90,
         10
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        50
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        106,
         101,
+        106,
         102,
+        106,
         103,
-        104,
-        105,
-        106
+        106,
+        101
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        5
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3
       ]
     },
     {
@@ -49,37 +55,43 @@
       "magicAttribute": 1,
       "model": "fb_dao1",
       "cd": 7.0,
-      "fragmentID": 10121,
-      "Star": 2,
+      "fragmentID": 11002,
+      "Star": 3,
       "ShuxingIDs": [
         2
       ],
       "ShuxingPara": [
-        101
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        51
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
-        101,
+        107,
         102,
+        107,
         103,
-        104,
-        105,
-        107
+        107,
+        101,
+        107,
+        102
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        6
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3
       ]
     },
     {
@@ -89,37 +101,43 @@
       "magicAttribute": 1,
       "model": "fb_ding1",
       "cd": 3.0,
-      "fragmentID": 10122,
+      "fragmentID": 11003,
       "Star": 3,
       "ShuxingIDs": [
         3
       ],
       "ShuxingPara": [
-        102
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        52
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        108,
+        103,
+        108,
         101,
+        108,
         102,
-        103,
-        104,
-        105,
-        108
+        108,
+        103
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        7
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3
       ]
     },
     {
@@ -129,37 +147,43 @@
       "magicAttribute": 1,
       "model": "fb_huohulu",
       "cd": 8.0,
-      "fragmentID": 10123,
+      "fragmentID": 11004,
       "Star": 4,
       "ShuxingIDs": [
-        4
+        1
       ],
       "ShuxingPara": [
-        103
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        53
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        109,
         101,
+        109,
         102,
+        109,
         103,
-        104,
-        105,
-        109
+        109,
+        101
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        8
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4
       ]
     },
     {
@@ -169,37 +193,43 @@
       "magicAttribute": 1,
       "model": "fb_jian1",
       "cd": 3.0,
-      "fragmentID": 10124,
-      "Star": 5,
+      "fragmentID": 11005,
+      "Star": 4,
       "ShuxingIDs": [
-        5
+        2
       ],
       "ShuxingPara": [
-        104
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        54
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
-        101,
+        110,
         102,
+        110,
         103,
-        104,
-        105,
-        110
+        110,
+        101,
+        110,
+        102
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        9
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4
       ]
     },
     {
@@ -209,37 +239,43 @@
       "magicAttribute": 1,
       "model": "fb_jian2",
       "cd": 5.0,
-      "fragmentID": 10125,
-      "Star": 6,
+      "fragmentID": 11006,
+      "Star": 4,
       "ShuxingIDs": [
-        6
+        3
       ],
       "ShuxingPara": [
-        105
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        55
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        106,
+        103,
+        106,
         101,
+        106,
         102,
-        103,
-        104,
-        105,
-        111
+        106,
+        103
       ],
       "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        10
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4
       ]
     },
     {
@@ -249,29 +285,33 @@
       "magicAttribute": 1,
       "model": "fb_wulonglun",
       "cd": 7.0,
-      "fragmentID": 10126,
-      "Star": 7,
+      "fragmentID": 11007,
+      "Star": 5,
       "ShuxingIDs": [
-        7
+        1
       ],
       "ShuxingPara": [
-        106
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        56
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        107,
         101,
+        107,
         102,
-        103,
-        104,
-        105,
-        112
+        107,
+        101,
+        107,
+        101
       ],
       "StarupShuxingValues": [
         5,
@@ -279,7 +319,9 @@
         5,
         5,
         5,
-        11
+        5,
+        5,
+        5
       ]
     },
     {
@@ -289,29 +331,33 @@
       "magicAttribute": 1,
       "model": "fb_linglongta",
       "cd": 7.0,
-      "fragmentID": 10127,
-      "Star": 8,
+      "fragmentID": 11008,
+      "Star": 5,
       "ShuxingIDs": [
-        8
+        2
       ],
       "ShuxingPara": [
-        107
+        100
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [
         10,
         20,
-        30,
         40,
-        57
+        60,
+        90,
+        120,
+        150
       ],
       "StarupShuxingIDs": [
+        108,
+        102,
+        108,
         101,
+        108,
         102,
-        103,
-        104,
-        105,
-        113
+        108,
+        102
       ],
       "StarupShuxingValues": [
         5,
@@ -319,7 +365,9 @@
         5,
         5,
         5,
-        12
+        5,
+        5,
+        5
       ]
     }
   ]

Assets/Res/Config/FabaoPowerupConfig.json

@@ -5,7 +5,6 @@
       "Power": 10,
       "HP": 10,
       "DEF": 10,
-      "MP": 10,
       "ATK": 10,
       "PoerupItemIDs": [
         1001
@@ -19,7 +18,6 @@
       "Power": 20,
       "HP": 20,
       "DEF": 20,
-      "MP": 20,
       "ATK": 20,
       "PoerupItemIDs": [
         1001
@@ -33,7 +31,6 @@
       "Power": 30,
       "HP": 30,
       "DEF": 30,
-      "MP": 30,
       "ATK": 30,
       "PoerupItemIDs": [
         1001
@@ -47,7 +44,6 @@
       "Power": 40,
       "HP": 40,
       "DEF": 40,
-      "MP": 40,
       "ATK": 40,
       "PoerupItemIDs": [
         1001
@@ -61,7 +57,6 @@
       "Power": 50,
       "HP": 50,
       "DEF": 50,
-      "MP": 50,
       "ATK": 50,
       "PoerupItemIDs": [
         1001
@@ -75,7 +70,6 @@
       "Power": 60,
       "HP": 60,
       "DEF": 60,
-      "MP": 60,
       "ATK": 60,
       "PoerupItemIDs": [
         1001
@@ -89,7 +83,6 @@
       "Power": 70,
       "HP": 70,
       "DEF": 70,
-      "MP": 70,
       "ATK": 70,
       "PoerupItemIDs": [
         1001
@@ -103,7 +96,6 @@
       "Power": 80,
       "HP": 80,
       "DEF": 80,
-      "MP": 80,
       "ATK": 80,
       "PoerupItemIDs": [
         1001
@@ -117,7 +109,6 @@
       "Power": 90,
       "HP": 90,
       "DEF": 90,
-      "MP": 90,
       "ATK": 90,
       "PoerupItemIDs": [
         1001
@@ -131,7 +122,6 @@
       "Power": 100,
       "HP": 100,
       "DEF": 100,
-      "MP": 100,
       "ATK": 100,
       "PoerupItemIDs": [
         1001
@@ -145,7 +135,6 @@
       "Power": 110,
       "HP": 110,
       "DEF": 110,
-      "MP": 110,
       "ATK": 110,
       "PoerupItemIDs": [
         1001
@@ -159,7 +148,6 @@
       "Power": 120,
       "HP": 120,
       "DEF": 120,
-      "MP": 120,
       "ATK": 120,
       "PoerupItemIDs": [
         1001
@@ -173,7 +161,6 @@
       "Power": 130,
       "HP": 130,
       "DEF": 130,
-      "MP": 130,
       "ATK": 130,
       "PoerupItemIDs": [
         1001
@@ -187,7 +174,6 @@
       "Power": 140,
       "HP": 140,
       "DEF": 140,
-      "MP": 140,
       "ATK": 140,
       "PoerupItemIDs": [
         1001
@@ -201,7 +187,6 @@
       "Power": 150,
       "HP": 150,
       "DEF": 150,
-      "MP": 150,
       "ATK": 150,
       "PoerupItemIDs": [
         1001
@@ -215,7 +200,6 @@
       "Power": 160,
       "HP": 160,
       "DEF": 160,
-      "MP": 160,
       "ATK": 160,
       "PoerupItemIDs": [
         1001
@@ -229,7 +213,6 @@
       "Power": 170,
       "HP": 170,
       "DEF": 170,
-      "MP": 170,
       "ATK": 170,
       "PoerupItemIDs": [
         1001
@@ -243,7 +226,6 @@
       "Power": 180,
       "HP": 180,
       "DEF": 180,
-      "MP": 180,
       "ATK": 180,
       "PoerupItemIDs": [
         1001
@@ -257,7 +239,6 @@
       "Power": 190,
       "HP": 190,
       "DEF": 190,
-      "MP": 190,
       "ATK": 190,
       "PoerupItemIDs": [
         1001
@@ -271,7 +252,6 @@
       "Power": 200,
       "HP": 200,
       "DEF": 200,
-      "MP": 200,
       "ATK": 200,
       "PoerupItemIDs": [
         1001

Assets/Res/Config/ItemConfig.json

@@ -5,8 +5,8 @@
       "itemName": 169,
       "itemDesc": 162,
       "icon": "icon_item_1001",
-      "itemTyp": 1,
-      "quality": 3,
+      "itemTag": 1,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -28,7 +28,7 @@
       "itemName": 170,
       "itemDesc": 163,
       "icon": "icon_item_1002",
-      "itemTyp": 1,
+      "itemTag": 1,
       "quality": 4,
       "stack": 0,
       "isSell": false,
@@ -50,17 +50,414 @@
       "ID": 1003,
       "itemName": 171,
       "itemDesc": 164,
+      "icon": "icon_item_1003",
+      "itemTag": 1,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 1004,
+      "itemName": null,
+      "itemDesc": 164,
+      "icon": "icon_item_1004",
+      "itemTag": 1,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10001,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10002,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10003,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10004,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10005,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10006,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10007,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 10008,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11001,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11002,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11003,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11004,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11005,
+      "itemName": null,
+      "itemDesc": null,
       "icon": "",
-      "itemTyp": 1,
-      "quality": 1,
-      "stack": null,
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
       "isSell": false,
-      "rewardsNum": null,
-      "isVisible": null,
+      "rewardsNum": 0,
+      "isVisible": 1,
       "isUse": false,
       "useLimit": null,
-      "costItemNum": null,
-      "stack_1": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11006,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11007,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "sort": null
+    },
+    {
+      "ID": 11008,
+      "itemName": null,
+      "itemDesc": null,
+      "icon": "",
+      "itemTag": 11,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
       "sort": null
     }
   ]

Assets/Res/UI/RewardsPanel/ShowItemNumberCom.prefab

@@ -0,0 +1,238 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2311896207658132684
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2071401264842426928}
+  - component: {fileID: 5668092925206625825}
+  - component: {fileID: 8376924640516992993}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Item
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2071401264842426928
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4728143542991051966}
+  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: -26.2098, y: 0.3}
+  m_SizeDelta: {x: 47.5803, y: 47.58}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5668092925206625825
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  m_CullTransparentMesh: 1
+--- !u!114 &8376924640516992993
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_eq_4_1_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 
+--- !u!1 &8646299697326961619
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4728143542991051966}
+  - component: {fileID: 9111758787558866785}
+  - component: {fileID: 9160525272223938117}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ShowItemNumberCom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4728143542991051966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2071401264842426928}
+  - {fileID: 8305414635516840236}
+  m_Father: {fileID: 0}
+  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: -2317.6138, y: 973.8722}
+  m_SizeDelta: {x: 188.7725, y: 61.7444}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9111758787558866785
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_CullTransparentMesh: 1
+--- !u!114 &9160525272223938117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Icon_Item
+    gameObject: {fileID: 8376924640516992993}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Number
+    gameObject: {fileID: 2628316432632847572}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &9064707866169406707
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8305414635516840236}
+  - component: {fileID: 8782582591641023350}
+  - component: {fileID: 2628316432632847572}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Number
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8305414635516840236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4728143542991051966}
+  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: 40.32522, y: -0.6}
+  m_SizeDelta: {x: 66.4504, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8782582591641023350
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  m_CullTransparentMesh: 1
+--- !u!114 &2628316432632847572
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +100

Assets/Res/UI/RewardsPanel/ShowItemNumberCom.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W31Lsir4B3wcQcmcLp7X3Xle+cD4LQSK8GzQug+xxEvn3RNwuhLNPlu04nDN
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -81,5 +81,10 @@ namespace Fort23.Core
       /// </summary>
       DivineSensePointChange,
       
+      /// <summary>
+      /// 完成事件
+      /// </summary>
+      CompleteEvent,
+      
     }
 }

Assets/Scripts/Core/UI/UTool/CTween/AnimationCurveLibrary.cs

@@ -18,6 +18,7 @@ public class AnimationCurveLibrary : ScriptableObject
     // [Header("UI显示大小")] public AnimationCurve ui_showSize;
     [Header("UI移动大小")] public AnimationCurve ui_moveSize;
     [Header("UI移动速度")] public AnimationCurve ui_moveSpped;
+    [Header("获得道具曲线")] public AnimationCurve JumpY;
     [Header("法宝攻击速度曲线")] public AnimationCurve fabaoAtt;
     [Header("法宝对拼速度曲线")] public AnimationCurve fabaoDuiPing;
     [Header("一次对拼的速度")]public float fabaoSpeed=0.7f;

Assets/Scripts/GameData/ExcelConfig/FabaoConfig.cs

@@ -33,7 +33,7 @@ public int Type;
 
 
 		/// <summary>
-		///法宝类型 1=金 2=木 4=水 =8火 16=土
+		///法宝类型 1=金 2=木 4=水 8=火 16=土
 		/// </summary>
 public int magicAttribute;
 
@@ -81,7 +81,7 @@ public int SkillGroupID;
 
 
 		/// <summary>
-		///法宝升星所需道具数量
+		///法宝升星所需道具数量 分别是升到45678910星所需数量
 		/// </summary>
 public int[] StarupItemCost;
 

Assets/Scripts/GameData/ExcelConfig/FabaoPowerupConfig.cs

@@ -38,12 +38,6 @@ public int HP;
 public int DEF;
 
 
-		/// <summary>
-		///法宝的法力标准成长
-		/// </summary>
-public int MP;
-
-
 		/// <summary>
 		///法宝的攻击标准成长
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/ItemConfig.cs

@@ -27,7 +27,7 @@ public int itemName;
 
 
 		/// <summary>
-		///道具说明 （英雄故事）
+		///道具说明
 		/// </summary>
 public int itemDesc;
 
@@ -39,9 +39,9 @@ public string icon;
 
 
 		/// <summary>
-		///道具分类 1.货币 2.碎片 3.道具 4.装备 5.英雄灵魂
+		///道具分类 见ID分段
 		/// </summary>
-public int itemTyp;
+public int itemTag;
 
 
 		/// <summary>

Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\HeroPowerUp.xlsx. SheetName: MonsterPowerUpConfig
+// Generate From Excel\MonsterPowerUp.xlsx. SheetName: MonsterPowerUpConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameLogic/EventManager/DialogueManager.cs

@@ -7,6 +7,7 @@ using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 using Utility;
 
@@ -40,6 +41,12 @@ public class DialogueManager : Singleton<DialogueManager>
     {
         currentDialogueID = dialogueID;
 
+        //神识探索的事件记录步骤
+        if (EventSystemManager.Instance.CurrentEventList != null)
+            EventSystemManager.Instance.CurrentEventList.curStep = currentDialogueID;
+
+        AccountFileInfo.Instance.SavePlayerData();
+
 
         // 找到当前对话组
         var dialogueConfig = ConfigComponent.Instance.Get<EventConditionConfig>(dialogueID);
@@ -89,6 +96,7 @@ public class DialogueManager : Singleton<DialogueManager>
     private async void EndDialogue1()
     {
         EventConditionConfig dialogueConfig = ConfigComponent.Instance.Get<EventConditionConfig>(currentDialogueID);
+        bool isCombatWin = false;
         switch (dialogueConfig.optionType)
         {
             //选项在这里不处理 在ui层处理 所有这里不是走到1 直接return
@@ -99,11 +107,16 @@ public class DialogueManager : Singleton<DialogueManager>
             //进入战斗
             case 2:
                 LogTool.Log("对话结束，进入战斗");
+                CTask cTask = CTask.Create();
                 dialogue.StartCombat(dialogueConfig.optionPara1[0],
                     delegate(bool isWin)
                     {
                         LogTool.Log("战斗完成" + isWin);
+                        isCombatWin = isWin;
+                        cTask.SetResult();
                     });
+                await cTask;
+                dialogue.ChangeComabtState(CombatController.idle);
                 break;
             //获得奖励
             case 3:
@@ -114,20 +127,34 @@ public class DialogueManager : Singleton<DialogueManager>
                     itemInfos.Add(itemInfo);
                 }
 
-                await dialogue.OpenRewardsPanel(itemInfos);
+                await dialogue.OpenRewardsPanel(eventConfig.ID,itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
         }
 
         //如果有下一个对话id 走下一个id
-        // if (dialogueConfig.ResultOptions != 0)
-        // {
-        //     PlayDialogue(dialogueConfig.ResultOptions);
-        // }
-        // else
-        // {
-        //     EndDialogue();
-        // }
+        if (dialogueConfig.ResultOptions != null && dialogueConfig.ResultOptions.Length > 0)
+        {
+            if (dialogueConfig.optionType == 2)
+            {
+                if (isCombatWin)
+                {
+                    PlayDialogue(dialogueConfig.ResultOptions[0]);
+                }
+                else
+                {
+                    PlayDialogue(dialogueConfig.ResultOptions[1]);
+                }
+            }
+            else
+            {
+                PlayDialogue(dialogueConfig.ResultOptions[0]);
+            }
+        }
+        else
+        {
+            EndDialogue();
+        }
     }
 
 

Assets/Scripts/GameLogic/EventManager/DialogueMono.cs

@@ -9,8 +9,10 @@ public interface IDialogueMono
     void OpenDialoguePanel(int id, string[] icon, ShowDialogueEventData.MessageShowType messageShowType,
         Action<int?> finish);
 
-    CTask OpenRewardsPanel(List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0);
+    CTask OpenRewardsPanel(int eventId, List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0);
 
     CTask OpenDialoguePanel(int id, Action<int?> finish);
     void StartCombat(int levelBattle,System.Action<bool> finishCombat);
+
+    void ChangeComabtState(string state);
 }

Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -1,8 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 using Utility;
 using Random = UnityEngine.Random;
@@ -13,10 +16,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     List<AccountFileInfo.EventData> eventDatas = new List<AccountFileInfo.EventData>();
 
-    public void CustomInit()
+    IDialogueMono dialogueMono;
+
+    public AccountFileInfo.EventList CurrentEventList;
+
+    public void CustomInit(IDialogueMono dialogueMono)
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
-
+        this.dialogueMono = dialogueMono;
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
     }
 
@@ -34,7 +41,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
     }
 
-    public List<EventConfig> UseDivinesense(int bigMapId)
+    public List<AccountFileInfo.EventList> UseDivinesense(int bigMapId)
     {
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
         int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
@@ -50,7 +57,19 @@ public class EventSystemManager : Singleton<EventSystemManager>
         //todo 神识升级逻辑
         AccountFileInfo.Instance.SavePlayerData();
 
-        return DetectEvents(bigMapId, count);
+        var eventConfigs = DetectEvents(bigMapId, count);
+        if (eventConfigs == null || eventConfigs.Count == 0)
+            return default;
+
+        List<AccountFileInfo.EventList> eventLists = new List<AccountFileInfo.EventList>();
+        for (var i = 0; i < eventConfigs.Count; i++)
+        {
+            AccountFileInfo.EventList eventList = new AccountFileInfo.EventList();
+            eventList.eventID = eventConfigs[i].ID;
+            eventLists.Add(eventList);
+        }
+
+        return eventLists;
     }
 
 
@@ -59,7 +78,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         BigMap bigMap = ConfigComponent.Instance.Get<BigMap>(bigMapId);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
 
-        List<int> qualitys = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        List<int> qualitys = new List<int>() { 1, 2, 3, 4, 5, 6 };
 
         //先掉落出品质
         int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
@@ -125,7 +144,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
 
-        int idex = Random.Range(1, randomEvents.Count);
+        int idex = Random.Range(0, randomEvents.Count);
         TriggerEvent(randomEvents[idex]);
     }
 
@@ -136,10 +155,34 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public void TriggerEvent(EventConfig evt)
     {
         LogTool.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
+        dialogueMono.ChangeComabtState(CombatController.idle);
 
         DialogueManager.Instance.StartDialogue(evt.EventType, evt.ID, () => { CompleteEvent(evt.ID); });
     }
 
+    /// <summary>
+    /// 触发事件
+    /// </summary>
+    public void TriggerEvent(AccountFileInfo.EventList evt)
+    {
+        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(evt.eventID);
+        LogTool.Log($"触发事件: {LanguageManager.Instance.Text(eventConfig.Description)} (ID: {eventConfig.ID}, 品质: {eventConfig.EventQuality})");
+
+        int dialogueID = 0;
+        if (evt.curStep == 0)
+        {
+            dialogueID = eventConfig.EventType;
+        }
+        else
+        {
+            dialogueID = evt.curStep;
+        }
+
+        CurrentEventList = evt;
+        dialogueMono.ChangeComabtState(CombatController.idle);
+        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () => { CompleteEvent(); });
+    }
+
     /// <summary>
     /// 检查事件是否满足触发条件。
     /// </summary>
@@ -200,6 +243,39 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         if (AccountFileInfo.Instance.playerData.senceExplorationProgress < 100)
             AccountFileInfo.Instance.playerData.senceExplorationProgress += 5;
+
+
+        AccountFileInfo.Instance.SavePlayerData();
+        dialogueMono.ChangeComabtState(CombatController.update);
+
+        // EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+    }
+
+    /// <summary>
+    /// 完成事件
+    /// </summary>
+    /// <param name="eventID">事件ID</param>
+    public void CompleteEvent()
+    {
+        LogTool.Log($"完成事件{CurrentEventList.eventID}");
+        AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == CurrentEventList.eventID);
+        if (eventData == null)
+        {
+            eventData = new AccountFileInfo.EventData();
+            eventData.eventID = CurrentEventList.eventID;
+        }
+
+        eventData.completeCount++;
+        AccountFileInfo.Instance.playerData.events.Add(eventData);
+
+        if (AccountFileInfo.Instance.playerData.senceExplorationProgress < 100)
+            AccountFileInfo.Instance.playerData.senceExplorationProgress += 5;
+
+
+        AccountFileInfo.Instance.playerData.eventList.Remove(CurrentEventList);
         AccountFileInfo.Instance.SavePlayerData();
+
+        EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        dialogueMono.ChangeComabtState(CombatController.update);
     }
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -29,18 +29,21 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     {
         //地图探索进度
         public int senceExplorationProgress;
-        
+
         public int divineSenseLevel = 1;
-        
+
         public int divineSensePoint = 0;
-        
+
         public int divineSenseexp = 0;
-        
+
         public List<EventData> events = new List<EventData>();
-        
+
+        public List<EventList> eventList = new List<EventList>();
+
+
         public List<ItemData> ItemListData = new List<ItemData>();
 
-      
+
         /// <summary>
         /// 关卡进度
         /// </summary>
@@ -65,14 +68,27 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // /// </summary>
         // public List<HeroData> HeroListInBackDatas = new List<HeroData>();
     }
-    
+
+    [System.Serializable]
     public class EventData
     {
-        public int eventID ;
+        public int eventID;
+
         //完成cishu
         public int completeCount = 0;
     }
 
+    /// <summary>
+    /// 刷出来的事件列表
+    /// </summary>
+    [System.Serializable]
+    public class EventList
+    {
+        public int eventID;
+
+        public int curStep;
+    }
+
 
     /// <summary>
     /// 重建索引表
@@ -130,7 +146,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
     private int lastHeroIdx = 0;
 
-  
 
     private int lastItemIdx = 0;
 
@@ -285,19 +300,18 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     public void ClearInitPlayerData()
     {
         ItemData coin = new ItemData(GlobalParam.Item_Coin_ID, 0);
-        
+
         ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
-        
+
         ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID, 0);
-        
+
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);
         playerData.ItemListData.Add(heroExp);
-        
+
         // BagController.Instance.AddCoin(10000);
 
 
-       
         // playerData.HeroListData.Add(heroData2);
         // playerData.HeroListData.Add(heroData3);
         // playerData.HeroListData.Add(heroData4);
@@ -316,7 +330,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 英雄等级
         /// </summary>
         public int heroPowerId;
-        
     }
 
     [System.Serializable]

Assets/Scripts/GameLogic/Player/PlayerManager.cs

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

Assets/Scripts/GameUI/DialogueMono.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
+using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Combat;
+using UnityEngine;
 
 namespace GameUI
 {
@@ -16,12 +19,22 @@ namespace GameUI
             DialoguePanel.OpenDialoguePanel(id, icon, messageShowType, finish);
         }
 
-        public async CTask OpenRewardsPanel(List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0)
+        public async CTask OpenRewardsPanel(int eventId, List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0)
         {
-            CTask cTask = CTask.Create();
-            RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
-            await rewardsPanel.UIClosed();
-            cTask.SetResult();
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventId);
+            if (eventConfig.EventTriggerType == 2)
+            {
+                Vector3 worldPos =CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+
+                worldPos.y += 0.5f;
+                await ShowItemNumberCom.Open(worldPos, rewardsDic[0]);
+                await TimerComponent.Instance.WaitAsync(100);
+            }
+            else
+            {
+                RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
+                await rewardsPanel.UIClosed();
+            }
         }
 
         public async CTask OpenDialoguePanel(int id, Action<int?> finish)
@@ -33,5 +46,10 @@ namespace GameUI
         {
             CombatDrive.Instance.LoadLevelBattleCombat(levelBattle, finishCombat);
         }
+
+        public void ChangeComabtState(string state)
+        {
+            CombatDrive.Instance.CombatController.ChangeState(state);
+        }
     }
 }

Assets/Scripts/GameUI/GameApplction.cs

@@ -112,8 +112,9 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
-        DialogueManager.Instance.CustomInit(new DialogueMono());
-
+        DialogueMono dialogueMono = new DialogueMono();
+        DialogueManager.Instance.CustomInit(dialogueMono);
+        EventSystemManager.Instance.CustomInit(dialogueMono);
         PlayerManager.Instance.Init();
         // PlayerManager.Instance.InitTestHero();
 

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

@@ -45,7 +45,6 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
-            CombatEventManager.Instance.AddEventListener(CombatEventType.AddRandomEvent, AddRandomEventEventData);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddMagicWeaponHeroEntity,
                 AddMagicWeaponHeroEntity);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
@@ -56,7 +55,6 @@ namespace Fort23.Mono
 
         protected override void DelEvent()
         {
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddRandomEvent, AddRandomEventEventData);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddMagicWeaponHeroEntity,
                 AddMagicWeaponHeroEntity);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
@@ -92,16 +90,7 @@ namespace Fort23.Mono
             // shengShiEventWidget.InitShengShiEventWidget(configId);
         }
 
-        private async void AddRandomEventEventData(IEventData ieveData)
-        {
-            AddRandomEventEventData eventData = ieveData as AddRandomEventEventData;
-            int configId = eventData.randomEventID;
-            ShengShiEventWidget shengShiEventWidget =
-                await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
-                    DynamicEvent,
-                    isInstance: true);
-            shengShiEventWidget.InitShengShiEventWidget(configId);
-        }
+ 
 
         public async CTask ShowPanel()
         {
@@ -126,7 +115,6 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
             AutoUse.onValueChanged.AddListener((x) =>
             {
@@ -136,26 +124,7 @@ namespace Fort23.Mono
         }
 
 
-        private async void Bnt_shengShi_onClick()
-        {
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
-                .CombatHeroController.playerHeroEntity.GameObject.transform);
-            List<EventConfig> eventConfigs = EventSystemManager.Instance.UseDivinesense(1);
-            if (eventConfigs == null || eventConfigs.Count == 0)
-                return;
-            for (var i = 0; i < eventConfigs.Count; i++)
-            {
-                ShengShiEventWidget shengShiEventWidget =
-                    await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
-                        DynamicEvent,
-                        isInstance: true);
-                shengShiEventWidget.InitShengShiEventWidget(eventConfigs[i].ID);
-            }
-            //
-            // CombatController.currActiveCombat.RandomEventController.StartRandomEvent(CombatController.currActiveCombat
-            //     .CombatHeroController.playerHeroEntity.GameObject.transform);
-        }
+
 
         private void CameraSelect_onValueChanged(float value)
         {

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

@@ -8,6 +8,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "ShengShiEventWidget")]
     public partial class ShengShiEventWidget : UIComponent
     {
+        private AccountFileInfo.EventList eventList;
+
         private void Init()
         {
         }
@@ -28,14 +30,15 @@ namespace Fort23.Mono
         private void Button_onClick()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            EventSystemManager.Instance.TriggerEvent(randomEventConfig);
+            EventSystemManager.Instance.TriggerEvent(eventList);
         }
 
         private EventConfig randomEventConfig;
 
-        public void InitShengShiEventWidget(int id)
+        public void InitShengShiEventWidget(AccountFileInfo.EventList eventList)
         {
-            randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
+            this.eventList = eventList;
+            randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Massge.text = LanguageManager.Instance.Text(randomEventConfig.Description);
         }
     }

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

@@ -142,16 +142,21 @@ namespace Fort23.Mono
 
         public void Update()
         {
-            Vector3 p = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.GameObject.transform.Find("hitpos").position;
-            p.x -= 0.2f;
-            p.y += 0.7f;
-            p = CombatDrive.Instance.CombatController.CombatCameraControllder.Camera.WorldToScreenPoint(p);
-            p = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
-
-
-            p = transform.worldToLocalMatrix * p;
-
-            dotPoint.anchoredPosition = p;
+            // Vector3 p = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.GameObject.transform.Find("hitpos").position;
+            // p.x -= 0.2f;
+            // p.y += 0.7f;
+            // p = CombatDrive.Instance.CombatController.CombatCameraControllder.Camera.WorldToScreenPoint(p);
+            // p = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            //
+            //
+            // p = transform.worldToLocalMatrix * p;
+            //
+            // dotPoint.anchoredPosition = p;
+
+            Vector3 worldPos = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            dotPoint.transform.position = p2;
 
             if (!_isUpdate) return;
 

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

@@ -18,6 +18,12 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.DivineSensePointChange, DivineSensePointChange);
+            EventManager.Instance.AddEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+        }
+
+        private void CompleteEvent(IEventData e)
+        {
+            CreatShengShiEvent();
         }
 
         private void DivineSensePointChange(IEventData e)
@@ -28,6 +34,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.DivineSensePointChange, DivineSensePointChange);
+            EventManager.Instance.RemoveEventListener(CustomEventType.CompleteEvent, CompleteEvent);
         }
 
         public override void AddButtonEvent()
@@ -38,9 +45,16 @@ namespace Fort23.Mono
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+            CreatShengShiEvent();
             return base.AsyncInit(uiData);
         }
 
+        public async override CTask Show()
+        {
+            await base.Show();
+            SkillSelectPanel.OpenSkillSelectPanel();
+        }
+
         private async void Bnt_shengShi_onClick()
         {
             // EventSystemManager.Instance.DetectRandomEvents();
@@ -51,32 +65,42 @@ namespace Fort23.Mono
                 return;
             }
 
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+          
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .CombatHeroController.playerHeroEntity.GameObject.transform);
-            List<EventConfig> eventConfigs = EventSystemManager.Instance.UseDivinesense(1);
-            if (eventConfigs == null || eventConfigs.Count == 0)
+            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(1);
+            if (eventLists == null || eventLists.Count == 0)
                 return;
-            for (var i = 0; i < eventConfigs.Count; i++)
+      
+            AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
+            AccountFileInfo.Instance.SavePlayerData();
+            CreatShengShiEvent();
+        }
+
+        public async void CreatShengShiEvent()
+        {
+            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+            for (var i = 0; i < AccountFileInfo.Instance.playerData.eventList.Count; i++)
             {
                 ShengShiEventWidget shengShiEventWidget =
                     await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
                         DynamicEvent,
                         isInstance: true);
-                shengShiEventWidget.InitShengShiEventWidget(eventConfigs[i].ID);
+                shengShiEventWidget.InitShengShiEventWidget(AccountFileInfo.Instance.playerData.eventList[i]);
             }
         }
+        
 
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
             if (Input.GetKeyDown(KeyCode.Y))
             {
-                // EventSystemManager.Instance.DetectRandomEvents();
-                CombatDrive.Instance.LoadLevelBattleCombat(100001, delegate(bool isWin)
-                {
-                    LogTool.Log("战斗完成"+isWin);
-                });
+                EventSystemManager.Instance.DetectRandomEvents();
+                // CombatDrive.Instance.LoadLevelBattleCombat(100001, delegate(bool isWin)
+                // {
+                //     LogTool.Log("战斗完成"+isWin);
+                // });
             }
         }
 

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberCom.cs

@@ -0,0 +1,68 @@
+using System.Drawing;
+using Fort23.Core;
+using GameLogic.Bag;
+using UnityEngine;
+using Utility.UITool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ShowItemNumberCom")]
+    public partial class ShowItemNumberCom : UIComponent
+    {
+        private float _currentTime;
+        private float _originY;
+        private TimerEntity _timerEntity;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public static async CTask<ShowItemNumberCom> Open(Vector3 pos, ItemInfo itemInfo)
+        {
+            ShowItemNumberCom showItemNumberCom = await UIManager.Instance.CreateGComponent<ShowItemNumberCom>(null, UIManager.Instance.GetLayer(UILayer.Top));
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(pos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            showItemNumberCom.GObjectPoolInterface.GetComponent<RectTransform>().position = p2;
+            showItemNumberCom.ShowTips(itemInfo);
+            return showItemNumberCom;
+        }
+
+        public void ShowTips(ItemInfo itemInfo)
+        {
+            Vector3 pos = transform.GetComponent<RectTransform>().localPosition;
+            Text_Number.text = $"+{itemInfo.count}";
+            Icon_Item.gameObject.SetActive(true);
+            Text_Number.gameObject.SetActive(true);
+            Icon_Item.icon_name = itemInfo.config.icon;
+            _currentTime = 0;
+            _originY = transform.GetComponent<RectTransform>().localPosition.y;
+            _timerEntity = TimerComponent.Instance.AddTimer(20, (() => { Close(); }), 50, () =>
+            {
+                _currentTime += 0.02f;
+                float offsetY = _originY + AnimationCurveManager.Instance.AnimationCurveLibrary.JumpY.Evaluate(_currentTime) * 100;
+                transform.localPosition = new Vector3(pos.x, offsetY, pos.z);
+            });
+        }
+
+        public override void Close()
+        {
+            UIManager.Instance.DormancyGComponent(this);
+            _timerEntity?.Dispose();
+            _timerEntity = null;
+
+            base.Close();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberCom.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W3gbs3+rAi//OM5KPEatclNNjGV6BOo8+mE+BmBQVPz+fvPRcd3WXCTbCsG7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberComData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShowItemNumberCom 
+	{
+	  #region 自定义数据 
+	  private MyImage _Icon_Item;
+	  public MyImage Icon_Item
+	   {
+	   get{
+	      if (_Icon_Item == null)
+	       {
+	         _Icon_Item  = GetUIUnit<MyImage>("Icon_Item"); 
+	       }
+	      return _Icon_Item;
+	     }
+	   }
+	  private Text _Text_Number;
+	  public Text Text_Number
+	   {
+	   get{
+	      if (_Text_Number == null)
+	       {
+	         _Text_Number  = GetUIUnit<Text>("Text_Number"); 
+	       }
+	      return _Text_Number;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberComData.cs.meta

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

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -87,13 +87,13 @@ namespace Fort23.Mono
                 // txtLv.text = itemInfo.eqInfo.level + "级";
                 txtLv.text = LanguageManager.Instance.Text(161, itemInfo.eqInfo.level);
             }
-            else if (itemInfo.config.itemTyp == 5)
-            {
-                heroShards.SetActive(true);
-                icon.gameObject.SetActive(false);
-                heroShardsIcon.icon_name = itemInfo.config.icon;
-                lvObj.SetActive(false);
-            }
+            // else if (itemInfo.config.itemTyp == 5)
+            // {
+            //     heroShards.SetActive(true);
+            //     icon.gameObject.SetActive(false);
+            //     heroShardsIcon.icon_name = itemInfo.config.icon;
+            //     lvObj.SetActive(false);
+            // }
             else
             {
                 icon.icon_name = itemInfo.config.icon;