diff --git a/assets/Game/prefabs/History/history.prefab b/assets/Game/prefabs/History/history.prefab index 1209b75..8d39321 100644 --- a/assets/Game/prefabs/History/history.prefab +++ b/assets/Game/prefabs/History/history.prefab @@ -28,41 +28,41 @@ "__id__": 76 }, { - "__id__": 132 + "__id__": 134 }, { - "__id__": 152 + "__id__": 154 }, { - "__id__": 169 + "__id__": 171 }, { - "__id__": 240 + "__id__": 242 }, { - "__id__": 319 + "__id__": 321 }, { - "__id__": 335 + "__id__": 337 }, { - "__id__": 343 + "__id__": 345 } ], "_active": true, "_components": [ - { - "__id__": 353 - }, { "__id__": 355 }, { "__id__": 357 + }, + { + "__id__": 359 } ], "_prefab": { - "__id__": 359 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -1881,26 +1881,26 @@ "__id__": 77 }, { - "__id__": 107 + "__id__": 109 } ], "_active": true, "_components": [ - { - "__id__": 125 - }, { "__id__": 127 }, { - "__id__": 122 + "__id__": 129 }, { - "__id__": 129 + "__id__": 124 + }, + { + "__id__": 131 } ], "_prefab": { - "__id__": 131 + "__id__": 133 }, "_lpos": { "__type__": "cc.Vec3", @@ -1960,10 +1960,13 @@ }, { "__id__": 104 + }, + { + "__id__": 106 } ], "_prefab": { - "__id__": 106 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2502,7 +2505,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1604 + "height": 1605.472 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2583,6 +2586,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a4hm6TWFhC65c1y/iy31OT" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 77 + }, + "_enabled": true, + "__prefab": { + "__id__": 107 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 1080, + "_originalHeight": 1604, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "52JVxg8O9KlJTQJy1lRofI" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2606,14 +2645,11 @@ }, "_children": [ { - "__id__": 108 + "__id__": 110 } ], "_active": true, "_components": [ - { - "__id__": 114 - }, { "__id__": 116 }, @@ -2622,10 +2658,13 @@ }, { "__id__": 120 + }, + { + "__id__": 122 } ], "_prefab": { - "__id__": 124 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -2662,20 +2701,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 109 }, "_children": [], "_active": true, "_components": [ { - "__id__": 109 + "__id__": 111 }, { - "__id__": 111 + "__id__": 113 } ], "_prefab": { - "__id__": 113 + "__id__": 115 }, "_lpos": { "__type__": "cc.Vec3", @@ -2712,11 +2751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -2740,11 +2779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 110 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2795,11 +2834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2823,11 +2862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 119 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2865,11 +2904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 121 }, "_alignFlags": 37, "_target": null, @@ -2901,17 +2940,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 123 }, "_scrollView": { - "__id__": 122 + "__id__": 124 }, "_handle": { - "__id__": 111 + "__id__": 113 }, "_direction": 1, "_enableAutoHide": true, @@ -2932,7 +2971,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 125 }, "bounceDuration": 0.23, "brake": 0.75, @@ -2947,7 +2986,7 @@ }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 120 + "__id__": 122 }, "_id": "" }, @@ -2978,7 +3017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -3006,7 +3045,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 130 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3051,7 +3090,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 132 }, "_alignFlags": 5, "_target": null, @@ -3100,23 +3139,23 @@ }, "_children": [ { - "__id__": 133 + "__id__": 135 }, { - "__id__": 139 + "__id__": 141 } ], "_active": true, "_components": [ { - "__id__": 147 + "__id__": 149 }, { - "__id__": 149 + "__id__": 151 } ], "_prefab": { - "__id__": 151 + "__id__": 153 }, "_lpos": { "__type__": "cc.Vec3", @@ -3153,20 +3192,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [], "_active": true, "_components": [ { - "__id__": 134 + "__id__": 136 }, { - "__id__": 136 + "__id__": 138 } ], "_prefab": { - "__id__": 138 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -3203,11 +3242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", @@ -3231,11 +3270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3292,23 +3331,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 140 - }, { "__id__": 142 }, { "__id__": 144 + }, + { + "__id__": 146 } ], "_prefab": { - "__id__": 146 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -3345,11 +3384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -3373,11 +3412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3444,11 +3483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 147 }, "key": "Game History", "maxWidth": 800, @@ -3477,11 +3516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 150 }, "_contentSize": { "__type__": "cc.Size", @@ -3505,11 +3544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 152 }, "_alignFlags": 1, "_target": null, @@ -3558,14 +3597,11 @@ }, "_children": [ { - "__id__": 153 + "__id__": 155 } ], "_active": true, "_components": [ - { - "__id__": 159 - }, { "__id__": 161 }, @@ -3573,11 +3609,14 @@ "__id__": 163 }, { - "__id__": 166 + "__id__": 165 + }, + { + "__id__": 168 } ], "_prefab": { - "__id__": 168 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -3614,20 +3653,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 152 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 154 + "__id__": 156 }, { - "__id__": 156 + "__id__": 158 } ], "_prefab": { - "__id__": 158 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -3664,11 +3703,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", @@ -3692,11 +3731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3750,11 +3789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -3778,11 +3817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3820,15 +3859,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 166 }, "clickEvents": [ { - "__id__": 165 + "__id__": 167 } ], "_interactable": true, @@ -3868,7 +3907,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 152 + "__id__": 154 }, "_id": "" }, @@ -3892,11 +3931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 169 }, "_alignFlags": 1, "_target": null, @@ -3945,41 +3984,41 @@ }, "_children": [ { - "__id__": 170 + "__id__": 172 }, { - "__id__": 176 + "__id__": 178 }, { - "__id__": 182 + "__id__": 184 }, { - "__id__": 197 + "__id__": 199 }, { - "__id__": 203 + "__id__": 205 }, { - "__id__": 211 + "__id__": 213 }, { - "__id__": 219 + "__id__": 221 }, { - "__id__": 227 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 235 + "__id__": 237 }, { - "__id__": 237 + "__id__": 239 } ], "_prefab": { - "__id__": 239 + "__id__": 241 }, "_lpos": { "__type__": "cc.Vec3", @@ -4016,20 +4055,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 171 + "__id__": 173 }, { - "__id__": 173 + "__id__": 175 } ], "_prefab": { - "__id__": 175 + "__id__": 177 }, "_lpos": { "__type__": "cc.Vec3", @@ -4066,11 +4105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 174 }, "_contentSize": { "__type__": "cc.Size", @@ -4094,11 +4133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 176 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4152,20 +4191,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 179 }, { - "__id__": 179 + "__id__": 181 } ], "_prefab": { - "__id__": 181 + "__id__": 183 }, "_lpos": { "__type__": "cc.Vec3", @@ -4202,11 +4241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 180 }, "_contentSize": { "__type__": "cc.Size", @@ -4230,11 +4269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 182 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4311,27 +4350,27 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [ { - "__id__": 183 + "__id__": 185 } ], "_active": true, "_components": [ - { - "__id__": 189 - }, { "__id__": 191 }, { "__id__": 193 + }, + { + "__id__": 195 } ], "_prefab": { - "__id__": 196 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -4368,20 +4407,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 184 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 186 }, { - "__id__": 186 + "__id__": 188 } ], "_prefab": { - "__id__": 188 + "__id__": 190 }, "_lpos": { "__type__": "cc.Vec3", @@ -4418,11 +4457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 187 }, "_contentSize": { "__type__": "cc.Size", @@ -4446,11 +4485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 185 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 189 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4504,11 +4543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 192 }, "_contentSize": { "__type__": "cc.Size", @@ -4532,11 +4571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 194 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4574,15 +4613,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 184 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 196 }, "clickEvents": [ { - "__id__": 195 + "__id__": 197 } ], "_interactable": true, @@ -4622,7 +4661,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 182 + "__id__": 184 }, "_id": "" }, @@ -4659,20 +4698,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ { - "__id__": 198 + "__id__": 200 }, { - "__id__": 200 + "__id__": 202 } ], "_prefab": { - "__id__": 202 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -4709,11 +4748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 199 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4737,11 +4776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 199 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 203 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4795,23 +4834,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 204 - }, { "__id__": 206 }, { "__id__": 208 + }, + { + "__id__": 210 } ], "_prefab": { - "__id__": 210 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -4848,11 +4887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 207 }, "_contentSize": { "__type__": "cc.Size", @@ -4876,11 +4915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 209 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4944,11 +4983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 211 }, "key": "Time", "maxWidth": 800, @@ -4977,23 +5016,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 212 - }, { "__id__": 214 }, { "__id__": 216 + }, + { + "__id__": 218 } ], "_prefab": { - "__id__": 218 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -5030,11 +5069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -5058,11 +5097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5126,11 +5165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 211 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 219 }, "key": "Transaction", "maxWidth": 800, @@ -5159,23 +5198,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 220 - }, { "__id__": 222 }, { "__id__": 224 + }, + { + "__id__": 226 } ], "_prefab": { - "__id__": 226 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -5212,11 +5251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -5240,11 +5279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5308,11 +5347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "key": "Bet", "maxWidth": 800, @@ -5341,23 +5380,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 169 + "__id__": 171 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 228 - }, { "__id__": 230 }, { "__id__": 232 + }, + { + "__id__": 234 } ], "_prefab": { - "__id__": 234 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -5394,11 +5433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -5422,11 +5461,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5490,11 +5529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 235 }, "key": "Profit", "maxWidth": 800, @@ -5523,11 +5562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -5551,11 +5590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 240 }, "_alignFlags": 1, "_target": null, @@ -5604,35 +5643,35 @@ }, "_children": [ { - "__id__": 241 + "__id__": 243 }, { - "__id__": 251 + "__id__": 253 }, { - "__id__": 257 + "__id__": 259 }, { - "__id__": 265 + "__id__": 267 }, { - "__id__": 282 + "__id__": 284 }, { - "__id__": 299 + "__id__": 301 } ], "_active": false, "_components": [ { - "__id__": 314 + "__id__": 316 }, { - "__id__": 316 + "__id__": 318 } ], "_prefab": { - "__id__": 318 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -5669,14 +5708,11 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 242 - }, { "__id__": 244 }, @@ -5685,10 +5721,13 @@ }, { "__id__": 248 + }, + { + "__id__": 250 } ], "_prefab": { - "__id__": 250 + "__id__": 252 }, "_lpos": { "__type__": "cc.Vec3", @@ -5725,11 +5764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 245 }, "_contentSize": { "__type__": "cc.Size", @@ -5753,11 +5792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 247 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5798,11 +5837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 249 }, "_opacity": 220, "_id": "" @@ -5817,11 +5856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 251 }, "_id": "" }, @@ -5848,20 +5887,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 254 }, { - "__id__": 254 + "__id__": 256 } ], "_prefab": { - "__id__": 256 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -5898,11 +5937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -5926,11 +5965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 257 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5984,23 +6023,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 258 - }, { "__id__": 260 }, { "__id__": 262 + }, + { + "__id__": 264 } ], "_prefab": { - "__id__": 264 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -6037,11 +6076,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6065,11 +6104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6133,11 +6172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 265 }, "key": "Select Date Range", "maxWidth": 800, @@ -6166,27 +6205,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [ { - "__id__": 266 + "__id__": 268 } ], "_active": true, "_components": [ - { - "__id__": 274 - }, { "__id__": 276 }, { "__id__": 278 + }, + { + "__id__": 280 } ], "_prefab": { - "__id__": 281 + "__id__": 283 }, "_lpos": { "__type__": "cc.Vec3", @@ -6223,23 +6262,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 265 + "__id__": 267 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 267 - }, { "__id__": 269 }, { "__id__": 271 + }, + { + "__id__": 273 } ], "_prefab": { - "__id__": 273 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -6276,11 +6315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6304,11 +6343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6372,11 +6411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 274 }, "key": "Today", "maxWidth": 800, @@ -6405,11 +6444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -6433,11 +6472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6478,15 +6517,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 281 }, "clickEvents": [ { - "__id__": 280 + "__id__": 282 } ], "_interactable": true, @@ -6526,7 +6565,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 265 + "__id__": 267 }, "_id": "" }, @@ -6563,27 +6602,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [ { - "__id__": 283 + "__id__": 285 } ], "_active": true, "_components": [ - { - "__id__": 291 - }, { "__id__": 293 }, { "__id__": 295 + }, + { + "__id__": 297 } ], "_prefab": { - "__id__": 298 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -6620,23 +6659,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 282 + "__id__": 284 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 284 - }, { "__id__": 286 }, { "__id__": 288 + }, + { + "__id__": 290 } ], "_prefab": { - "__id__": 290 + "__id__": 292 }, "_lpos": { "__type__": "cc.Vec3", @@ -6673,11 +6712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -6701,11 +6740,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6769,11 +6808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 291 }, "key": "Last 7 days", "maxWidth": 800, @@ -6802,11 +6841,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -6830,11 +6869,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 296 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6875,15 +6914,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 298 }, "clickEvents": [ { - "__id__": 297 + "__id__": 299 } ], "_interactable": true, @@ -6923,7 +6962,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 282 + "__id__": 284 }, "_id": "" }, @@ -6960,27 +6999,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 240 + "__id__": 242 }, "_children": [ { - "__id__": 300 + "__id__": 302 } ], "_active": true, "_components": [ - { - "__id__": 306 - }, { "__id__": 308 }, { "__id__": 310 + }, + { + "__id__": 312 } ], "_prefab": { - "__id__": 313 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -7017,20 +7056,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 299 + "__id__": 301 }, "_children": [], "_active": true, "_components": [ { - "__id__": 301 + "__id__": 303 }, { - "__id__": 303 + "__id__": 305 } ], "_prefab": { - "__id__": 305 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", @@ -7067,11 +7106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 304 }, "_contentSize": { "__type__": "cc.Size", @@ -7095,11 +7134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 306 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7153,11 +7192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -7181,11 +7220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 311 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7223,15 +7262,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 301 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 313 }, "clickEvents": [ { - "__id__": 312 + "__id__": 314 } ], "_interactable": true, @@ -7271,7 +7310,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 299 + "__id__": 301 }, "_id": "" }, @@ -7308,11 +7347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 240 + "__id__": 242 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 317 }, "_contentSize": { "__type__": "cc.Size", @@ -7336,11 +7375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 240 + "__id__": 242 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 319 }, "_alignFlags": 45, "_target": null, @@ -7389,14 +7428,11 @@ }, "_children": [ { - "__id__": 320 + "__id__": 322 } ], "_active": true, "_components": [ - { - "__id__": 326 - }, { "__id__": 328 }, @@ -7405,10 +7441,13 @@ }, { "__id__": 332 + }, + { + "__id__": 334 } ], "_prefab": { - "__id__": 334 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -7445,20 +7484,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 319 + "__id__": 321 }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 323 }, { - "__id__": 323 + "__id__": 325 } ], "_prefab": { - "__id__": 325 + "__id__": 327 }, "_lpos": { "__type__": "cc.Vec3", @@ -7495,11 +7534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 324 }, "_contentSize": { "__type__": "cc.Size", @@ -7523,11 +7562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 322 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7581,11 +7620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -7609,11 +7648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 331 }, "_type": 0, "_inverted": false, @@ -7631,11 +7670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7677,11 +7716,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 321 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 335 }, "_alignFlags": 45, "_target": null, @@ -7731,18 +7770,18 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 336 - }, { "__id__": 338 }, { "__id__": 340 + }, + { + "__id__": 342 } ], "_prefab": { - "__id__": 342 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", @@ -7779,11 +7818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 337 + "__id__": 339 }, "_contentSize": { "__type__": "cc.Size", @@ -7807,11 +7846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 341 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7852,11 +7891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 335 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 343 }, "_alignFlags": 18, "_target": null, @@ -7906,9 +7945,6 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 344 - }, { "__id__": 346 }, @@ -7917,10 +7953,13 @@ }, { "__id__": 350 + }, + { + "__id__": 352 } ], "_prefab": { - "__id__": 352 + "__id__": 354 }, "_lpos": { "__type__": "cc.Vec3", @@ -7957,11 +7996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -7985,11 +8024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 349 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8053,11 +8092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 351 }, "key": "No Game History", "maxWidth": 800, @@ -8073,11 +8112,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 343 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 353 }, "_alignFlags": 18, "_target": null, @@ -8126,7 +8165,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -8154,33 +8193,33 @@ }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 358 }, "langJson": { "__uuid__": "886ff858-7eea-4ec0-a58d-ad2cfe43721f", "__expectedType__": "cc.JsonAsset" }, "loading": { - "__id__": 335 + "__id__": 337 }, "sel_pnl": { - "__id__": 240 + "__id__": 242 }, "pnl_title": { - "__id__": 169 + "__id__": 171 }, "item_list": { "__id__": 12 }, "scrollView": { - "__id__": 122 + "__id__": 124 }, "history_detail": { "__uuid__": "e8cf20b4-0954-447d-b2c9-6f9d8da09c1c", "__expectedType__": "cc.Prefab" }, "node_detail": { - "__id__": 319 + "__id__": 321 }, "_id": "" }, @@ -8198,7 +8237,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 360 }, "_alignFlags": 45, "_target": null, diff --git a/assets/Game/scripts/SlotBar.ts b/assets/Game/scripts/SlotBar.ts index 177ea9a..16c71fd 100644 --- a/assets/Game/scripts/SlotBar.ts +++ b/assets/Game/scripts/SlotBar.ts @@ -120,7 +120,7 @@ export class SlotBar extends Component { private btnPositions: Map = new Map(); private isAnimating: boolean = false; private readonly DURATION = 0.1; - private readonly OFFSET_Y = -200; + private readonly OFFSET_Y = -300; private hasClickSpin: boolean = false; private hasClickManualStop: boolean = false; diff --git a/assets/Game/scripts/game/Paytable.ts b/assets/Game/scripts/game/Paytable.ts index 250f8d8..d650ce1 100644 --- a/assets/Game/scripts/game/Paytable.ts +++ b/assets/Game/scripts/game/Paytable.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform } from 'cc'; +import { _decorator, Component, EventMouse, JsonAsset, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc'; import { hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools'; import { getLanguage } from 'db://assets/Loading/scripts/comm'; const { ccclass, property } = _decorator; @@ -18,6 +18,7 @@ export class Paytable extends Component { this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"]; this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView) + this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment() this.scrollView.node.on('scrolling', this.onScrolling, this); this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this); diff --git a/assets/Game/scripts/game/Rules.ts b/assets/Game/scripts/game/Rules.ts index 9d439a6..cdf04f3 100644 --- a/assets/Game/scripts/game/Rules.ts +++ b/assets/Game/scripts/game/Rules.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform } from 'cc'; +import { _decorator, Component, EventMouse, JsonAsset, Label, Layout, math, Node, ScrollView, UITransform, Widget } from 'cc'; import { getAllRichTexts, hideToBottom, isBrahmic, updateLang, wrapTextBySpace } from './Tools'; import { getCsymbol, getLanguage } from 'db://assets/Loading/scripts/comm'; const { ccclass, property } = _decorator; @@ -16,7 +16,7 @@ export class Rules extends Component { protected onLoad(): void { this.dict = this.langJson.json[getLanguage()] ?? this.langJson.json["en"]; this.scrollView = this.node.getChildByName("ScrollView").getComponent(ScrollView) - + this.scrollView.node.getChildByName('view').getComponent(Widget).updateAlignment() this.scrollView.node.on('scrolling', this.onScrolling, this); this.node.on(Node.EventType.MOUSE_WHEEL, this.onMouseWheel, this); } @@ -49,7 +49,7 @@ export class Rules extends Component { Label_1_3.string = str } - + clickCloseRules() { const destroyFunc = () => { this.node.destroy() } hideToBottom(this.node, destroyFunc) diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index db72553..31a0718 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 89 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 90 + "__id__": 92 }, "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767" }, @@ -77,17 +77,11 @@ "__id__": 8 }, { - "__id__": 68 + "__id__": 70 } ], "_active": true, "_components": [ - { - "__id__": 83 - }, - { - "__id__": 84 - }, { "__id__": 85 }, @@ -99,6 +93,12 @@ }, { "__id__": 88 + }, + { + "__id__": 89 + }, + { + "__id__": 90 } ], "_prefab": null, @@ -354,6 +354,12 @@ }, { "__id__": 67 + }, + { + "__id__": 68 + }, + { + "__id__": 69 } ], "_prefab": null, @@ -2503,6 +2509,62 @@ }, "_id": "b39r/AfidO+pudz3SN7pqo" }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": null, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "1bp0mDHnVBYoa14QZI/k1G" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "d38dT/Kz1Kub1b05cwraDN" + }, { "__type__": "cc.Widget", "_name": "", @@ -2513,7 +2575,7 @@ }, "_enabled": true, "__prefab": null, - "_alignFlags": 45, + "_alignFlags": 5, "_target": null, "_left": 0, "_right": 0, @@ -2521,17 +2583,17 @@ "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, - "_isAbsLeft": false, + "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 1080, - "_originalHeight": 1920, + "_originalHeight": 2400, "_alignMode": 2, "_lockFlags": 0, - "_id": "ffH2CIHMVCZImyoyKJ54AK" + "_id": "2dAW/VTelFD4EAkT5IAFtx" }, { "__type__": "cc.Node", @@ -2543,22 +2605,22 @@ }, "_children": [ { - "__id__": 69 + "__id__": 71 }, { - "__id__": 73 + "__id__": 75 }, { - "__id__": 78 + "__id__": 80 } ], "_active": false, "_components": [ { - "__id__": 81 + "__id__": 83 }, { - "__id__": 82 + "__id__": 84 } ], "_prefab": null, @@ -2597,19 +2659,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 70 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 70 - }, - { - "__id__": 71 - }, { "__id__": 72 + }, + { + "__id__": 73 + }, + { + "__id__": 74 } ], "_prefab": null, @@ -2648,7 +2710,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -2670,7 +2732,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -2682,7 +2744,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -2721,22 +2783,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 70 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 74 - }, - { - "__id__": 75 - }, { "__id__": 76 }, { "__id__": 77 + }, + { + "__id__": 78 + }, + { + "__id__": 79 } ], "_prefab": null, @@ -2775,7 +2837,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2797,7 +2859,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2859,7 +2921,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2872,7 +2934,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2902,16 +2964,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 70 }, "_children": [], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 81 }, { - "__id__": 80 + "__id__": 82 } ], "_prefab": null, @@ -2950,7 +3012,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 78 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -2972,7 +3034,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 78 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -3011,7 +3073,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": null, @@ -3033,7 +3095,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 70 }, "_enabled": true, "__prefab": null, @@ -3164,7 +3226,7 @@ "__id__": 58 }, "rotateNode": { - "__id__": 68 + "__id__": 70 }, "_id": "d8F/UwpTxNpZhwSJjDvnkk" }, @@ -3221,29 +3283,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 91 - }, - "shadows": { - "__id__": 92 - }, - "_skybox": { "__id__": 93 }, - "fog": { + "shadows": { "__id__": 94 }, - "octree": { + "_skybox": { "__id__": 95 }, - "skin": { + "fog": { "__id__": 96 }, - "lightProbeInfo": { + "octree": { "__id__": 97 }, - "postSettings": { + "skin": { "__id__": 98 }, + "lightProbeInfo": { + "__id__": 99 + }, + "postSettings": { + "__id__": 100 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index f133be0..d333498 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env" const gameId = "rp_11001"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; let apiaddr = ""; -let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NTk5MjcsIlMiOjEwMDEsIkQiOiJycF8xMTAwMSJ9.AwA0djJhbyWN-O0SzdWu2bAVoFZXURVJXlLWqzpa0uc"; +let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI5MzA5ODEsIlMiOjEwMDAsIkQiOiJycF8xMTAwMSJ9.432SLYXxigvcnlARfSesXWhDOJ06QHzN3OvU791lMiw"; let language = "en" let currency = "THB"