【fix】数字可以增加小数

assets/app-bundle/app-view/page/main/native/PageMain.prefab

@@ -22899,8 +22899,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 140,
-      "height": 40
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -22938,8 +22938,8 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
+    "_actualFontSize": 51,
-    "_fontSize": 40,
+    "_fontSize": 50,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
@@ -37822,7 +37822,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180.66,
+      "width": 142.5,
       "height": 80
     },
     "_anchorPoint": {
@@ -37984,7 +37984,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 184.8,
+      "width": 145.6,
       "height": 80
     },
     "_anchorPoint": {

assets/app-bundle/app-view/page/main/native/PageMain.ts

@@ -283,7 +283,7 @@ export class PageMain extends BaseView {
     initBoradData(){
         for (let index = 0; index < this._board_data.length; index++) {
             const d = this._board_data[index];
-            let num = parseInt(d.ui_text) ? parseInt(d.ui_text) * this._ante_data[this._ante_index].mult : d.ui_text
+            let num = parseFloat(d.ui_text) ? parseFloat(d.ui_text) * this._ante_data[this._ante_index].mult : d.ui_text
             Tools.SetChildText(this.blocks[index], "num", num)
             Tools.SetChildText(this.blocks[index], "light/num", num)
             Tools.SetChildText(this.blocks[index], "point", d.grid_number)

assets/app-bundle/app-view/page/rewardhistory/native/PageRewardhistory.ts

@@ -73,9 +73,9 @@ export class PageRewardhistory extends BaseView {
                 this.loadSprite(d.win_coin >= 0 ? "rehis_bg_get" : "rehis_bg_lost", item)
                 let lang_str = LANG_ENUM[LANG_SET.langIndex]
                 Tools.ActChild(item, "win_" + lang_str, d.win_coin > 0)
-                if (d.win_coin > 0) Tools.SetChildText(item, "win_" + lang_str + "/lab", Math.trunc(d.win_coin).toString()) 
+                if (d.win_coin > 0) Tools.SetChildText(item, "win_" + lang_str + "/lab", Math.abs(d.win_coin).toString()) 
                 Tools.ActChild(item, "lose_" + lang_str, d.win_coin < 0)
-                if (d.win_coin < 0) Tools.SetChildText(item, "lose_" + lang_str + "/lab", Math.abs(Math.trunc(d.win_coin)).toString())
+                if (d.win_coin < 0) Tools.SetChildText(item, "lose_" + lang_str + "/lab", Math.abs(d.win_coin).toString())
                 Tools.ActChild(item, "more", d.win_coin == 0)
                 Tools.SetChildText(item, "time", d.create_time) 
             }

assets/res-native/font/font_coin_add.fnt

@@ -4,12 +4,12 @@ page id=0 file="font_coin_add.png"
 chars count=12
 char id=57 x=0 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=53 x=111 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=52 x=222 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=46 x=222 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=45 x=0 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=52 x=0 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=56 x=111 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=45 x=111 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=54 x=222 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=56 x=222 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=55 x=333 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=54 x=333 y=0 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
-char id=43 x=333 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
+char id=55 x=333 y=134 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=51 x=0 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=50 x=111 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15
 char id=49 x=222 y=268 width=110 height=133 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15

assets/res-native/font/font_coin_add.fnt.meta

@@ -13,9 +13,9 @@
       "fontSize": 133,
       "atlasName": "font_coin_add.png",
       "fontDefDictionary": {
-        "43": {
+        "45": {
           "rect": {
-            "x": 333,
+            "x": 111,
             "y": 134,
             "width": 110,
             "height": 133
@@ -24,10 +24,10 @@
           "yOffset": 0,
           "xAdvance": 110
         },
-        "45": {
+        "46": {
           "rect": {
-            "x": 0,
+            "x": 222,
-            "y": 134,
+            "y": 0,
             "width": 110,
             "height": 133
           },
@@ -81,8 +81,8 @@
         },
         "52": {
           "rect": {
-            "x": 222,
+            "x": 0,
-            "y": 0,
+            "y": 134,
             "width": 110,
             "height": 133
           },
@@ -103,8 +103,8 @@
         },
         "54": {
           "rect": {
-            "x": 222,
+            "x": 333,
-            "y": 134,
+            "y": 0,
             "width": 110,
             "height": 133
           },
@@ -115,7 +115,7 @@
         "55": {
           "rect": {
             "x": 333,
-            "y": 0,
+            "y": 134,
             "width": 110,
             "height": 133
           },
@@ -125,7 +125,7 @@
         },
         "56": {
           "rect": {
-            "x": 111,
+            "x": 222,
             "y": 134,
             "width": 110,
             "height": 133

assets/res-native/font/font_coin_add.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": -0.5,
         "offsetY": -0.5,
-        "trimX": 2,
+        "trimX": 0,
         "trimY": 2,
-        "width": 441,
+        "width": 443,
         "height": 399,
         "rawWidth": 444,
         "rawHeight": 402,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -220.5,
+            -221.5,
             -199.5,
             0,
-            220.5,
+            221.5,
             -199.5,
             0,
-            -220.5,
+            -221.5,
             199.5,
             0,
-            220.5,
+            221.5,
             199.5,
             0
           ],
@@ -83,32 +83,32 @@
             3
           ],
           "uv": [
-            2,
+            0,
             400,
             443,
             400,
-            2,
+            0,
             1,
             443,
             1
           ],
           "nuv": [
-            0.0045045045045045045,
+            0,
             0.0024875621890547263,
             0.9977477477477478,
             0.0024875621890547263,
-            0.0045045045045045045,
+            0,
             0.9950248756218906,
             0.9977477477477478,
             0.9950248756218906
           ],
           "minPos": [
-            -220.5,
+            -221.5,
             -199.5,
             0
           ],
           "maxPos": [
-            220.5,
+            221.5,
             199.5,
             0
           ]

assets/res-native/font/font_coin_sub.fnt

@@ -7,9 +7,9 @@ char id=53 x=85 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 c
 char id=56 x=170 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=51 x=0 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=43 x=85 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=49 x=170 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=46 x=170 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=55 x=255 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=49 x=255 y=0 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
-char id=45 x=255 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
+char id=55 x=255 y=101 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=48 x=0 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=57 x=85 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15
 char id=50 x=170 y=202 width=84 height=100 xoffset=0 yoffset=0 xadvance=84 page=0 chnl=15

assets/res-native/font/font_coin_sub.fnt.meta

@@ -24,9 +24,9 @@
           "yOffset": 0,
           "xAdvance": 84
         },
-        "45": {
+        "46": {
           "rect": {
-            "x": 255,
+            "x": 170,
             "y": 101,
             "width": 84,
             "height": 100
@@ -48,8 +48,8 @@
         },
         "49": {
           "rect": {
-            "x": 170,
+            "x": 255,
-            "y": 101,
+            "y": 0,
             "width": 84,
             "height": 100
           },
@@ -115,7 +115,7 @@
         "55": {
           "rect": {
             "x": 255,
-            "y": 0,
+            "y": 101,
             "width": 84,
             "height": 100
           },

assets/res-native/font/font_coin_sub.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
+        "offsetX": -0.5,
         "offsetY": 0.5,
         "trimX": 1,
         "trimY": 0,
-        "width": 338,
+        "width": 337,
         "height": 302,
         "rawWidth": 340,
         "rawHeight": 303,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -169,
+            -168.5,
             -151,
             0,
-            169,
+            168.5,
             -151,
             0,
-            -169,
+            -168.5,
             151,
             0,
-            169,
+            168.5,
             151,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             1,
             303,
-            339,
+            338,
             303,
             1,
             1,
-            339,
+            338,
             1
           ],
           "nuv": [
             0.0029411764705882353,
             0.0033003300330033004,
-            0.9970588235294118,
+            0.9941176470588236,
             0.0033003300330033004,
             0.0029411764705882353,
             1,
-            0.9970588235294118,
+            0.9941176470588236,
             1
           ],
           "minPos": [
-            -169,
+            -168.5,
             -151,
             0
           ],
           "maxPos": [
-            169,
+            168.5,
             151,
             0
           ]

assets/res-native/font/font_main_rw.fnt

@@ -1,7 +1,7 @@
 info face="face" size=58
 common lineHeight=58 scaleW=188 scaleH=177 pages=1
 page id=0 file="font_main_rw.png"
-chars count=10
+chars count=11
 char id=53 x=0 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=48 x=47 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=52 x=94 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
@@ -10,5 +10,6 @@ char id=49 x=47 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 c
 char id=57 x=94 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=51 x=141 y=0 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
 char id=54 x=141 y=59 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
-char id=50 x=0 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=46 x=0 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
-char id=56 x=47 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=50 x=47 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15
+char id=56 x=94 y=118 width=46 height=58 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15

assets/res-native/font/font_main_rw.fnt.meta

@@ -13,6 +13,17 @@
       "fontSize": 58,
       "atlasName": "font_main_rw.png",
       "fontDefDictionary": {
+        "46": {
+          "rect": {
+            "x": 0,
+            "y": 118,
+            "width": 46,
+            "height": 58
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 46
+        },
         "48": {
           "rect": {
             "x": 47,
@@ -37,7 +48,7 @@
         },
         "50": {
           "rect": {
-            "x": 0,
+            "x": 47,
             "y": 118,
             "width": 46,
             "height": 58
@@ -103,7 +114,7 @@
         },
         "56": {
           "rect": {
-            "x": 47,
+            "x": 94,
             "y": 118,
             "width": 46,
             "height": 58

assets/res-native/font/font_rehis_lose.fnt

@@ -1,14 +1,15 @@
 info face="face" size=62
 common lineHeight=62 scaleW=204 scaleH=188 pages=1
 page id=0 file="font_rehis_lose.png"
-chars count=10
+chars count=11
 char id=53 x=53 y=63 width=50 height=61 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=57 x=104 y=0 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
-char id=52 x=50 y=125 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=52 x=100 y=125 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=54 x=154 y=0 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
 char id=55 x=154 y=63 width=47 height=59 xoffset=0 yoffset=0 xadvance=47 page=0 chnl=15
 char id=50 x=0 y=0 width=52 height=61 xoffset=0 yoffset=0 xadvance=52 page=0 chnl=15
 char id=51 x=0 y=62 width=50 height=62 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=56 x=53 y=0 width=50 height=62 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=48 x=0 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
+char id=46 x=0 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
+char id=48 x=50 y=125 width=49 height=62 xoffset=0 yoffset=0 xadvance=49 page=0 chnl=15
 char id=49 x=104 y=63 width=40 height=60 xoffset=0 yoffset=0 xadvance=40 page=0 chnl=15

assets/res-native/font/font_rehis_lose.fnt.meta

@@ -13,7 +13,7 @@
       "fontSize": 62,
       "atlasName": "font_rehis_lose.png",
       "fontDefDictionary": {
-        "48": {
+        "46": {
           "rect": {
             "x": 0,
             "y": 125,
@@ -24,6 +24,17 @@
           "yOffset": 0,
           "xAdvance": 49
         },
+        "48": {
+          "rect": {
+            "x": 50,
+            "y": 125,
+            "width": 49,
+            "height": 62
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 49
+        },
         "49": {
           "rect": {
             "x": 104,
@@ -59,7 +70,7 @@
         },
         "52": {
           "rect": {
-            "x": 50,
+            "x": 100,
             "y": 125,
             "width": 50,
             "height": 60

assets/res-native/font/font_rehis_win.fnt

@@ -1,7 +1,7 @@
 info face="face" size=60
 common lineHeight=60 scaleW=204 scaleH=183 pages=1
 page id=0 file="font_rehis_win.png"
-chars count=10
+chars count=11
 char id=56 x=0 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=51 x=51 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=53 x=102 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
@@ -9,6 +9,7 @@ char id=50 x=0 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 ch
 char id=55 x=51 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=52 x=102 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
 char id=48 x=153 y=0 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=57 x=153 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=46 x=153 y=61 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=49 x=0 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=57 x=0 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
-char id=54 x=51 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=49 x=51 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15
+char id=54 x=102 y=122 width=50 height=60 xoffset=0 yoffset=0 xadvance=50 page=0 chnl=15

assets/res-native/font/font_rehis_win.fnt.meta

@@ -13,6 +13,17 @@
       "fontSize": 60,
       "atlasName": "font_rehis_win.png",
       "fontDefDictionary": {
+        "46": {
+          "rect": {
+            "x": 153,
+            "y": 61,
+            "width": 50,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 50
+        },
         "48": {
           "rect": {
             "x": 153,
@@ -26,7 +37,7 @@
         },
         "49": {
           "rect": {
-            "x": 0,
+            "x": 51,
             "y": 122,
             "width": 50,
             "height": 60
@@ -81,7 +92,7 @@
         },
         "54": {
           "rect": {
-            "x": 51,
+            "x": 102,
             "y": 122,
             "width": 50,
             "height": 60
@@ -114,8 +125,8 @@
         },
         "57": {
           "rect": {
-            "x": 153,
+            "x": 0,
-            "y": 61,
+            "y": 122,
             "width": 50,
             "height": 60
           },

assets/res-native/font/font_rehis_win.png.meta

@@ -42,11 +42,11 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
+        "offsetX": -1.5,
         "offsetY": 0.5,
         "trimX": 0,
         "trimY": 0,
-        "width": 202,
+        "width": 201,
         "height": 182,
         "rawWidth": 204,
         "rawHeight": 183,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -101,
+            -100.5,
             -91,
             0,
-            101,
+            100.5,
             -91,
             0,
-            -101,
+            -100.5,
             91,
             0,
-            101,
+            100.5,
             91,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             0,
             183,
-            202,
+            201,
             183,
             0,
             1,
-            202,
+            201,
             1
           ],
           "nuv": [
             0,
             0.00546448087431694,
-            0.9901960784313726,
+            0.9852941176470589,
             0.00546448087431694,
             0,
             1,
-            0.9901960784313726,
+            0.9852941176470589,
             1
           ],
           "minPos": [
-            -101,
+            -100.5,
             -91,
             0
           ],
           "maxPos": [
-            101,
+            100.5,
             91,
             0
           ]