Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java # serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java # serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.javaback_recharge
commit
5d8c9d35ae
|
@ -1,5 +1,23 @@
|
||||||
Id Option
|
Id Option
|
||||||
int mut,int#int,1
|
int mut,int#int,1
|
||||||
|
100001 100001#100002
|
||||||
|
100002 100003#100004
|
||||||
|
100003 100005
|
||||||
|
100004 100006
|
||||||
|
100005 100007
|
||||||
|
100006 100008
|
||||||
|
100007 100009
|
||||||
|
100008 100010
|
||||||
|
100009 100011
|
||||||
|
100010 100012
|
||||||
|
100011 100013
|
||||||
|
100012 100014
|
||||||
|
100013 100015
|
||||||
|
100014 100016
|
||||||
|
100015 100017
|
||||||
|
100016 100018
|
||||||
|
100017 100019
|
||||||
|
100018 100020
|
||||||
101001 10101
|
101001 10101
|
||||||
101002 10102
|
101002 10102
|
||||||
101003 10110
|
101003 10110
|
||||||
|
@ -153,17 +171,6 @@ int mut,int#int,1
|
||||||
101151 10105
|
101151 10105
|
||||||
101152 10106
|
101152 10106
|
||||||
101153 101204#101205
|
101153 101204#101205
|
||||||
101154 101206
|
|
||||||
101155 101207
|
|
||||||
101156 101208
|
|
||||||
101157 101209
|
|
||||||
101158 101210
|
|
||||||
101159 101211
|
|
||||||
101160 101212
|
|
||||||
101161 101213
|
|
||||||
101162 101214
|
|
||||||
101163 101215
|
|
||||||
101164 101216
|
|
||||||
102001 10201
|
102001 10201
|
||||||
102002 10202
|
102002 10202
|
||||||
102003 10204
|
102003 10204
|
||||||
|
@ -289,8 +296,8 @@ int mut,int#int,1
|
||||||
103015 10101
|
103015 10101
|
||||||
103016 10101
|
103016 10101
|
||||||
103017 103022
|
103017 103022
|
||||||
103018 103024#103025
|
103018 103023
|
||||||
103019 103023
|
103019 103024#103025
|
||||||
103020 103026
|
103020 103026
|
||||||
103021 103027
|
103021 103027
|
||||||
103022 103028
|
103022 103028
|
||||||
|
@ -343,3 +350,226 @@ int mut,int#int,1
|
||||||
103069 103084#103085#103086#103087
|
103069 103084#103085#103086#103087
|
||||||
103070 10302
|
103070 10302
|
||||||
103071 10304
|
103071 10304
|
||||||
|
104001 10401
|
||||||
|
104002 10403
|
||||||
|
104003 10407
|
||||||
|
104004 10408
|
||||||
|
104005 104001#104002
|
||||||
|
104006 104003#104004
|
||||||
|
104007 104005#104006
|
||||||
|
104008 104007#104008
|
||||||
|
104009 104009#104010
|
||||||
|
104010 104011#104012
|
||||||
|
104011 104013#104014
|
||||||
|
104012 104015#104016
|
||||||
|
104013 104017#104018
|
||||||
|
104014 104019#104020
|
||||||
|
104015 10409
|
||||||
|
104016 null
|
||||||
|
104017 104021#104022
|
||||||
|
104018 104023
|
||||||
|
104019 104024
|
||||||
|
104020 104025
|
||||||
|
104021 104026#104027
|
||||||
|
104022 104028#104029
|
||||||
|
104023 104030#104031
|
||||||
|
104024 104032#104033#104034
|
||||||
|
104025 104035
|
||||||
|
104026 104036#104037
|
||||||
|
104027 104038#104039
|
||||||
|
104028 104040#104041
|
||||||
|
104029 104042#104043
|
||||||
|
104030 104044
|
||||||
|
104031 104045
|
||||||
|
104032 104046#104047
|
||||||
|
104135 104167
|
||||||
|
104033 104048#104049
|
||||||
|
104034 104050#104051
|
||||||
|
104035 104052
|
||||||
|
104036 104053#104054
|
||||||
|
104037 104055#104056
|
||||||
|
104038 104057#104058
|
||||||
|
104039 104059
|
||||||
|
104040 104060#104061
|
||||||
|
104041 104062
|
||||||
|
104042 104063#104064
|
||||||
|
104043 104065#104066
|
||||||
|
104044 104067
|
||||||
|
104045 104068
|
||||||
|
104046 104069#104070
|
||||||
|
104047 104071
|
||||||
|
104048 104072
|
||||||
|
104049 104073
|
||||||
|
104050 104074#104075
|
||||||
|
104051 104076#104077
|
||||||
|
104052 104078#104079
|
||||||
|
104053 104080
|
||||||
|
104054 104081#104082
|
||||||
|
104055 104083
|
||||||
|
104056 104084
|
||||||
|
104057 104085
|
||||||
|
104058 104086
|
||||||
|
104059 104087
|
||||||
|
104060 104088
|
||||||
|
104061 104089
|
||||||
|
104062 104090
|
||||||
|
104063 104091
|
||||||
|
104064 104092
|
||||||
|
104065 104093
|
||||||
|
104066 104094
|
||||||
|
104067 104095
|
||||||
|
104068 104096
|
||||||
|
104069 104097
|
||||||
|
104070 104098
|
||||||
|
104071 104099
|
||||||
|
104072 104100
|
||||||
|
104073 104101
|
||||||
|
104074 104102
|
||||||
|
104075 104103
|
||||||
|
104076 104104
|
||||||
|
104077 104105
|
||||||
|
104078 104106
|
||||||
|
104079 104107
|
||||||
|
104080 104108
|
||||||
|
104081 104109
|
||||||
|
104082 104110
|
||||||
|
104083 104111
|
||||||
|
104084 104112
|
||||||
|
104085 104113
|
||||||
|
104086 104114
|
||||||
|
104087 104115
|
||||||
|
104088 104116
|
||||||
|
104089 104117
|
||||||
|
104090 104118
|
||||||
|
104091 104119#104120
|
||||||
|
104136 104168
|
||||||
|
104092 104121#104122
|
||||||
|
104093 104123#104124
|
||||||
|
104094 104125#104126
|
||||||
|
104122 104158
|
||||||
|
104095 104127
|
||||||
|
104096 104128
|
||||||
|
104097 104129
|
||||||
|
104098 104130#104131#104132
|
||||||
|
104099 104133
|
||||||
|
104100 104134
|
||||||
|
104101 104135
|
||||||
|
104102 104136
|
||||||
|
104103 104137
|
||||||
|
104104 104138#104139
|
||||||
|
104105 104140#104141
|
||||||
|
104106 104142#104143
|
||||||
|
104107 104144
|
||||||
|
104108 104145#104146
|
||||||
|
104109 104147
|
||||||
|
104110 104148
|
||||||
|
104111 104149
|
||||||
|
104112 104150
|
||||||
|
104113 104151
|
||||||
|
104114 104152
|
||||||
|
104115 104153
|
||||||
|
104116 104154
|
||||||
|
104117 104155
|
||||||
|
104118 104156
|
||||||
|
104119 104157
|
||||||
|
104120 10402
|
||||||
|
104121 10404
|
||||||
|
104122 10405
|
||||||
|
104123 10406
|
||||||
|
104124 104158
|
||||||
|
104125 104159
|
||||||
|
104126 104160
|
||||||
|
104127 104161
|
||||||
|
104128 104162
|
||||||
|
104129 104163
|
||||||
|
104130 104164
|
||||||
|
104131 104165
|
||||||
|
104132 104166
|
||||||
|
104133 null
|
||||||
|
104134 null
|
||||||
|
104135 10409
|
||||||
|
104136 10409
|
||||||
|
105001 10501
|
||||||
|
105002 10502
|
||||||
|
105003 10503
|
||||||
|
105004 10504
|
||||||
|
105005 105001#105002
|
||||||
|
105006 105003#105004
|
||||||
|
105007 105005#105006
|
||||||
|
105008 105007#105008
|
||||||
|
105009 105009#105010
|
||||||
|
105010 105011#105012
|
||||||
|
105011 105013#105014
|
||||||
|
105012 105015#105016
|
||||||
|
105013 105017#105018
|
||||||
|
105014 105019#105020
|
||||||
|
105015 105021#105022
|
||||||
|
105016 105023#105024
|
||||||
|
105017 105025#105026
|
||||||
|
105018 105027#105028
|
||||||
|
105019 105029#105030
|
||||||
|
105020 105031#105032
|
||||||
|
105021 105033
|
||||||
|
105022 105034
|
||||||
|
105023 105035
|
||||||
|
105024 105036
|
||||||
|
105025 105037
|
||||||
|
105026 105038
|
||||||
|
105027 105039
|
||||||
|
105028 105040
|
||||||
|
105029 105041
|
||||||
|
105030 105042#105043
|
||||||
|
105031 105044
|
||||||
|
105032 105045
|
||||||
|
105033 105046
|
||||||
|
105034 105047#105048#105049
|
||||||
|
105035 105050
|
||||||
|
105036 105051
|
||||||
|
105037 105052#105053#105054
|
||||||
|
105038 105055
|
||||||
|
105039 105056
|
||||||
|
105040 105057#105058#105059
|
||||||
|
105041 105060
|
||||||
|
105042 105061
|
||||||
|
105043 105062#105063#105064
|
||||||
|
105044 105065
|
||||||
|
105045 105066
|
||||||
|
105046 105067#105068#105069
|
||||||
|
105047 105070
|
||||||
|
105048 105071
|
||||||
|
105049 105072#105073#105074
|
||||||
|
105050 105075
|
||||||
|
105051 105076
|
||||||
|
105052 105077#105078#105079
|
||||||
|
105053 105080
|
||||||
|
105054 105081
|
||||||
|
105055 105082#105083
|
||||||
|
105056 105084#105085
|
||||||
|
105057 105086#105087
|
||||||
|
105058 105088#105089
|
||||||
|
105059 105090#105091
|
||||||
|
105060 105092#105093
|
||||||
|
105061 105094#105095
|
||||||
|
105062 105096#105097
|
||||||
|
105063 105098#105099
|
||||||
|
105064 105100#105101#105102
|
||||||
|
105065 105103#105104
|
||||||
|
105066 105105#105106
|
||||||
|
105067 105107
|
||||||
|
105068 105108
|
||||||
|
105069 105109#105110
|
||||||
|
105070 105111
|
||||||
|
105071 105112
|
||||||
|
105072 105113
|
||||||
|
105073 105114
|
||||||
|
105074 105115
|
||||||
|
105075 105116
|
||||||
|
105076 105117
|
||||||
|
105077 105118
|
||||||
|
105078 105119
|
||||||
|
105079 null
|
||||||
|
105080 null
|
||||||
|
105081 105120
|
||||||
|
105082 105121
|
||||||
|
105083 105122
|
||||||
|
105084 105123
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition
|
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition
|
||||||
int mut,int#int,2 mut,float#float,1 int int mut,int#int,1 mut,int#int,1 int int int mut,int#int,1
|
int mut,int#int,2 mut,float#float,1 int int mut,int#int,1 mut,int#int,1 int int int mut,int#int,1
|
||||||
1 4#100|14#100|10001#1|10002#1|10004#1|10007#1|10008#1|10012#1|10013#1|10019#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09
|
1 4#100|14#100|10001#1 0#0#0.3164#0 100 2 0#0#1#0 70#100 999 9999 1 05#09
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Id Style Refresh TriggerRules ExploreValues InitialEventId
|
Id Style Refresh TriggerRules ExploreValues InitialEventId
|
||||||
int int int int int int
|
int int int int int int
|
||||||
100001 3 3 2 0 100001
|
100001 4 3 2 0 100001
|
||||||
100002 5 3 2 0 100002
|
100002 5 3 2 0 100002
|
||||||
0 0 0 0 0 0
|
0 0 0 0 0 0
|
||||||
101001 1 2 1 0 101001
|
101001 1 2 1 0 101001
|
||||||
|
@ -26,7 +26,7 @@ int int int int int int
|
||||||
101011 5 3 2 0 101064
|
101011 5 3 2 0 101064
|
||||||
101012 5 3 2 0 101065
|
101012 5 3 2 0 101065
|
||||||
101013 8 2 0 0 0
|
101013 8 2 0 0 0
|
||||||
101016 5 3 2 0 101067
|
101016 5 3 2 0 101149
|
||||||
101017 5 3 2 0 101113
|
101017 5 3 2 0 101113
|
||||||
101018 5 3 2 0 101114
|
101018 5 3 2 0 101114
|
||||||
101023 5 3 2 0 101131
|
101023 5 3 2 0 101131
|
||||||
|
@ -112,19 +112,18 @@ int int int int int int
|
||||||
104018 5 3 2 0 104124
|
104018 5 3 2 0 104124
|
||||||
104019 5 3 2 0 104125
|
104019 5 3 2 0 104125
|
||||||
104020 5 3 2 0 104126
|
104020 5 3 2 0 104126
|
||||||
104021 5 3 2 0 104016
|
104021 5 3 2 0 104017
|
||||||
104022 5 3 2 0 104127
|
104022 5 3 2 0 104127
|
||||||
104023 5 3 2 0 104032
|
104023 5 3 2 0 104135
|
||||||
104024 5 3 2 0 104048
|
104024 5 3 2 0 104048
|
||||||
104025 5 3 2 0 104128
|
104025 5 3 2 0 104128
|
||||||
104026 5 3 2 0 104091
|
104026 5 3 2 0 104136
|
||||||
104027 5 3 2 0 104129
|
104027 5 3 2 0 104129
|
||||||
104028 5 3 2 0 104130
|
104028 5 3 2 0 104130
|
||||||
104029 5 3 2 0 104131
|
104029 5 3 2 0 104131
|
||||||
104030 5 3 2 0 104132
|
104030 5 3 2 0 104132
|
||||||
104035 1 2 1 0 104133
|
104036 1 2 1 0 104135
|
||||||
104036 1 2 1 0 104134
|
104037 1 2 1 0 104136
|
||||||
104037 1 2 1 0 104135
|
|
||||||
0 0 0 0 0 0
|
0 0 0 0 0 0
|
||||||
105001 1 2 1 0 105001
|
105001 1 2 1 0 105001
|
||||||
105002 1 2 1 0 105002
|
105002 1 2 1 0 105002
|
||||||
|
@ -162,69 +161,58 @@ int int int int int int
|
||||||
105034 5 3 2 0 105082
|
105034 5 3 2 0 105082
|
||||||
105035 5 3 2 0 105083
|
105035 5 3 2 0 105083
|
||||||
0 0 0 0 0 0
|
0 0 0 0 0 0
|
||||||
106001 1 2 1 0 106001
|
106001 1 2 1 0 0
|
||||||
106002 1 2 1 0 106002
|
106002 1 2 1 0 0
|
||||||
106003 1 2 1 0 106003
|
106003 1 2 1 0 0
|
||||||
106004 2 2 2 0 106004
|
106004 2 2 2 0 0
|
||||||
106005 2 2 2 0 106005
|
106005 2 2 2 0 0
|
||||||
106006 2 2 2 0 106006
|
106006 2 2 2 0 0
|
||||||
106007 2 2 2 0 106007
|
106007 2 2 2 0 0
|
||||||
106008 2 2 2 0 106008
|
106008 2 2 2 0 0
|
||||||
106009 2 2 2 0 106009
|
106009 2 2 2 0 0
|
||||||
106010 2 2 2 0 106010
|
106010 2 2 2 0 0
|
||||||
106011 2 1 2 0 106011
|
106011 2 1 2 0 0
|
||||||
106012 3 2 2 0 106012
|
106012 3 2 2 0 0
|
||||||
106013 4 2 2 0 106013
|
106013 4 2 2 0 0
|
||||||
106014 9 2 2 0 106014
|
106014 5 3 1 0 0
|
||||||
106015 5 2 2 0 106015
|
106015 5 3 2 0 0
|
||||||
106016 9 2 2 0 106016
|
106016 5 3 1 0 0
|
||||||
106017 5 2 2 0 106017
|
106017 5 3 2 0 0
|
||||||
106018 8 0 0 0 0
|
106018 5 3 1 0 0
|
||||||
106019 5 3 2 0 106018
|
106019 5 3 2 0 0
|
||||||
106020 5 3 2 0 106019
|
106020 8 0 0 0 0
|
||||||
106021 5 3 2 0 106037
|
106021 5 3 2 0 0
|
||||||
106022 5 3 2 0 106055
|
106022 5 3 2 0 0
|
||||||
106023 5 3 2 0 106056
|
106023 5 3 2 0 0
|
||||||
106024 9 3 1 0 106070
|
106024 5 3 2 0 0
|
||||||
106025 1 2 1 0 0
|
106025 5 3 2 0 0
|
||||||
106026 1 2 1 0 0
|
106026 9 3 1 0 0
|
||||||
106027 1 2 1 0 0
|
|
||||||
106028 1 2 1 0 0
|
|
||||||
106029 1 2 1 0 0
|
|
||||||
0 0 0 0 0 0
|
0 0 0 0 0 0
|
||||||
107001 1 2 1 0 107001
|
107001 1 2 1 0 0
|
||||||
107002 1 2 1 0 107002
|
107002 1 2 1 0 0
|
||||||
107003 1 2 1 0 107003
|
107003 1 2 1 0 0
|
||||||
107004 1 3 1 0 107004
|
107004 1 3 1 0 0
|
||||||
107005 2 2 2 0 107005
|
107005 2 2 2 0 0
|
||||||
107006 2 2 2 0 107006
|
107006 2 2 2 0 0
|
||||||
107007 2 2 2 0 107007
|
107007 2 2 2 0 0
|
||||||
107008 2 2 2 0 107008
|
107008 2 2 2 0 0
|
||||||
107009 2 2 2 0 107009
|
107009 2 2 2 0 0
|
||||||
107010 2 2 2 0 107010
|
107010 2 2 2 0 0
|
||||||
107011 2 2 2 0 107011
|
107011 2 2 2 0 0
|
||||||
107012 2 1 2 0 107012
|
107012 2 1 2 0 0
|
||||||
107013 3 2 2 0 107013
|
107013 3 2 2 0 0
|
||||||
107014 4 2 2 0 107014
|
107014 4 2 2 0 0
|
||||||
107015 5 3 1 0 107015
|
107015 9 2 2 0 0
|
||||||
107016 5 3 2 0 107016
|
107016 5 2 2 0 0
|
||||||
107017 5 3 1 0 107018
|
107017 9 2 2 0 0
|
||||||
107018 5 3 2 0 107019
|
107018 5 2 2 0 0
|
||||||
107019 5 3 1 0 107021
|
107019 8 0 0 0 0
|
||||||
107020 5 3 2 0 107022
|
107020 5 3 2 0 0
|
||||||
107021 8 0 0 0 0
|
107021 5 3 2 0 0
|
||||||
107022 5 3 2 0 107024
|
107022 5 3 2 0 0
|
||||||
107023 5 3 2 0 107035
|
107023 5 3 2 0 0
|
||||||
107024 5 3 2 0 107055
|
107024 5 3 2 0 0
|
||||||
107025 5 3 2 0 107056
|
107025 5 3 2 0 0
|
||||||
107026 5 3 2 0 107057
|
107026 5 3 2 0 0
|
||||||
107027 5 3 2 0 107058
|
107027 5 3 2 0 0
|
||||||
107028 5 3 2 0 107059
|
107028 5 3 2 0 0
|
||||||
107029 5 3 2 0 107060
|
|
||||||
107030 5 3 2 0 107061
|
|
||||||
107031 1 2 1 0 107062
|
|
||||||
107032 1 2 1 0 107063
|
|
||||||
107033 1 2 1 0 107064
|
|
||||||
107034 1 2 1 0 107065
|
|
||||||
107035 1 2 1 0 107066
|
|
||||||
107036 1 3 1 0 107067
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
Id Type MissionNum Reward OpenRules
|
Id Type MissionNum Reward OpenRules
|
||||||
int int int int mut,int#int,1
|
int int int int mut,int#int,1
|
||||||
1 1 4 0 null
|
1 1 2 0 null
|
||||||
2 2 4 0 null
|
2 1 4 10102 null
|
||||||
0 0 0 0 null
|
3 1 3 0 null
|
||||||
0 0 0 0 null
|
4 1 3 0 null
|
||||||
|
5 1 4 0 null
|
||||||
|
6 1 4 0 null
|
||||||
|
|
|
@ -1,29 +1,29 @@
|
||||||
Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBonusFactor DamageReduceFactor SkillList PassiveSkillList
|
Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBonusFactor DamageReduceFactor SkillList PassiveSkillList
|
||||||
int int int int int int int int int int int float float float float mut,int#int,1 mut,int#int,1 mut,int#int,1 mut,int#int,2
|
int int int int int int int int int int int float float float float mut,int#int,1 mut,int#int,1 mut,int#int,1 mut,int#int,2
|
||||||
1 1 2 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
1 1 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
2 1 2 0 1 5 965 260 152 152 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
2 1 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
3 1 2 0 1 5 965 260 152 152 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
3 1 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
4 2 3 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
4 2 3 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
5 2 3 0 1 5 965 260 152 152 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
5 2 3 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
6 2 3 0 1 5 965 260 152 152 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
6 2 3 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
7 3 2 0 1 5 965 260 152 152 180 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
7 3 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
8 3 2 0 1 5 1931 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
8 3 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
9 3 2 0 1 5 1931 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
9 3 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#0 0#0#0#0#0#0 20001 null
|
||||||
10 4 3 0 2 5 5794 1045 610 610 180 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
10 4 3 0 2 0 1448 522 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
||||||
11 4 3 0 2 5 5794 1045 610 610 60 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
11 4 3 0 2 0 1448 522 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
||||||
12 4 3 0 2 5 5794 1045 610 610 5 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
12 4 3 0 2 0 1448 522 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#1 0#0#0#0#0#1 20001 null
|
||||||
13 5 2 0 1 5 2173 520 305 305 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
13 5 2 0 1 0 193 260 61 61 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
14 5 2 0 1 5 2173 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
14 5 2 0 1 0 193 260 61 61 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
15 5 2 0 1 5 2173 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
15 5 2 0 1 0 193 260 61 61 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
16 6 2 0 1 5 1931 520 305 305 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
16 6 2 0 1 0 1931 520 305 305 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
17 6 2 0 1 5 1931 520 305 305 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
17 6 2 0 1 0 1931 520 305 305 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
18 6 2 0 1 5 1931 520 305 305 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
18 6 2 0 1 0 1931 520 305 305 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
19 7 1 0 1 5 6519 1560 915 915 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
19 7 1 0 1 0 6519 1560 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
20 7 1 0 1 5 6519 1560 915 915 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
20 7 1 0 1 0 6519 1560 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
21 7 1 0 1 5 6519 1560 915 915 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
21 7 1 0 1 0 6519 1560 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
22 8 2 0 2 5 8692 1567 915 915 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
22 8 2 0 2 0 8692 1567 915 915 120 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
23 8 2 0 2 5 8692 1567 915 915 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
23 8 2 0 2 0 8692 1567 915 915 40 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
24 8 2 0 2 5 8692 1567 915 915 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
24 8 2 0 2 0 8692 1567 915 915 3 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
25 9 3 0 1 5 9657 2601 1526 1526 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
25 9 3 0 1 5 9657 2601 1526 1526 180 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
26 9 3 0 1 5 9657 2601 1526 1526 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
26 9 3 0 1 5 9657 2601 1526 1526 60 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
27 9 3 0 1 5 9657 2601 1526 1526 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
27 9 3 0 1 5 9657 2601 1526 1526 5 0.3 0.3 0.2 1.5 0#0#0#0#0#2 0#0#0#0#0#2 20001 null
|
||||||
|
|
|
@ -1,65 +1,71 @@
|
||||||
Id Contents Rewardgroup
|
Id Contents Rewardgroup
|
||||||
int mut,int#int,2 mut,int#int,1
|
int mut,int#int,2 mut,int#int,1
|
||||||
10101 1#2#3 null
|
10101 1#2#3 10101
|
||||||
10102 4#5#6 null
|
10102 4#5#6 10102
|
||||||
10103 7#8#9 null
|
10103 7#8#9 10103
|
||||||
10104 14#1#3 null
|
10104 14#1#3 10104
|
||||||
10105 14#4#6 null
|
10105 14#4#6 10105
|
||||||
10106 14#7#9 null
|
10106 14#7#9 10106
|
||||||
10107 11#1#3 null
|
10107 11#1#3 10107
|
||||||
10108 11#4#6 null
|
10108 11#4#6 10108
|
||||||
10109 11#7#9 null
|
10109 11#7#9 10109
|
||||||
10110 11 null
|
10110 11 10110
|
||||||
10201 16#17#18 null
|
10201 16#17#18 10201
|
||||||
10202 20#16#18 null
|
10202 20#16#18 10202
|
||||||
10203 23#16#18 null
|
10203 23#16#18 10203
|
||||||
10204 23 null
|
10204 23 10204
|
||||||
10205 23#19#21 null
|
10205 23#19#21 10205
|
||||||
10301 25#26#27 null
|
10301 25#26#27 10301
|
||||||
10302 28#29#30 null
|
10302 28#29#30 10302
|
||||||
10303 32#25#27 null
|
10303 32#25#27 10303
|
||||||
10304 32#28#30 null
|
10304 32#28#30 10304
|
||||||
10305 32 null
|
10305 32 10305
|
||||||
10401 34#35#36 null
|
10401 34#35#36 10401
|
||||||
10402 37#38#39 null
|
10402 37#38#39 10402
|
||||||
10403 41#34#36 null
|
10403 41#34#36 10403
|
||||||
10404 41#37#39 null
|
10404 41#37#39 10404
|
||||||
10405 44#34#36 null
|
10405 44#34#36 10405
|
||||||
10406 44#37#39 null
|
10406 44#37#39 10406
|
||||||
10407 44 null
|
10407 44 10407
|
||||||
10408 43#45#40#42 null
|
10408 43#45#40#42 10408
|
||||||
10501 46#48 null
|
10501 46#48 10501
|
||||||
10502 46#47#48 null
|
10502 46#47#48 10502
|
||||||
10503 50#46#48 null
|
10503 50#46#48 10503
|
||||||
10504 50 null
|
10504 50 10504
|
||||||
10505 49#51 null
|
10505 49#51 10505
|
||||||
10601 55#56#57 null
|
10601 55#56#57 10601
|
||||||
10602 53#55#57 null
|
10602 53#55#57 10602
|
||||||
10603 59#55#57 null
|
10603 59#55#57 10603
|
||||||
10604 59 null
|
10604 59 10604
|
||||||
10605 59#52#54 null
|
10605 59#52#54 10605
|
||||||
10701 70#71#72 null
|
10701 70#71#72 10701
|
||||||
10702 79#80#81 null
|
10702 79#80#81 10702
|
||||||
10703 65#71#80 null
|
10703 65#71#80 10703
|
||||||
10704 62#71#80 null
|
10704 62#71#80 10704
|
||||||
10705 77#71#80 null
|
10705 77#71#80 10705
|
||||||
10706 68 null
|
10706 68 10706
|
||||||
10707 77#62#65 null
|
10707 77#62#65 10707
|
||||||
10708 77 null
|
10708 77 10708
|
||||||
10709 74 null
|
10709 74 10709
|
||||||
10801 82#83#84 null
|
10801 82#83#84 10801
|
||||||
10802 88#89#90 null
|
10802 88#89#90 10802
|
||||||
10803 94#95#96 null
|
10803 94#95#96 10803
|
||||||
10804 86#89#95 null
|
10804 86#89#95 10804
|
||||||
10805 97#99 null
|
10805 97#99 10805
|
||||||
10806 92#85#87 null
|
10806 92#85#87 10806
|
||||||
10807 97#98#99 null
|
10807 97#98#99 10807
|
||||||
10808 92 null
|
10808 92 10808
|
||||||
10809 91#93#85#87 null
|
10809 91#93#85#87 10809
|
||||||
10901 106#107#108 null
|
10901 106#107#108 10901
|
||||||
10902 109#110#111 null
|
10902 109#110#111 10902
|
||||||
10903 104#109#111 null
|
10903 104#109#111 10903
|
||||||
10904 101#106#108 null
|
10904 101#106#108 10904
|
||||||
10905 113#101#104 null
|
10905 113#101#104 10905
|
||||||
10906 113 null
|
10906 113 10906
|
||||||
10907 116 null
|
10907 116 10907
|
||||||
|
11001 124#125#126 11001
|
||||||
|
11002 127#128#129 11002
|
||||||
|
11003 119#125#128 11003
|
||||||
|
11004 122#125#128 11004
|
||||||
|
11005 122 11005
|
||||||
|
11006 131 11006
|
||||||
|
|
|
@ -4,9 +4,11 @@ int int mut,int#int,2
|
||||||
2 3 1#5#3
|
2 3 1#5#3
|
||||||
3 3 1#2#3
|
3 3 1#2#3
|
||||||
4 1 1#101016#101112
|
4 1 1#101016#101112
|
||||||
5 1 102022
|
5 1 1#102022#102065
|
||||||
6 2 1503#1
|
6 2 1503#1
|
||||||
7 3 1#3#3
|
7 3 1#3#3
|
||||||
8 3 1#4#3
|
8 3 1#4#3
|
||||||
9 3 1#2#3
|
9 3 1#2#3
|
||||||
10 4 2#2
|
10 4 2#2
|
||||||
|
11 4 6#1
|
||||||
|
12 2 1503#1
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -23,7 +23,7 @@ public class SOptionConfig implements BaseConfig{
|
||||||
|
|
||||||
private int[][] behaviorTypeValues;
|
private int[][] behaviorTypeValues;
|
||||||
|
|
||||||
private int reward;
|
private int[] reward;
|
||||||
|
|
||||||
private int jumpType;
|
private int jumpType;
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ public class SOptionConfig implements BaseConfig{
|
||||||
return behaviorTypeValues;
|
return behaviorTypeValues;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getReward() {
|
public int[] getReward() {
|
||||||
return reward;
|
return reward;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,12 @@ public class EventType {
|
||||||
* 行为参数:事件点id
|
* 行为参数:事件点id
|
||||||
* 16 消耗道具并销毁事件点
|
* 16 消耗道具并销毁事件点
|
||||||
* 行为参数:道具id#num#事件点id
|
* 行为参数:道具id#num#事件点id
|
||||||
|
* 17 完成任务往下推一步,摧毁指定事件点,开启新的事件点,完成所有事件点再推一步任务
|
||||||
|
* 行为参数:任务id#事件点id#地图id#坐标id#事件点id#地图id#坐标id#摧毁事件点id
|
||||||
|
* 18 战斗并销毁指定事件点
|
||||||
|
* 行为参数:怪物组id#事件点id
|
||||||
|
* 19 完成任务往下推一步,行动到某张地图某坐标点,不摧毁事件点
|
||||||
|
* 行为参数:任务id#地图id#坐标(不输入地图id和坐标而输入0代表回主城)
|
||||||
*/
|
*/
|
||||||
public static final int fight = 1;
|
public static final int fight = 1;
|
||||||
public static final int useItem = 2;
|
public static final int useItem = 2;
|
||||||
|
@ -60,4 +66,9 @@ public class EventType {
|
||||||
public static final int useItemMission = 14;
|
public static final int useItemMission = 14;
|
||||||
public static final int destroyPoint = 15;
|
public static final int destroyPoint = 15;
|
||||||
public static final int useItemAndDestroy = 16;
|
public static final int useItemAndDestroy = 16;
|
||||||
|
public static final int monitorMissionAndDestroyPoint = 17;
|
||||||
|
public static final int fightAndDestroyPoint = 18;
|
||||||
|
public static final int monitorMissionAndMove = 19;
|
||||||
|
public static final int destroyPointAnd = 20;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,6 +67,7 @@ public class MapLogic {
|
||||||
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "阵容不存在");
|
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "阵容不存在");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
int totalStep = 0;
|
||||||
Set<String> heroes = new HashSet<>(teamPosHeroInfos.size());
|
Set<String> heroes = new HashSet<>(teamPosHeroInfos.size());
|
||||||
for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) {
|
for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) {
|
||||||
Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
|
Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
|
||||||
|
@ -75,10 +76,12 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE));
|
hero.setCurHp(HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE));
|
||||||
heroes.add(heroInfo.getHeroId());
|
heroes.add(heroInfo.getHeroId());
|
||||||
|
totalStep += HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ACTION_POWER_RORMULA_TYPE);
|
||||||
}
|
}
|
||||||
if (heroes.size() != teamPosHeroInfos.size()) {
|
if (heroes.size() != teamPosHeroInfos.size()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
mapManager.setTotalStep(totalStep);
|
||||||
mapManager.setHeroes(heroes);
|
mapManager.setHeroes(heroes);
|
||||||
}
|
}
|
||||||
if (mapManager.getCurMapId() == 0) {
|
if (mapManager.getCurMapId() == 0) {
|
||||||
|
@ -405,18 +408,19 @@ public class MapLogic {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (behaviorType != EventType.jump && behaviorType != EventType.destroyMission) {
|
cell = mapManager.getMapInfo().get(mapManager.getCurXY());
|
||||||
|
// 检测该事件点是否已被销毁
|
||||||
|
if (cell != null) {
|
||||||
cell.setEventId(nextPoint);
|
cell.setEventId(nextPoint);
|
||||||
mapManager.addOrUpdateCell(mapManager.getCurXY(), cell);
|
mapManager.addOrUpdateCell(mapManager.getCurXY(), cell);
|
||||||
}
|
}
|
||||||
if (behaviorType == EventType.dun && eventUpdateResponse.getMission() != null) {
|
if (behaviorType == EventType.dun && eventUpdateResponse.getMission() != null) {
|
||||||
Mission mission = user.getMissionManager().getDoingMissions().get(eventUpdateResponse.getMission().getItemId());
|
Mission mission = user.getMissionManager().getDoingMissions().get(eventUpdateResponse.getMission().getItemId());
|
||||||
if (mission != null) {
|
if (mission != null && cell != null) {
|
||||||
mission.updateMapPoints(cell.getPointId(), cell.getEventId());
|
mission.updateMapPoints(cell.getPointId(), cell.getEventId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int[] reward = {sOptionConfig.getReward()};
|
CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1);
|
||||||
CommonProto.Drop.Builder dropBuilder = ItemUtil.drop(user, reward, 1);
|
|
||||||
List<CommonProto.EventBehaviorValues> eventBehaviorValuesList = new ArrayList<>();
|
List<CommonProto.EventBehaviorValues> eventBehaviorValuesList = new ArrayList<>();
|
||||||
for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) {
|
for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) {
|
||||||
CommonProto.EventBehaviorValues.Builder eventBehaviorValues = CommonProto.EventBehaviorValues
|
CommonProto.EventBehaviorValues.Builder eventBehaviorValues = CommonProto.EventBehaviorValues
|
||||||
|
@ -436,8 +440,8 @@ public class MapLogic {
|
||||||
if (dropBuilder != null) {
|
if (dropBuilder != null) {
|
||||||
eventUpdateResponse.setDrop(dropBuilder);
|
eventUpdateResponse.setDrop(dropBuilder);
|
||||||
}
|
}
|
||||||
LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}", mapManager.getCurXY(), cell.getPointId(),
|
LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextPoint=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
||||||
cell.getEventId(), eventUpdateResponse.getMission(), nextPoint);
|
cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMission(), nextPoint);
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -493,7 +497,7 @@ public class MapLogic {
|
||||||
CommonProto.Mission openMission;
|
CommonProto.Mission openMission;
|
||||||
StringBuilder state = null;
|
StringBuilder state = null;
|
||||||
String states = "";
|
String states = "";
|
||||||
if (mission.getMissionInfos() != null) {
|
if (mission.getMissionInfos() != null && !mission.getMissionInfos().isEmpty()) {
|
||||||
state = new StringBuilder();
|
state = new StringBuilder();
|
||||||
for (Map.Entry<Integer, Cell> cellEntry : mission.getMissionInfos().entrySet()) {
|
for (Map.Entry<Integer, Cell> cellEntry : mission.getMissionInfos().entrySet()) {
|
||||||
state.append(cellEntry.getKey());
|
state.append(cellEntry.getKey());
|
||||||
|
|
|
@ -26,6 +26,8 @@ public class MapManager extends MongoBase {
|
||||||
|
|
||||||
private Set<Integer> walkCells;
|
private Set<Integer> walkCells;
|
||||||
|
|
||||||
|
private int totalStep;
|
||||||
|
|
||||||
private Map<Integer, CrossMapCell> crossMapInfos = new ConcurrentHashMap<>();
|
private Map<Integer, CrossMapCell> crossMapInfos = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
public MapManager() {
|
public MapManager() {
|
||||||
|
@ -125,4 +127,13 @@ public class MapManager extends MongoBase {
|
||||||
this.maxMapId = maxMapId;
|
this.maxMapId = maxMapId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getTotalStep() {
|
||||||
|
return totalStep;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTotalStep(int totalStep) throws Exception {
|
||||||
|
updateString( "totalStep", totalStep);
|
||||||
|
this.totalStep = totalStep;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,95 @@
|
||||||
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.core.GlobalsDef;
|
||||||
|
import com.ljsd.jieling.db.redis.RedisKey;
|
||||||
|
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||||
|
import com.ljsd.jieling.handler.map.Cell;
|
||||||
|
import com.ljsd.jieling.handler.map.MapLogic;
|
||||||
|
import com.ljsd.jieling.handler.map.MapManager;
|
||||||
|
import com.ljsd.jieling.handler.mission.Mission;
|
||||||
|
import com.ljsd.jieling.handler.mission.MissionLogic;
|
||||||
|
import com.ljsd.jieling.logic.dao.Hero;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
|
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||||
|
import com.ljsd.jieling.protocols.CommonProto;
|
||||||
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import com.ljsd.jieling.util.CBean2Proto;
|
||||||
|
import com.ljsd.jieling.util.MonsterUtil;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class BehaviorUtil {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LoggerFactory.getLogger(BehaviorUtil.class);
|
||||||
|
/**
|
||||||
|
* 销毁事件点
|
||||||
|
* @param user
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public static void distoryPoint(User user) throws Exception {
|
||||||
|
Map<Integer, Cell> mapInfo = user.getMapManager().getMapInfo();
|
||||||
|
mapInfo.remove(user.getMapManager().getCurXY());
|
||||||
|
user.getMapManager().setMapInfo(mapInfo);
|
||||||
|
LOGGER.info("distoryPoint=========>{}", user.getMapManager().getCurXY());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取战斗数据
|
||||||
|
* @param user
|
||||||
|
* @param behaviorTypeValues
|
||||||
|
* @param eventUpdateResponse
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public static void getFightInfo(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
|
MapManager mapManager = user.getMapManager();
|
||||||
|
String key = RedisKey.getKey(RedisKey.FIGHT, user.getId() + RedisKey.UNDERLINE_LINE + Integer.toString(behaviorTypeValues[0][0]), false);
|
||||||
|
RedisUtil.getInstence().set(key, user.getId(), RedisKey.EXPIRE_TIME);
|
||||||
|
Set<String> heroes = mapManager.getHeroes();
|
||||||
|
List<CommonProto.HeroFightInfo> heroFightInfos = new ArrayList<>(heroes.size());
|
||||||
|
for (String heroId : heroes) {
|
||||||
|
Hero hero = user.getHeroManager().getHero(heroId);
|
||||||
|
if (hero == null || hero.getCurHp() == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
float attack = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ATTACK_TYPE);
|
||||||
|
float physicalDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.PHYSICAL_DEFENCE_TYPE);
|
||||||
|
float magicDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.MAGIC_DEFENCE_TYPE);
|
||||||
|
float hp = hero.getCurHp();
|
||||||
|
float speed = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.SPEED_TYPE);
|
||||||
|
CommonProto.Hero heroProto = CBean2Proto.getHero(hero);
|
||||||
|
CommonProto.HeroFightInfo heroFightInfo = CommonProto.HeroFightInfo
|
||||||
|
.newBuilder()
|
||||||
|
.setAttack(attack)
|
||||||
|
.setPhysicalDefence(physicalDefence)
|
||||||
|
.setMagicDefence(magicDefence)
|
||||||
|
.setHp(hp)
|
||||||
|
.setSpeed(speed)
|
||||||
|
.setHero(heroProto)
|
||||||
|
.build();
|
||||||
|
heroFightInfos.add(heroFightInfo);
|
||||||
|
}
|
||||||
|
eventUpdateResponse.addAllHeroFightInfos(heroFightInfos);
|
||||||
|
List<CommonProto.Monster> monsterByGroup = MonsterUtil.getMonsterByGroup(behaviorTypeValues[0][0]);
|
||||||
|
eventUpdateResponse.addAllMonsterList(monsterByGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新任务
|
||||||
|
*/
|
||||||
|
public static boolean updateMission(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception{
|
||||||
|
Map<Integer, Mission> doingMissions = user.getMissionManager().getDoingMissions();
|
||||||
|
Mission mission = doingMissions.get(behaviorTypeValues[0][0]);
|
||||||
|
if (mission == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
MissionLogic.getInstance().checkMission(mission, user);
|
||||||
|
CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission);
|
||||||
|
eventUpdateResponse.setMission(missionProto);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
|
import com.ljsd.jieling.logic.dao.User;
|
||||||
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class DestroyPointAndBehavior extends BaseBehavior {
|
||||||
|
@Override
|
||||||
|
public int getBehaviorType() {
|
||||||
|
return EventType.destroyPointAnd;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
|
BehaviorUtil.distoryPoint(user);
|
||||||
|
// TODO 监视地图
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
|
@ -17,9 +17,7 @@ public class DestroyPointBehavior extends BaseBehavior {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
Map<Integer, Cell> mapInfo = user.getMapManager().getMapInfo();
|
BehaviorUtil.distoryPoint(user);
|
||||||
mapInfo.remove(user.getMapManager().getCurXY());
|
|
||||||
user.getMapManager().setMapInfo(mapInfo);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
|
import com.ljsd.jieling.logic.dao.User;
|
||||||
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class FightAndDestroyPointBehavior extends BaseBehavior {
|
||||||
|
@Override
|
||||||
|
public int getBehaviorType() {
|
||||||
|
return EventType.fightAndDestroyPoint;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
|
BehaviorUtil.getFightInfo(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
|
BehaviorUtil.distoryPoint(user);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -27,36 +27,7 @@ public class FightBehavior extends BaseBehavior {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
MapManager mapManager = user.getMapManager();
|
BehaviorUtil.getFightInfo(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
String key = RedisKey.getKey(RedisKey.FIGHT, user.getId() + RedisKey.UNDERLINE_LINE + Integer.toString(behaviorTypeValues[0][0]), false);
|
|
||||||
RedisUtil.getInstence().set(key, user.getId(), RedisKey.EXPIRE_TIME);
|
|
||||||
Set<String> heroes = mapManager.getHeroes();
|
|
||||||
List<CommonProto.HeroFightInfo> heroFightInfos = new ArrayList<>(heroes.size());
|
|
||||||
for (String heroId : heroes) {
|
|
||||||
Hero hero = user.getHeroManager().getHero(heroId);
|
|
||||||
if (hero == null || hero.getCurHp() == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
float attack = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.ATTACK_TYPE);
|
|
||||||
float physicalDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.PHYSICAL_DEFENCE_TYPE);
|
|
||||||
float magicDefence = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.MAGIC_DEFENCE_TYPE);
|
|
||||||
float hp = hero.getCurHp();
|
|
||||||
float speed = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.SPEED_TYPE);
|
|
||||||
CommonProto.Hero heroProto = CBean2Proto.getHero(hero);
|
|
||||||
CommonProto.HeroFightInfo heroFightInfo = CommonProto.HeroFightInfo
|
|
||||||
.newBuilder()
|
|
||||||
.setAttack(attack)
|
|
||||||
.setPhysicalDefence(physicalDefence)
|
|
||||||
.setMagicDefence(magicDefence)
|
|
||||||
.setHp(hp)
|
|
||||||
.setSpeed(speed)
|
|
||||||
.setHero(heroProto)
|
|
||||||
.build();
|
|
||||||
heroFightInfos.add(heroFightInfo);
|
|
||||||
}
|
|
||||||
eventUpdateResponse.addAllHeroFightInfos(heroFightInfos);
|
|
||||||
List<CommonProto.Monster> monsterByGroup = MonsterUtil.getMonsterByGroup(behaviorTypeValues[0][0]);
|
|
||||||
eventUpdateResponse.addAllMonsterList(monsterByGroup);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,10 @@
|
||||||
package com.ljsd.jieling.handler.map.behavior;
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
import com.ljsd.jieling.handler.map.EventType;
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
import com.ljsd.jieling.handler.map.MapLogic;
|
|
||||||
import com.ljsd.jieling.handler.mission.Mission;
|
|
||||||
import com.ljsd.jieling.handler.mission.MissionLogic;
|
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.protocols.CommonProto;
|
|
||||||
import com.ljsd.jieling.protocols.MapInfoProto;
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class FinishMissionBehavior extends BaseBehavior {
|
public class FinishMissionBehavior extends BaseBehavior {
|
||||||
@Override
|
@Override
|
||||||
|
@ -20,14 +14,6 @@ public class FinishMissionBehavior extends BaseBehavior {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
Map<Integer, Mission> doingMissions = user.getMissionManager().getDoingMissions();
|
return BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
Mission mission = doingMissions.get(behaviorTypeValues[0][0]);
|
|
||||||
if (mission == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
MissionLogic.getInstance().checkMission(mission, user);
|
|
||||||
CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission);
|
|
||||||
eventUpdateResponse.setMission(missionProto);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.config.MapPointConfig;
|
||||||
|
import com.ljsd.jieling.handler.map.Cell;
|
||||||
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
|
import com.ljsd.jieling.logic.dao.User;
|
||||||
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import com.ljsd.jieling.util.CellUtil;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class MonitorMissionAndDestroyPointBehavior extends BaseBehavior {
|
||||||
|
@Override
|
||||||
|
public int getBehaviorType() {
|
||||||
|
return EventType.monitorMissionAndDestroyPoint;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
|
BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
|
// 销毁事件点
|
||||||
|
BehaviorUtil.distoryPoint(user);
|
||||||
|
// 开新事件
|
||||||
|
if (user.getMapManager().getCurMapId() == behaviorTypeValues[0][1]) {
|
||||||
|
int x = behaviorTypeValues[1][0];
|
||||||
|
int y = behaviorTypeValues[1][1];
|
||||||
|
int xy = CellUtil.xy2Pos(x, y);
|
||||||
|
MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[1][2]);
|
||||||
|
Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId());
|
||||||
|
user.getMapManager().addOrUpdateCell(xy, cellValue);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
|
import com.ljsd.jieling.logic.dao.User;
|
||||||
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import com.ljsd.jieling.util.CellUtil;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class MonitorMissionAndMoveBehavior extends BaseBehavior {
|
||||||
|
@Override
|
||||||
|
public int getBehaviorType() {
|
||||||
|
return EventType.monitorMissionAndMove;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception {
|
||||||
|
BehaviorUtil.updateMission(user, behaviorTypeValues, eventUpdateResponse);
|
||||||
|
// 0的时候回城
|
||||||
|
if (behaviorTypeValues[0][1] == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
int xy = CellUtil.xy2Pos(behaviorTypeValues[0][2], behaviorTypeValues[0][3]);
|
||||||
|
user.getMapManager().setCurXY(xy);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +1,7 @@
|
||||||
package com.ljsd.jieling.handler.map.behavior;
|
package com.ljsd.jieling.handler.map.behavior;
|
||||||
|
|
||||||
|
import com.ljsd.jieling.config.MapPointConfig;
|
||||||
|
import com.ljsd.jieling.handler.map.Cell;
|
||||||
import com.ljsd.jieling.handler.map.EventType;
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
import com.ljsd.jieling.handler.map.MapLogic;
|
import com.ljsd.jieling.handler.map.MapLogic;
|
||||||
import com.ljsd.jieling.handler.mission.Mission;
|
import com.ljsd.jieling.handler.mission.Mission;
|
||||||
|
@ -7,6 +9,7 @@ import com.ljsd.jieling.handler.mission.MissionLogic;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.protocols.CommonProto;
|
import com.ljsd.jieling.protocols.CommonProto;
|
||||||
import com.ljsd.jieling.protocols.MapInfoProto;
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
|
import com.ljsd.jieling.util.CellUtil;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -28,8 +31,15 @@ public class OpenMissionBehavior extends BaseBehavior {
|
||||||
MissionLogic.getInstance().checkMission(mission, user);
|
MissionLogic.getInstance().checkMission(mission, user);
|
||||||
CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission);
|
CommonProto.Mission missionProto = MapLogic.getInstance().getMission(mission);
|
||||||
eventUpdateResponse.setMission(missionProto);
|
eventUpdateResponse.setMission(missionProto);
|
||||||
// TODO 还要开新事件
|
// 开新事件
|
||||||
|
if (user.getMapManager().getCurMapId() == behaviorTypeValues[1][0]) {
|
||||||
|
int x = behaviorTypeValues[1][1];
|
||||||
|
int y = behaviorTypeValues[1][2];
|
||||||
|
int xy = CellUtil.xy2Pos(x, y);
|
||||||
|
MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(behaviorTypeValues[1][3]);
|
||||||
|
Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId());
|
||||||
|
user.getMapManager().addOrUpdateCell(xy, cellValue);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,7 @@ public class UseItemAndDestroyBehavior extends BaseBehavior {
|
||||||
if (!isEnough) {
|
if (!isEnough) {
|
||||||
return isEnough;
|
return isEnough;
|
||||||
}
|
}
|
||||||
Map<Integer, Cell> mapInfo = user.getMapManager().getMapInfo();
|
BehaviorUtil.distoryPoint(user);
|
||||||
mapInfo.remove(user.getMapManager().getCurXY());
|
|
||||||
user.getMapManager().setMapInfo(mapInfo);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.dao;
|
||||||
|
|
||||||
|
|
||||||
import com.ljsd.jieling.config.SGameSetting;
|
import com.ljsd.jieling.config.SGameSetting;
|
||||||
|
import com.ljsd.jieling.config.SMissionEventsConfig;
|
||||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||||
import com.ljsd.jieling.handler.map.MapManager;
|
import com.ljsd.jieling.handler.map.MapManager;
|
||||||
import com.ljsd.jieling.handler.mission.Mission;
|
import com.ljsd.jieling.handler.mission.Mission;
|
||||||
|
@ -79,10 +80,11 @@ public class UserManager {
|
||||||
SGameSetting gameSetting = SGameSetting.getGameSetting();
|
SGameSetting gameSetting = SGameSetting.getGameSetting();
|
||||||
ItemUtil.drop(user,gameSetting.getBornItem());
|
ItemUtil.drop(user,gameSetting.getBornItem());
|
||||||
MissionManager missionManager = user.getMissionManager();
|
MissionManager missionManager = user.getMissionManager();
|
||||||
|
SMissionEventsConfig sMissionEventsConfig = SMissionEventsConfig.sMissionEventsConfigMap.get(1);
|
||||||
Mission mission = new Mission();
|
Mission mission = new Mission();
|
||||||
mission.setMissionId(1);
|
mission.setMissionId(1);
|
||||||
mission.setMissionStep(0);
|
mission.setMissionStep(0);
|
||||||
mission.setMissionInfo("");
|
mission.setMissionInfo("0#0#" + sMissionEventsConfig.getMissionNum());
|
||||||
missionManager.getDoingMissions().put(mission.getMissionId(), mission);
|
missionManager.getDoingMissions().put(mission.getMissionId(), mission);
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
//TODO
|
//TODO
|
||||||
|
|
Loading…
Reference in New Issue