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

# Conflicts:
#	Assets/Res/Config/EventConditionConfig.json   resolved by origin/master(远端) version
#	Assets/Res/Config/EventConfig.json   resolved by origin/master(远端) version
#	Assets/Res/Config/EventLinkConfig.json   resolved by origin/master(远端) version

Assets/Res/Config/EventConditionConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "message": 2078,
+      "message": 9001,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -18,7 +18,7 @@
     },
     {
       "ID": 2,
-      "message": 2079,
+      "message": 9002,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -34,7 +34,7 @@
     },
     {
       "ID": 3,
-      "message": 2080,
+      "message": 9003,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -53,7 +53,7 @@
     },
     {
       "ID": 4,
-      "message": 2081,
+      "message": 9004,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -69,7 +69,7 @@
     },
     {
       "ID": 5,
-      "message": 2082,
+      "message": 9005,
       "Operation": 0,
       "ConditionType": 8,
       "finishCount": 1,
@@ -82,7 +82,7 @@
     },
     {
       "ID": 6,
-      "message": 2094,
+      "message": 9006,
       "Operation": 0,
       "ConditionType": 9,
       "finishCount": 6,
@@ -95,7 +95,7 @@
     },
     {
       "ID": 7,
-      "message": 2843,
+      "message": 9007,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -111,7 +111,7 @@
     },
     {
       "ID": 8,
-      "message": 2844,
+      "message": 9008,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -127,7 +127,7 @@
     },
     {
       "ID": 9,
-      "message": 2845,
+      "message": 9009,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -146,7 +146,7 @@
     },
     {
       "ID": 10,
-      "message": 2846,
+      "message": 9010,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -165,7 +165,7 @@
     },
     {
       "ID": 11,
-      "message": 2847,
+      "message": 9011,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -184,7 +184,7 @@
     },
     {
       "ID": 12,
-      "message": 2848,
+      "message": 9012,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -203,7 +203,7 @@
     },
     {
       "ID": 13,
-      "message": 2849,
+      "message": 9013,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -222,7 +222,7 @@
     },
     {
       "ID": 14,
-      "message": 2850,
+      "message": 9014,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -238,7 +238,7 @@
     },
     {
       "ID": 15,
-      "message": 2851,
+      "message": 9015,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -257,7 +257,7 @@
     },
     {
       "ID": 17,
-      "message": 2852,
+      "message": 9016,
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
@@ -276,7 +276,7 @@
     },
     {
       "ID": 18,
-      "message": 2853,
+      "message": 9017,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -295,7 +295,7 @@
     },
     {
       "ID": 19,
-      "message": 2854,
+      "message": 9018,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -314,7 +314,7 @@
     },
     {
       "ID": 20,
-      "message": 2855,
+      "message": 9019,
       "Operation": 0,
       "ConditionType": 1,
       "ConditionPara": [
@@ -330,7 +330,7 @@
     },
     {
       "ID": 21,
-      "message": 2856,
+      "message": 9020,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -346,7 +346,7 @@
     },
     {
       "ID": 22,
-      "message": 2857,
+      "message": 9021,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -362,7 +362,7 @@
     },
     {
       "ID": 23,
-      "message": 2858,
+      "message": 9022,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -378,7 +378,7 @@
     },
     {
       "ID": 24,
-      "message": 2859,
+      "message": 9023,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -394,7 +394,7 @@
     },
     {
       "ID": 25,
-      "message": 2860,
+      "message": 9024,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -410,7 +410,7 @@
     },
     {
       "ID": 26,
-      "message": 2861,
+      "message": 9025,
       "Operation": 0,
       "ConditionType": 3,
       "ConditionPara": [
@@ -426,7 +426,7 @@
     },
     {
       "ID": 27,
-      "message": 0,
+      "message": 9026,
       "Operation": 0,
       "ConditionType": 6,
       "ConditionPara": [
@@ -442,9 +442,12 @@
     },
     {
       "ID": 28,
-      "message": 0,
+      "message": 9027,
       "Operation": 0,
       "ConditionType": 5,
+      "ConditionPara": [
+        1013
+      ],
       "finishCount": 1,
       "SkiptoIds": [
         1,

Assets/Res/Config/EventConfig.json

@@ -33,8 +33,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 174,
-      "Description": 1936
+      "EventName": 4001,
+      "Description": 4076
     },
     {
       "ID": 2,
@@ -71,8 +71,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 175,
-      "Description": 1937
+      "EventName": 4002,
+      "Description": 4077
     },
     {
       "ID": 4,
@@ -103,8 +103,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 217,
-      "Description": 1939
+      "EventName": 4003,
+      "Description": 4078
     },
     {
       "ID": 5,
@@ -135,8 +135,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 218,
-      "Description": 1940
+      "EventName": 4004,
+      "Description": 4079
     },
     {
       "ID": 6,
@@ -167,8 +167,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 219,
-      "Description": 1941
+      "EventName": 4005,
+      "Description": 4080
     },
     {
       "ID": 7,
@@ -199,8 +199,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 220,
-      "Description": 1942
+      "EventName": 4006,
+      "Description": 4081
     },
     {
       "ID": 1011,
@@ -231,8 +231,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3017,
-      "Description": 3018
+      "EventName": 4007,
+      "Description": 4082
     },
     {
       "ID": 1012,
@@ -263,8 +263,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3038,
-      "Description": 3039
+      "EventName": 4008,
+      "Description": 4083
     },
     {
       "ID": 1013,
@@ -295,8 +295,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3040,
-      "Description": 3041
+      "EventName": 4009,
+      "Description": 4084
     },
     {
       "ID": 1014,
@@ -327,8 +327,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3042,
-      "Description": 3043
+      "EventName": 4010,
+      "Description": 4085
     },
     {
       "ID": 1015,
@@ -360,8 +360,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3046,
-      "Description": 3047
+      "EventName": 4011,
+      "Description": 4086
     },
     {
       "ID": 1016,
@@ -393,8 +393,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3048,
-      "Description": 3049
+      "EventName": 4012,
+      "Description": 4087
     },
     {
       "ID": 1017,
@@ -428,8 +428,8 @@
         30009
       ],
       "EventCount": 0,
-      "EventName": 3048,
-      "Description": 3050
+      "EventName": 4013,
+      "Description": 4088
     },
     {
       "ID": 1018,
@@ -463,8 +463,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3051,
-      "Description": 3052
+      "EventName": 4014,
+      "Description": 4089
     },
     {
       "ID": 1019,
@@ -497,8 +497,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3053,
-      "Description": 3054
+      "EventName": 4015,
+      "Description": 4090
     },
     {
       "ID": 1020,
@@ -530,8 +530,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3055,
-      "Description": 3056
+      "EventName": 4016,
+      "Description": 4091
     },
     {
       "ID": 1021,
@@ -564,8 +564,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3057,
-      "Description": 3058
+      "EventName": 4017,
+      "Description": 4092
     },
     {
       "ID": 1022,
@@ -602,8 +602,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3059,
-      "Description": 3060
+      "EventName": 4018,
+      "Description": 4093
     },
     {
       "ID": 1023,
@@ -636,8 +636,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3061,
-      "Description": 3062
+      "EventName": 4019,
+      "Description": 4094
     },
     {
       "ID": 1024,
@@ -670,8 +670,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3063,
-      "Description": 3064
+      "EventName": 4020,
+      "Description": 4095
     },
     {
       "ID": 1025,
@@ -704,8 +704,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3065,
-      "Description": 3066
+      "EventName": 4021,
+      "Description": 4096
     },
     {
       "ID": 1026,
@@ -737,8 +737,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3067,
-      "Description": 3068
+      "EventName": 4022,
+      "Description": 4097
     },
     {
       "ID": 1027,
@@ -770,8 +770,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3069,
-      "Description": 3070
+      "EventName": 4023,
+      "Description": 4098
     },
     {
       "ID": 1028,
@@ -806,8 +806,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3071,
-      "Description": 3072
+      "EventName": 4024,
+      "Description": 4099
     },
     {
       "ID": 1029,
@@ -845,8 +845,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3073,
-      "Description": 3074
+      "EventName": 4025,
+      "Description": 4100
     },
     {
       "ID": 1030,
@@ -883,8 +883,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3075,
-      "Description": 3076
+      "EventName": 4026,
+      "Description": 4101
     },
     {
       "ID": 1031,
@@ -919,8 +919,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3077,
-      "Description": 3074
+      "EventName": 4027,
+      "Description": 4102
     },
     {
       "ID": 10001,
@@ -950,8 +950,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1906,
-      "Description": 1914
+      "EventName": 4028,
+      "Description": 4103
     },
     {
       "ID": 10002,
@@ -980,8 +980,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1907,
-      "Description": 1915
+      "EventName": 4029,
+      "Description": 4104
     },
     {
       "ID": 10003,
@@ -1016,8 +1016,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1908,
-      "Description": 1916
+      "EventName": 4030,
+      "Description": 4105
     },
     {
       "ID": 10004,
@@ -1047,8 +1047,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1909,
-      "Description": 1917
+      "EventName": 4031,
+      "Description": 4106
     },
     {
       "ID": 10005,
@@ -1088,8 +1088,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2135,
-      "Description": 2137
+      "EventName": 4032,
+      "Description": 4107
     },
     {
       "ID": 10006,
@@ -1121,8 +1121,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2136,
-      "Description": 2138
+      "EventName": 4033,
+      "Description": 4108
     },
     {
       "ID": 10007,
@@ -1153,8 +1153,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2801,
-      "Description": 2822
+      "EventName": 4034,
+      "Description": 4109
     },
     {
       "ID": 10008,
@@ -1194,8 +1194,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2802,
-      "Description": 2823
+      "EventName": 4035,
+      "Description": 4110
     },
     {
       "ID": 10009,
@@ -1224,8 +1224,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2803,
-      "Description": 2824
+      "EventName": 4036,
+      "Description": 4111
     },
     {
       "ID": 10010,
@@ -1252,8 +1252,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2804,
-      "Description": 2825
+      "EventName": 4037,
+      "Description": 4112
     },
     {
       "ID": 10011,
@@ -1280,8 +1280,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2805,
-      "Description": 2826
+      "EventName": 4038,
+      "Description": 4113
     },
     {
       "ID": 10012,
@@ -1308,8 +1308,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2806,
-      "Description": 2827
+      "EventName": 4039,
+      "Description": 4114
     },
     {
       "ID": 10013,
@@ -1347,8 +1347,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2806,
-      "Description": 2827
+      "EventName": 4040,
+      "Description": 4115
     },
     {
       "ID": 10014,
@@ -1390,8 +1390,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2807,
-      "Description": 2828
+      "EventName": 4041,
+      "Description": 4116
     },
     {
       "ID": 10015,
@@ -1425,8 +1425,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2808,
-      "Description": 2829
+      "EventName": 4042,
+      "Description": 4117
     },
     {
       "ID": 10016,
@@ -1460,8 +1460,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2809,
-      "Description": 2830
+      "EventName": 4043,
+      "Description": 4118
     },
     {
       "ID": 10017,
@@ -1500,8 +1500,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2810,
-      "Description": 2831
+      "EventName": 4044,
+      "Description": 4119
     },
     {
       "ID": 10018,
@@ -1537,8 +1537,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2811,
-      "Description": 2832
+      "EventName": 4045,
+      "Description": 4120
     },
     {
       "ID": 10019,
@@ -1584,8 +1584,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2812,
-      "Description": 2833
+      "EventName": 4046,
+      "Description": 4121
     },
     {
       "ID": 10020,
@@ -1613,8 +1613,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2813,
-      "Description": 2834
+      "EventName": 4047,
+      "Description": 4122
     },
     {
       "ID": 10021,
@@ -1644,8 +1644,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2814,
-      "Description": 2835
+      "EventName": 4048,
+      "Description": 4123
     },
     {
       "ID": 10022,
@@ -1683,8 +1683,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2815,
-      "Description": 2836
+      "EventName": 4049,
+      "Description": 4124
     },
     {
       "ID": 10023,
@@ -1713,8 +1713,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2816,
-      "Description": 2837
+      "EventName": 4050,
+      "Description": 4125
     },
     {
       "ID": 10024,
@@ -1753,8 +1753,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2817,
-      "Description": 2838
+      "EventName": 4051,
+      "Description": 4126
     },
     {
       "ID": 10025,
@@ -1787,8 +1787,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2818,
-      "Description": 2839
+      "EventName": 4052,
+      "Description": 4127
     },
     {
       "ID": 10026,
@@ -1823,8 +1823,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2819,
-      "Description": 2840
+      "EventName": 4053,
+      "Description": 4128
     },
     {
       "ID": 10027,
@@ -1885,8 +1885,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2820,
-      "Description": 2841
+      "EventName": 4054,
+      "Description": 4129
     },
     {
       "ID": 10028,
@@ -1913,8 +1913,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2821,
-      "Description": 2842
+      "EventName": 4055,
+      "Description": 4130
     },
     {
       "ID": 10029,
@@ -1959,13 +1959,19 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2822,
-      "Description": 2843
+      "EventName": 4056,
+      "Description": 4131
     },
     {
       "ID": 10030,
       "EventLinksId": [
         1003001,
+        1003002,
+        1003003,
+        1003004,
+        1003005,
+        1003006,
+        1003007,
         102
       ],
       "EventTriggerType": 4,
@@ -1987,8 +1993,38 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2823,
-      "Description": 2844
+      "EventName": 4057,
+      "Description": 4132
+    },
+    {
+      "ID": 10031,
+      "EventLinksId": [
+        1003101,
+        1003102,
+        1003103,
+        102
+      ],
+      "EventTriggerType": 4,
+      "EventTag": 1,
+      "EventType": 1,
+      "Score": 10,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1703,
+        1404
+      ],
+      "PrizeNums": [
+        1,
+        2
+      ],
+      "RefreshProbability": 0,
+      "RefreshCount": 0,
+      "placeID": 3,
+      "XiantuID": 1,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 4057,
+      "Description": 4132
     },
     {
       "ID": 20001,
@@ -2017,8 +2053,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 174,
-      "Description": 1936
+      "EventName": 4058,
+      "Description": 4133
     },
     {
       "ID": 20002,
@@ -2049,8 +2085,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 175,
-      "Description": 1937
+      "EventName": 4059,
+      "Description": 4134
     },
     {
       "ID": 20003,
@@ -2079,8 +2115,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1943,
-      "Description": 1944
+      "EventName": 4060,
+      "Description": 4135
     },
     {
       "ID": 9001,
@@ -2109,8 +2145,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 174,
-      "Description": 1936
+      "EventName": 4061,
+      "Description": 4136
     },
     {
       "ID": 9002,
@@ -2141,8 +2177,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 175,
-      "Description": 1937
+      "EventName": 4062,
+      "Description": 4137
     },
     {
       "ID": 9025,
@@ -2166,8 +2202,8 @@
       "XiantuID": 2,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2067,
-      "Description": 2068
+      "EventName": 4063,
+      "Description": 4138
     },
     {
       "ID": 9014,
@@ -2192,8 +2228,8 @@
       "XiantuID": 2,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2069,
-      "Description": 2070
+      "EventName": 4064,
+      "Description": 4139
     },
     {
       "ID": 9031,
@@ -2218,8 +2254,8 @@
       "XiantuID": 2,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2071,
-      "Description": 2072
+      "EventName": 4065,
+      "Description": 4140
     },
     {
       "ID": 9003,
@@ -2249,8 +2285,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 2035,
-      "Description": 2036
+      "EventName": 4066,
+      "Description": 4141
     },
     {
       "ID": 9101,
@@ -2544,8 +2580,8 @@
         1004
       ],
       "EventCount": 1,
-      "EventName": 176,
-      "Description": 1938
+      "EventName": 4067,
+      "Description": 4142
     },
     {
       "ID": 1001,
@@ -2575,8 +2611,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 1943,
-      "Description": 1944
+      "EventName": 4068,
+      "Description": 4143
     },
     {
       "ID": 30001,
@@ -2900,8 +2936,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3019,
-      "Description": 3020
+      "EventName": 4069,
+      "Description": 4144
     },
     {
       "ID": 5002,
@@ -2947,8 +2983,8 @@
         5001
       ],
       "EventCount": 0,
-      "EventName": 3036,
-      "Description": 3037
+      "EventName": 4070,
+      "Description": 4145
     },
     {
       "ID": 5003,
@@ -2995,8 +3031,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3034,
-      "Description": 3035
+      "EventName": 4071,
+      "Description": 4146
     },
     {
       "ID": 5004,
@@ -3024,8 +3060,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3034,
-      "Description": 3035
+      "EventName": 4072,
+      "Description": 4147
     },
     {
       "ID": 5005,
@@ -3053,8 +3089,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3034,
-      "Description": 3035
+      "EventName": 4073,
+      "Description": 4148
     },
     {
       "ID": 5006,
@@ -3082,8 +3118,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3034,
-      "Description": 3035
+      "EventName": 4074,
+      "Description": 4149
     },
     {
       "ID": 5007,
@@ -3111,8 +3147,8 @@
       "XiantuID": 0,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 3034,
-      "Description": 3035
+      "EventName": 4075,
+      "Description": 4150
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -162,6 +162,15 @@
         5007
       ]
     },
+    {
+      "ID": 1013,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [

Assets/Res/Config/LevelbattleConfig.json

@@ -150,6 +150,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1013,
+      "Group": [
+        1013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

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

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

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

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

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