pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-01-15 15:04:15 +07:00
commit bfe94f97c2
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_brewing3.xml
View file

@ -1127,6 +1127,7 @@
Var Cid = 39 Var Cid = 39
Else Else
Var Cid = 40 Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf EndIf
EndIf EndIf
@ -1240,6 +1241,7 @@
Var Cid = 39 Var Cid = 39
Else Else
Var Cid = 40 Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf EndIf
EndIf EndIf

2
xml/page_brewing3Conti.xml
View file

@ -602,6 +602,7 @@
Var Cid = 39 Var Cid = 39
Else Else
Var Cid = 40 Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf EndIf
EndIf EndIf
@ -721,6 +722,7 @@
Var Cid = 39 Var Cid = 39
Else Else
Var Cid = 40 Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf EndIf
EndIf EndIf

25
xml/page_collect_point_3_28.xml
View file

@ -602,28 +602,39 @@
Var PreviousSeeker = "tempSeeker" Var PreviousSeeker = "tempSeeker"
Var Seeker.UseGet15Discount = 0 Var Seeker.UseGet15Discount = 0
Var PreviousSeeker.UseGetDrink5Bath = 0 Var GetDrink5Bath = 0
If Seeker = "curr" Then If Seeker = "curr" Then
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
Var PreviousSeeker.UseGet15Discount = 0 Var PreviousSeeker.UseGet15Discount = 0
Var PreviousSeeker.UseGetDrink5Bath = 0
Else Else
If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then
If PreviousSeeker.UseGet15Discount = 1 Then If PreviousSeeker.UseGet15Discount = 1 Then
Var Get15DiscountState = "Disable2" Var Get15DiscountState = "Disable2"
EndIf EndIf
If PreviousSeeker.UseGetDrink5Bath = 1 Then
Var Get15DiscountState = "Disable2"
EndIf
Else Else
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
Var PreviousSeeker.UseGet15Discount = 0 Var PreviousSeeker.UseGet15Discount = 0
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf EndIf
EndIf EndIf
If CoffeePoint >= 28 Then If CoffeePoint >= 28 Then
Var KeepBnBtnImage = "/bn_close.png" Var KeepBnBtnImage = "/bn_close.png"
Var KeepBpBtnImage = "/bp_close.png" Var KeepBpBtnImage = "/bp_close.png"
Var Get15DiscountState = "Disable" If Get15DiscountState = "Disable2" Then
Var GetDrink5Bath = 0
Else
Var Get15DiscountState = "Disable2"
Var GetDrink5Bath = 1
Var PreviousSeeker.UseGetDrink5Bath = 1 Var PreviousSeeker.UseGetDrink5Bath = 1
EndIf
Else Else
If PreviousSeeker.UseGetDrink5Bath = 1 Then If PreviousSeeker.UseGetDrink5Bath = 1 Then
Var Get15DiscountState = "Disable2" Var Get15DiscountState = "Disable2"
@ -668,10 +679,14 @@
If CoffeePoint >= 28 Then If CoffeePoint >= 28 Then
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf EndIf
@ -814,10 +829,14 @@
; goto lid straw ; goto lid straw
;Open "ROOT/taobin_project/xml/page_back_to_main.xml" ;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If CoffeePoint >= 28 Then If CoffeePoint >= 28 Then
If GetDrink5Bath = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
Else Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -835,8 +854,6 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml" Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
</EventClick> </EventClick>