diff --git a/image/display_point/Polygon1.png b/image/display_point/Polygon1.png index eb34e522..f007776f 100644 Binary files a/image/display_point/Polygon1.png and b/image/display_point/Polygon1.png differ diff --git a/image/display_point/Polygon2.png b/image/display_point/Polygon2.png index 6055ebf4..baa436b5 100644 Binary files a/image/display_point/Polygon2.png and b/image/display_point/Polygon2.png differ diff --git a/image/display_point/bn_main.png b/image/display_point/bn_main.png new file mode 100644 index 00000000..39f8dd97 Binary files /dev/null and b/image/display_point/bn_main.png differ diff --git a/image/display_point/bp_main.png b/image/display_point/bp_main.png new file mode 100644 index 00000000..1ef92a0b Binary files /dev/null and b/image/display_point/bp_main.png differ diff --git a/image/display_point/imgCouponC33.png b/image/display_point/imgCouponC33.png index 25c468e9..402c3ffd 100644 Binary files a/image/display_point/imgCouponC33.png and b/image/display_point/imgCouponC33.png differ diff --git a/image/display_point/imgCouponC38.png b/image/display_point/imgCouponC38.png new file mode 100644 index 00000000..3d310063 Binary files /dev/null and b/image/display_point/imgCouponC38.png differ diff --git a/image/display_point/imgCouponC39.png b/image/display_point/imgCouponC39.png index fd91e59a..8d545dab 100644 Binary files a/image/display_point/imgCouponC39.png and b/image/display_point/imgCouponC39.png differ diff --git a/image/display_point/imgCouponC40.png b/image/display_point/imgCouponC40.png index 0555f667..a0a7362f 100644 Binary files a/image/display_point/imgCouponC40.png and b/image/display_point/imgCouponC40.png differ diff --git a/image/display_point/imgCouponC41.png b/image/display_point/imgCouponC41.png index c39b9395..be0ad5ea 100644 Binary files a/image/display_point/imgCouponC41.png and b/image/display_point/imgCouponC41.png differ diff --git a/image/display_point/imgCouponC42.png b/image/display_point/imgCouponC42.png index 7e10e2fe..937844fb 100644 Binary files a/image/display_point/imgCouponC42.png and b/image/display_point/imgCouponC42.png differ diff --git a/image/display_point/imgCouponC44.png b/image/display_point/imgCouponC44.png index a22393ef..36da1036 100644 Binary files a/image/display_point/imgCouponC44.png and b/image/display_point/imgCouponC44.png differ diff --git a/image/display_point/taoLevel1.png b/image/display_point/taoLevel1.png index 5c98bd76..8fbe4bd3 100644 Binary files a/image/display_point/taoLevel1.png and b/image/display_point/taoLevel1.png differ diff --git a/image/display_point/taoLevel2.png b/image/display_point/taoLevel2.png index 8214c07f..0011fdfe 100644 Binary files a/image/display_point/taoLevel2.png and b/image/display_point/taoLevel2.png differ diff --git a/image/display_point/taoLevel3.png b/image/display_point/taoLevel3.png index 251f6551..3af9828c 100644 Binary files a/image/display_point/taoLevel3.png and b/image/display_point/taoLevel3.png differ diff --git a/image/display_point/taoLevel4.png b/image/display_point/taoLevel4.png new file mode 100644 index 00000000..c7831f85 Binary files /dev/null and b/image/display_point/taoLevel4.png differ diff --git a/image/display_point/text5.png b/image/display_point/text5.png index 6297db83..ad127130 100644 Binary files a/image/display_point/text5.png and b/image/display_point/text5.png differ diff --git a/image/display_point_en/bn_main.png b/image/display_point_en/bn_main.png new file mode 100644 index 00000000..42053bd0 Binary files /dev/null and b/image/display_point_en/bn_main.png differ diff --git a/image/display_point_en/bp_main.png b/image/display_point_en/bp_main.png new file mode 100644 index 00000000..93389356 Binary files /dev/null and b/image/display_point_en/bp_main.png differ diff --git a/image/display_point_en/imgCouponC33.png b/image/display_point_en/imgCouponC33.png index f1160235..a11bbfce 100644 Binary files a/image/display_point_en/imgCouponC33.png and b/image/display_point_en/imgCouponC33.png differ diff --git a/image/display_point_en/imgCouponC38.png b/image/display_point_en/imgCouponC38.png new file mode 100644 index 00000000..0845e89b Binary files /dev/null and b/image/display_point_en/imgCouponC38.png differ diff --git a/image/display_point_en/imgCouponC39.png b/image/display_point_en/imgCouponC39.png index bc325145..f9748916 100644 Binary files a/image/display_point_en/imgCouponC39.png and b/image/display_point_en/imgCouponC39.png differ diff --git a/image/display_point_en/imgCouponC40.png b/image/display_point_en/imgCouponC40.png index 68c8ff21..011e6eba 100644 Binary files a/image/display_point_en/imgCouponC40.png and b/image/display_point_en/imgCouponC40.png differ diff --git a/image/display_point_en/imgCouponC41.png b/image/display_point_en/imgCouponC41.png index 13fef690..623295e9 100644 Binary files a/image/display_point_en/imgCouponC41.png and b/image/display_point_en/imgCouponC41.png differ diff --git a/image/display_point_en/imgCouponC42.png b/image/display_point_en/imgCouponC42.png index 72c21bea..a81437f5 100644 Binary files a/image/display_point_en/imgCouponC42.png and b/image/display_point_en/imgCouponC42.png differ diff --git a/image/display_point_en/imgCouponC44.png b/image/display_point_en/imgCouponC44.png index 7c9aa2ab..131e7c64 100644 Binary files a/image/display_point_en/imgCouponC44.png and b/image/display_point_en/imgCouponC44.png differ diff --git a/image/display_point_en/taoLevel1.png b/image/display_point_en/taoLevel1.png index bbe0ebf3..36192252 100644 Binary files a/image/display_point_en/taoLevel1.png and b/image/display_point_en/taoLevel1.png differ diff --git a/image/display_point_en/taoLevel2.png b/image/display_point_en/taoLevel2.png index 138a2f77..c521834b 100644 Binary files a/image/display_point_en/taoLevel2.png and b/image/display_point_en/taoLevel2.png differ diff --git a/image/display_point_en/taoLevel3.png b/image/display_point_en/taoLevel3.png index 0a3a8a77..ab21e61d 100644 Binary files a/image/display_point_en/taoLevel3.png and b/image/display_point_en/taoLevel3.png differ diff --git a/image/display_point_en/taoLevel4.png b/image/display_point_en/taoLevel4.png new file mode 100644 index 00000000..68aa3c76 Binary files /dev/null and b/image/display_point_en/taoLevel4.png differ diff --git a/image/display_point_en/text5.png b/image/display_point_en/text5.png index d2ac31e5..05bbd56b 100644 Binary files a/image/display_point_en/text5.png and b/image/display_point_en/text5.png differ diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 621d657b..c342e380 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -49,6 +49,8 @@ Var StepX = 0 + Var TaobinCredit = 0 + 1000 @@ -110,24 +112,39 @@ Else - Var PolygonST1 = "Invisible" - Var PolygonST2 = "Invisible" - Var CouponSTA = "Invisible" - Var CouponSTB = "Invisible" + If StepX = 1 Then - Var CouponPage = 1 - Var MakeDrinkState = 0 - Var CouponInfo1 = Ext1a - Var CouponInfo2 = Ext1b - Var CouponInfo3 = Ext1c - Var CouponInfo4 = Ext1d - Var CouponInfo5 = Ext1e - Var CouponInfo6 = Ext1f - Var CouponInfo7 = Ext1g - Var CouponInfo8 = Ext1h - Var CouponInfo9 = Ext1i - Var CouponInfo10 = Ext1j - Open "ROOT/taobin_project/xml/page_check_member2.xml" + Var PolygonST1 = "Invisible" + Var PolygonST2 = "Invisible" + Var CouponSTA = "Invisible" + Var CouponSTB = "Invisible" + + Var CouponPage = 1 + Var MakeDrinkState = 0 + Var CouponInfo1 = Ext1a + Var CouponInfo2 = Ext1b + Var CouponInfo3 = Ext1c + Var CouponInfo4 = Ext1d + Var CouponInfo5 = Ext1e + Var CouponInfo6 = Ext1f + Var CouponInfo7 = Ext1g + Var CouponInfo8 = Ext1h + Var CouponInfo9 = Ext1i + Var CouponInfo10 = Ext1j + + GETACCEXT TelephoneNumber 13 + + Var StepX = 2 + + + + Else + + Var TaobinCredit = Ext1b + Open "ROOT/taobin_project/xml/page_check_member2.xml" + EndIf + + EndIf diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml index 8361f804..919e03df 100644 --- a/xml/page_check_member2.xml +++ b/xml/page_check_member2.xml @@ -31,7 +31,7 @@ EndIf - Var PointDiff = 150 - CoffeePointRank + ;Var PointDiff = 150 - CoffeePointRank Var TaobinExpireDay = "" @@ -208,19 +208,51 @@ If TaobinLevel = "2" Then Var TaobinLevelDesc1 = "Walking turtle level" + Var PointDiff = 150 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff - Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level" Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + Var TaobinLeveImg = "/taoLevel3.png" + + Var TaobinLevelDesc1 = "Flying turtle level " + Var TaobinLevelDesc2 = "" + Var CoffeePointRank = CoffeePointRank - 150 + + EndIf + EndIf If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - Var TaobinLevelDesc2 = "" + Var PointDiff = 350 - CoffeePointRank + Var TaobinLevelDesc2 = "Earn " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " stamps " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level" Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 349 Then + Var TaobinLeveImg = "/taoLevel4.png" + + Var TaobinLevelDesc1 = "Master turtle level " + Var TaobinLevelDesc2 = "" + Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" EndIf @@ -237,19 +269,50 @@ If TaobinLevel = "2" Then Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ" + Var PointDiff = 150 - CoffeePointRank Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง " Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก" Var TaobinLeveImg = "/taoLevel2.png" + + If CoffeePointRank > 149 Then + Var TaobinLeveImg = "/taoLevel3.png" + + Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก " + Var TaobinLevelDesc2 = "" + Var CoffeePointRank = CoffeePointRank - 150 + + EndIf EndIf If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp - Var TaobinLevelDesc2 = "" + Var PointDiff = 350 - CoffeePointRank + Var TaobinLevelDesc2 = "สะสมแสตมป์อีก " + PointDiff + Var TaobinLevelDesc2 = TaobinLevelDesc2 + " ดวง " + Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า" + Var TaobinLeveImg = "/taoLevel3.png" + + If CoffeePointRank > 349 Then + Var TaobinLeveImg = "/taoLevel4.png" + + Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า " + Var TaobinLevelDesc2 = "" + Var CoffeePointRank = CoffeePointRank - 350 + + EndIf + EndIf + + If TaobinLevel = "4" Then + Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp + + Var TaobinLevelDesc2 = "" + + Var TaobinLeveImg = "/taoLevel4.png" EndIf @@ -404,6 +467,9 @@ If CouponTypeA = "103" Then Var CouponNameA = "/imgCouponC40.png" EndIf + If CouponTypeA = "105" Then + Var CouponNameA = "/imgCouponC38.png" + EndIf If CouponTypeA = "106" Then Var CouponNameA = "/imgCouponC41.png" EndIf @@ -503,6 +569,9 @@ If CouponTypeB = "103" Then Var CouponNameB = "/imgCouponC40.png" EndIf + If CouponTypeB = "103" Then + Var CouponNameB = "/imgCouponC38.png" + EndIf If CouponTypeB = "106" Then Var CouponNameB = "/imgCouponC41.png" EndIf @@ -608,6 +677,9 @@ If CouponTypeA = "103" Then Var CouponNameA = "/imgCouponC40.png" EndIf + If CouponTypeA = "105" Then + Var CouponNameA = "/imgCouponC38.png" + EndIf If CouponTypeA = "106" Then Var CouponNameA = "/imgCouponC41.png" EndIf @@ -706,6 +778,9 @@ If CouponTypeB = "103" Then Var CouponNameB = "/imgCouponC40.png" EndIf + If CouponTypeB = "105" Then + Var CouponNameB = "/imgCouponC38.png" + EndIf If CouponTypeB = "106" Then Var CouponNameB = "/imgCouponC41.png" EndIf @@ -775,7 +850,7 @@ EndIf - Var CouponText = "คูปอง (" + CouponNum + Var CouponText = "คูปองสะสม (" + CouponNum Var CouponText = CouponText + ")" EndIf @@ -783,7 +858,13 @@ - + If MakeDrinkState = 1 Then + Var bn_exit = "/bn_cancel2.png" + Var bp_exit = "/bp_cancel2.png" + Else + Var bn_exit = "/bn_main.png" + Var bp_exit = "/bp_main.png" + EndIf @@ -908,8 +989,8 @@ - 148 - 631 + 162 + 560 Var( DirImage + "/text5.png" ) @@ -917,8 +998,8 @@ - 700 - 600 + 617 + 587 Var( DirImage + TaobinLeveImg ) ; @@ -932,38 +1013,50 @@ - 150 - 684 + 253 + 669 35 1000 KanitRegularTTF - 0x513C2F + 0xFFFFFF TaobinName - 150 - 725 + 253 + 720 20 1000 KanitRegularTTF - 0x746253 + 0xFFFFFF TNumberTaobinMemberXXX - 438 - 684 - 50 - 120 + 546 + 865 + 70 + 384 + Center KanitRegularTTF 0xDE794E CoffeePointRank - 150 - 848 + 162 + 865 + 70 + 384 + Center + KanitRegularTTF + 0xDE794E + TaobinCredit + + + + 159 + 1000 25 1000 KanitRegularTTF @@ -972,8 +1065,8 @@ - 150 - 885 + 159 + 1032 20 1000 KanitRegularTTF @@ -984,10 +1077,10 @@ - 410 - 1297 + 372 + 1370 15 600 KanitRegularTTF @@ -1050,8 +1143,8 @@ - 410 - 1521 + 372 + 1613 15 600 KanitRegularTTF @@ -1083,8 +1176,8 @@