Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coupon buff fix + concurrency fixes

Browse Source 
Fixed coupon buff icon not showing properly. Fixed some cases involving
coupons and buff removal not dealing properly with concurrent access.
This commit is contained in:
ronancpl
2017-06-19 17:44:01 -03:00
parent 42fe74955d
commit 7f6d420cf1
58 changed files with 345 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
wz/Item.wz/Cash/0521.img.xml
View File

@@ -22,8 +22,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211004">
@@ -46,8 +46,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211005">
@@ -70,8 +70,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211006">
@@ -94,8 +94,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211007">
@@ -118,8 +118,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211008">
@@ -142,8 +142,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211009">
@@ -163,8 +163,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211010">
@@ -184,8 +184,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211011">
@@ -205,8 +205,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211012">
@@ -226,8 +226,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211013">
@@ -247,8 +247,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211014">
@@ -273,8 +273,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211015">
@@ -299,8 +299,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211016">
@@ -325,8 +325,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211017">
@@ -351,8 +351,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211018">
@@ -377,8 +377,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211037">
@@ -401,8 +401,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211038">
@@ -422,8 +422,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211039">
@@ -448,8 +448,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211040">
@@ -472,8 +472,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211041">
@@ -493,8 +493,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211042">
@@ -519,8 +519,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211043">
@@ -543,8 +543,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211044">
@@ -564,8 +564,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05211045">
@@ -590,8 +590,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05211046">
@@ -616,8 +616,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="3"/>
</imgdir>
</imgdir>
<imgdir name="05211048">
@@ -642,8 +642,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="3"/>
</imgdir>
</imgdir>
<imgdir name="05211049">
@@ -668,8 +668,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="3"/>
</imgdir>
</imgdir>
<imgdir name="05211052">
@@ -695,8 +695,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="3"/>
</imgdir>
</imgdir>
<imgdir name="05211060">
@@ -722,8 +722,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="expR" value="4"/>
</imgdir>
</imgdir>
</imgdir>

20
wz/Item.wz/Cash/0536.img.xml
View File

@@ -22,8 +22,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="1"/>
</imgdir>
</imgdir>
<imgdir name="05360001">
@@ -48,8 +48,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360002">
@@ -74,8 +74,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360003">
@@ -100,8 +100,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360004">
@@ -126,8 +126,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360005">
@@ -152,8 +152,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360006">
@@ -178,8 +178,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360007">
@@ -204,8 +204,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360008">
@@ -230,8 +230,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="2"/>
</imgdir>
</imgdir>
<imgdir name="05360042">
@@ -256,8 +256,8 @@
</imgdir>
</imgdir>
<imgdir name="spec">
<int name="pad" value="5"/>
<int name="time" value="2100000"/>
<int name="drpR" value="3"/>
</imgdir>
</imgdir>
</imgdir>