fanyijian преди 1 година
родител
ревизия
fc030b5efa

+ 295 - 339
yaml/battle_task.yaml

@@ -1,339 +1,295 @@
-gametype_count:
-  1: 3,4,5,3,4,5,5,5
-gametype:
-  1:
-    - 1
-    - 2
-    - 3
-gift_list:
-  1:
-    room_1:
-      - id: 1
-        weight: 30
-        roomtype: 1
-        giftpkg:
-          -
-            - 272
-            - 5
-          -
-            - 273
-            - 5
-      - id: 2
-        weight: 24
-        roomtype: 1
-        giftpkg:
-          -
-            - 274
-            - 10
-          -
-            - 275
-            - 5
-      - id: 3
-        weight: 10
-        roomtype: 1
-        giftpkg:
-          -
-            - 280
-            - 10
-          -
-            - 281
-            - 10
-      - id: 4
-        weight: 20
-        roomtype: 1
-        giftpkg:
-          -
-            - 15
-            - 1000
-      - id: 5
-        weight: 7
-        roomtype: 1
-        giftpkg:
-          -
-            - 15
-            - 2000
-      - id: 6
-        weight: 5
-        roomtype: 1
-        giftpkg:
-          -
-            - 15
-            - 3000
-      - id: 7
-        weight: 3
-        roomtype: 1
-        giftpkg:
-          -
-            - 15
-            - 5000
-      - id: 8
-        weight: 1
-        roomtype: 1
-        giftpkg:
-          -
-            - 15
-            - 20000
-    room_2:
-      - id: 9
-        weight: 30
-        roomtype: 2
-        giftpkg:
-          -
-            - 272
-            - 15
-          -
-            - 273
-            - 15
-      - id: 10
-        weight: 24
-        roomtype: 2
-        giftpkg:
-          -
-            - 274
-            - 25
-          -
-            - 275
-            - 20
-      - id: 11
-        weight: 10
-        roomtype: 2
-        giftpkg:
-          -
-            - 280
-            - 30
-          -
-            - 281
-            - 30
-      - id: 12
-        weight: 20
-        roomtype: 2
-        giftpkg:
-          -
-            - 15
-            - 3000
-      - id: 13
-        weight: 7
-        roomtype: 2
-        giftpkg:
-          -
-            - 15
-            - 5000
-      - id: 14
-        weight: 5
-        roomtype: 2
-        giftpkg:
-          -
-            - 15
-            - 10000
-      - id: 15
-        weight: 3
-        roomtype: 2
-        giftpkg:
-          -
-            - 15
-            - 20000
-      - id: 16
-        weight: 1
-        roomtype: 2
-        giftpkg:
-          -
-            - 15
-            - 60000
-    room_3:
-      - id: 17
-        weight: 30
-        roomtype: 3
-        giftpkg:
-          -
-            - 272
-            - 25
-          -
-            - 273
-            - 25
-      - id: 18
-        weight: 24
-        roomtype: 3
-        giftpkg:
-          -
-            - 274
-            - 40
-          -
-            - 275
-            - 30
-      - id: 19
-        weight: 10
-        roomtype: 3
-        giftpkg:
-          -
-            - 280
-            - 50
-          -
-            - 281
-            - 50
-      - id: 20
-        weight: 20
-        roomtype: 3
-        giftpkg:
-          -
-            - 15
-            - 10000
-      - id: 21
-        weight: 7
-        roomtype: 3
-        giftpkg:
-          -
-            - 15
-            - 20000
-      - id: 22
-        weight: 5
-        roomtype: 3
-        giftpkg:
-          -
-            - 15
-            - 30000
-      - id: 23
-        weight: 3
-        roomtype: 3
-        giftpkg:
-          -
-            - 15
-            - 50000
-      - id: 24
-        weight: 1
-        roomtype: 3
-        giftpkg:
-          -
-            - 15
-            - 200000
-    room_4:
-      - id: 25
-        weight: 30
-        roomtype: 4
-        giftpkg:
-          -
-            - 272
-            - 50
-          -
-            - 273
-            - 50
-      - id: 26
-        weight: 24
-        roomtype: 4
-        giftpkg:
-          -
-            - 274
-            - 100
-          -
-            - 275
-            - 100
-      - id: 27
-        weight: 10
-        roomtype: 4
-        giftpkg:
-          -
-            - 280
-            - 150
-          -
-            - 281
-            - 150
-      - id: 28
-        weight: 20
-        roomtype: 4
-        giftpkg:
-          -
-            - 15
-            - 30000
-      - id: 29
-        weight: 7
-        roomtype: 4
-        giftpkg:
-          -
-            - 15
-            - 60000
-      - id: 30
-        weight: 5
-        roomtype: 4
-        giftpkg:
-          -
-            - 15
-            - 100000
-      - id: 31
-        weight: 3
-        roomtype: 4
-        giftpkg:
-          -
-            - 15
-            - 150000
-      - id: 32
-        weight: 1
-        roomtype: 4
-        giftpkg:
-          -
-            - 15
-            - 600000
-    room_5:
-      - id: 33
-        weight: 30
-        roomtype: 5
-        giftpkg:
-          -
-            - 272
-            - 150
-          -
-            - 273
-            - 150
-      - id: 34
-        weight: 24
-        roomtype: 5
-        giftpkg:
-          -
-            - 274
-            - 250
-          -
-            - 275
-            - 250
-      - id: 35
-        weight: 10
-        roomtype: 5
-        giftpkg:
-          -
-            - 280
-            - 400
-          -
-            - 281
-            - 400
-      - id: 36
-        weight: 20
-        roomtype: 5
-        giftpkg:
-          -
-            - 15
-            - 100000
-      - id: 37
-        weight: 7
-        roomtype: 5
-        giftpkg:
-          -
-            - 15
-            - 200000
-      - id: 38
-        weight: 5
-        roomtype: 5
-        giftpkg:
-          -
-            - 15
-            - 300000
-      - id: 39
-        weight: 3
-        roomtype: 5
-        giftpkg:
-          -
-            - 15
-            - 500000
-      - id: 40
-        weight: 1
-        roomtype: 5
-        giftpkg:
-          -
-            - 15
-            - 2000000
+gametype_count:
+  0: 3,3,4,4,5,5,6,6
+  1: 3,3,4,4,5,5,6,6
+gametype:
+  1:
+    - 1
+    - 2
+    - 3
+gift_list:
+  1:
+    room_1:
+      - id: 1
+        weight: 30
+        roomtype: 1
+        giftpkg:
+          -
+            - 16
+            - 10
+      - id: 2
+        weight: 24
+        roomtype: 1
+        giftpkg:
+          -
+            - 16
+            - 10
+      - id: 3
+        weight: 20
+        roomtype: 1
+        giftpkg:
+          -
+            - 16
+            - 20
+      - id: 4
+        weight: 10
+        roomtype: 1
+        giftpkg:
+          -
+            - 15
+            - 10000
+      - id: 5
+        weight: 7
+        roomtype: 1
+        giftpkg:
+          -
+            - 15
+            - 20000
+      - id: 6
+        weight: 5
+        roomtype: 1
+        giftpkg:
+          -
+            - 15
+            - 30000
+      - id: 7
+        weight: 3
+        roomtype: 1
+        giftpkg:
+          -
+            - 15
+            - 50000
+      - id: 8
+        weight: 1
+        roomtype: 1
+        giftpkg:
+          -
+            - 15
+            - 200000
+    room_2:
+      - id: 9
+        weight: 30
+        roomtype: 2
+        giftpkg:
+          -
+            - 16
+            - 30
+      - id: 10
+        weight: 24
+        roomtype: 2
+        giftpkg:
+          -
+            - 16
+            - 45
+      - id: 11
+        weight: 20
+        roomtype: 2
+        giftpkg:
+          -
+            - 16
+            - 60
+      - id: 12
+        weight: 10
+        roomtype: 2
+        giftpkg:
+          -
+            - 15
+            - 30000
+      - id: 13
+        weight: 7
+        roomtype: 2
+        giftpkg:
+          -
+            - 15
+            - 50000
+      - id: 14
+        weight: 5
+        roomtype: 2
+        giftpkg:
+          -
+            - 15
+            - 100000
+      - id: 15
+        weight: 3
+        roomtype: 2
+        giftpkg:
+          -
+            - 15
+            - 200000
+      - id: 16
+        weight: 1
+        roomtype: 2
+        giftpkg:
+          -
+            - 15
+            - 600000
+    room_3:
+      - id: 17
+        weight: 30
+        roomtype: 3
+        giftpkg:
+          -
+            - 16
+            - 50
+      - id: 18
+        weight: 24
+        roomtype: 3
+        giftpkg:
+          -
+            - 16
+            - 70
+      - id: 19
+        weight: 20
+        roomtype: 3
+        giftpkg:
+          -
+            - 16
+            - 100
+      - id: 20
+        weight: 10
+        roomtype: 3
+        giftpkg:
+          -
+            - 15
+            - 100000
+      - id: 21
+        weight: 7
+        roomtype: 3
+        giftpkg:
+          -
+            - 15
+            - 200000
+      - id: 22
+        weight: 5
+        roomtype: 3
+        giftpkg:
+          -
+            - 15
+            - 300000
+      - id: 23
+        weight: 3
+        roomtype: 3
+        giftpkg:
+          -
+            - 15
+            - 500000
+      - id: 24
+        weight: 1
+        roomtype: 3
+        giftpkg:
+          -
+            - 15
+            - 2000000
+    room_4:
+      - id: 25
+        weight: 30
+        roomtype: 4
+        giftpkg:
+          -
+            - 16
+            - 100
+      - id: 26
+        weight: 24
+        roomtype: 4
+        giftpkg:
+          -
+            - 16
+            - 200
+      - id: 27
+        weight: 20
+        roomtype: 4
+        giftpkg:
+          -
+            - 16
+            - 300
+      - id: 28
+        weight: 10
+        roomtype: 4
+        giftpkg:
+          -
+            - 15
+            - 300000
+      - id: 29
+        weight: 7
+        roomtype: 4
+        giftpkg:
+          -
+            - 15
+            - 600000
+      - id: 30
+        weight: 5
+        roomtype: 4
+        giftpkg:
+          -
+            - 15
+            - 1000000
+      - id: 31
+        weight: 3
+        roomtype: 4
+        giftpkg:
+          -
+            - 15
+            - 1500000
+      - id: 32
+        weight: 1
+        roomtype: 4
+        giftpkg:
+          -
+            - 15
+            - 6000000
+    room_5:
+      - id: 33
+        weight: 30
+        roomtype: 5
+        giftpkg:
+          -
+            - 16
+            - 300
+      - id: 34
+        weight: 24
+        roomtype: 5
+        giftpkg:
+          -
+            - 16
+            - 500
+      - id: 35
+        weight: 20
+        roomtype: 5
+        giftpkg:
+          -
+            - 16
+            - 800
+      - id: 36
+        weight: 10
+        roomtype: 5
+        giftpkg:
+          -
+            - 15
+            - 1000000
+      - id: 37
+        weight: 7
+        roomtype: 5
+        giftpkg:
+          -
+            - 15
+            - 2000000
+      - id: 38
+        weight: 5
+        roomtype: 5
+        giftpkg:
+          -
+            - 15
+            - 3000000
+      - id: 39
+        weight: 3
+        roomtype: 5
+        giftpkg:
+          -
+            - 15
+            - 5000000
+      - id: 40
+        weight: 1
+        roomtype: 5
+        giftpkg:
+          -
+            - 15
+            - 20000000

+ 466 - 382
yaml/battle_task2.yaml

@@ -1,382 +1,466 @@
-gametypecount: #旧版本废弃中
-  1-0: 0,3,3,3,4,4,4,5,5
-  1-1: 0,3,3,3,4,4,4,5,5
-  1-2: 1,3,3,3,4,4,4,5,5
-  1-3: 1,3,3,3,4,4,4,5,5
-  1-4: 1,3,3,3,4,4,4,5,5
-  1-5: 1,3,3,3,4,4,4,5,5
-  2-0: 0,3,3,3,3,4,4,4,4
-  2-1: 0,3,3,3,3,4,4,4,4
-  2-2: 1,3,3,3,3,4,4,4,4
-  2-3: 1,3,3,3,3,4,4,4,4
-  2-4: 1,3,3,3,3,4,4,4,4
-  2-5: 1,3,3,3,3,4,4,4,4
-  3-0: 0,2,2,2,3,3,3,4,4
-  3-1: 0,2,2,2,3,3,3,4,4
-  3-2: 1,2,2,2,3,3,3,4,4
-  3-3: 1,2,2,2,3,3,3,4,4
-  3-4: 1,2,2,2,3,3,3,4,4
-  3-5: 1,2,2,2,3,3,3,4,4
-  4-0: 0,2,2,2,2,2,2,2,2
-  4-1: 0,2,2,2,2,2,2,2,2
-  4-2: 1,2,2,2,2,2,2,2,2
-  4-3: 1,2,2,2,2,2,2,2,2
-  4-4: 1,2,2,2,2,2,2,2,2
-  4-5: 1,2,2,2,2,2,2,2,2
-
-gamerangecount: #旧版本废弃中
-  1: 8,8,8,8,8,8
-  2: 8,8,8,8,8,8
-  3: 8,8,8,8,8,8
-  4: 2,2,2,2,2,2
-
-giftlist:
-  1: #旧版本废弃中
-    room_0:
-        - {id: 1, weight: 10, probshow: 20, giftpkg: [[272, 2]]}
-        - {id: 2, weight: 20, probshow: 20, giftpkg: [[274, 5]]}
-        - {id: 3, weight: 20, probshow: 20, giftpkg: [[280, 10]]}
-        - {id: 4, weight: 20, probshow: 20, giftpkg: [[411, 2]]}
-        - {id: 5, weight: 15, probshow: 20, giftpkg: [[15, 2000]]}
-        - {id: 6, weight: 5, probshow: 20, giftpkg: [[15, 5000]]}
-        - {id: 7, weight: 5, probshow: 20, giftpkg: [[15, 10000]]}
-        - {id: 8, weight: 5, probshow: 20, giftpkg: [[350, 1]]}
-    room_1:
-        - {id: 9, weight: 10, probshow: 20, giftpkg: [[272, 5]]}
-        - {id: 10, weight: 20, probshow: 20, giftpkg: [[274, 10]]}
-        - {id: 11, weight: 20, probshow: 20, giftpkg: [[280, 20]]}
-        - {id: 12, weight: 20, probshow: 20, giftpkg: [[411, 5]]}
-        - {id: 13, weight: 15, probshow: 20, giftpkg: [[15, 10000]]}
-        - {id: 14, weight: 5, probshow: 20, giftpkg: [[15, 30000]]}
-        - {id: 15, weight: 5, probshow: 20, giftpkg: [[351, 1]]}
-        - {id: 16, weight: 5, probshow: 20, giftpkg: [[350, 3]]}
-    room_2:
-        - {id: 17, weight: 10, probshow: 20, giftpkg: [[272, 10]]}
-        - {id: 18, weight: 20, probshow: 20, giftpkg: [[274, 15]]}
-        - {id: 19, weight: 20, probshow: 20, giftpkg: [[280, 30]]}
-        - {id: 20, weight: 20, probshow: 20, giftpkg: [[411, 10]]}
-        - {id: 21, weight: 15, probshow: 20, giftpkg: [[15, 30000]]}
-        - {id: 22, weight: 5, probshow: 20, giftpkg: [[351, 1]]}
-        - {id: 23, weight: 5, probshow: 20, giftpkg: [[351, 3]]}
-        - {id: 24, weight: 5, probshow: 20, giftpkg: [[350, 12]]}
-    room_3:
-        - {id: 25, weight: 10, probshow: 20, giftpkg: [[272, 15]]}
-        - {id: 26, weight: 20, probshow: 20, giftpkg: [[274, 20]]}
-        - {id: 27, weight: 20, probshow: 20, giftpkg: [[280, 40]]}
-        - {id: 28, weight: 20, probshow: 20, giftpkg: [[411, 15]]}
-        - {id: 29, weight: 15, probshow: 20, giftpkg: [[350, 1]]}
-        - {id: 30, weight: 5, probshow: 20, giftpkg: [[351, 3]]}
-        - {id: 31, weight: 5, probshow: 20, giftpkg: [[351, 12]]}
-        - {id: 32, weight: 5, probshow: 20, giftpkg: [[350, 36]]}
-    room_4:
-        - {id: 33, weight: 10, probshow: 20, giftpkg: [[272, 20]]}
-        - {id: 34, weight: 20, probshow: 20, giftpkg: [[274, 25]]}
-        - {id: 35, weight: 20, probshow: 20, giftpkg: [[280, 50]]}
-        - {id: 36, weight: 20, probshow: 20, giftpkg: [[411, 20]]}
-        - {id: 37, weight: 15, probshow: 20, giftpkg: [[350, 3]]}
-        - {id: 38, weight: 5, probshow: 20, giftpkg: [[351, 12]]}
-        - {id: 39, weight: 5, probshow: 20, giftpkg: [[351, 36]]}
-        - {id: 40, weight: 5, probshow: 20, giftpkg: [[350, 100]]}
-    room_5:
-        - {id: 41, weight: 10, probshow: 20, giftpkg: [[272, 25]]}
-        - {id: 42, weight: 20, probshow: 20, giftpkg: [[274, 30]]}
-        - {id: 43, weight: 20, probshow: 20, giftpkg: [[280, 60]]}
-        - {id: 44, weight: 20, probshow: 20, giftpkg: [[411, 30]]}
-        - {id: 45, weight: 15, probshow: 20, giftpkg: [[350, 12]]}
-        - {id: 46, weight: 5, probshow: 20, giftpkg: [[351, 36]]}
-        - {id: 47, weight: 5, probshow: 20, giftpkg: [[351, 100]]}
-        - {id: 48, weight: 5, probshow: 20, giftpkg: [[350, 300]]}
-  2: #通用奖励
-    room_0:
-        - {id: 1, weight: 20,probshow: 20, giftpkg: [[15, 500]]}
-        - {id: 2, weight: 20,probshow: 20, giftpkg: [[15, 1000]]}
-        - {id: 3, weight: 20,probshow: 20, giftpkg: [[15, 2000]]}
-        - {id: 4, weight: 20,probshow: 20, giftpkg: [[274, 2]]}
-        - {id: 5, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
-    room_1:  #普通
-        - {id: 9,  weight: 35,probshow: 30, giftpkg: [[15, 1000]]}
-        - {id: 10, weight: 10,probshow: 10, giftpkg: [[15, 2500]]}
-        - {id: 11, weight: 30,probshow: 30, giftpkg: [[274, 5]]}
-        - {id: 12, weight: 5,probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 13, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
-    room_2:  #精英
-        - {id: 17, weight: 30, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 18, weight: 10, probshow: 10, giftpkg: [[15, 10000]]}
-        - {id: 19, weight: 30, probshow: 25, giftpkg: [[274, 10]]}
-        - {id: 20, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 21, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
-        - {id: 22, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_3:   #土豪
-        - {id: 25, weight: 30, probshow: 30, giftpkg: [[15, 10000]]}
-        - {id: 26, weight: 10, probshow: 10, giftpkg: [[15, 50000]]}
-        - {id: 27, weight: 30, probshow: 25, giftpkg: [[274, 15]]}
-        - {id: 28, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
-        - {id: 29, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
-        - {id: 30, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_4:   #至尊
-        - {id: 33, weight: 30, probshow: 30, giftpkg: [[15, 50000]]}
-        - {id: 34, weight: 10, probshow: 10, giftpkg: [[15, 250000]]}
-        - {id: 35, weight: 30, probshow: 25, giftpkg: [[274, 20]]}
-        - {id: 36, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
-        - {id: 37, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
-        - {id: 38, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_5:   #大师
-        - {id: 41, weight: 30, probshow: 30, giftpkg: [[15, 200000]]}
-        - {id: 42, weight: 10, probshow: 10, giftpkg: [[15, 1000000]]}
-        - {id: 43, weight: 30, probshow: 25, giftpkg: [[274, 25]]}
-        - {id: 44, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
-        - {id: 45, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
-        - {id: 46, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_6:   #王牌
-        - {id: 50, weight: 30, probshow: 30, giftpkg: [[15, 1000000]]}
-        - {id: 51, weight: 10, probshow: 10, giftpkg: [[15, 5000000]]}
-        - {id: 52, weight: 30, probshow: 25, giftpkg: [[274, 30]]}
-        - {id: 53, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
-        - {id: 54, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
-        - {id: 55, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-  3: #血流6红中
-    room_0:
-        - {id: 1, weight: 20, probshow: 20, giftpkg: [[15, 500]]}
-        - {id: 2, weight: 20, probshow: 20, giftpkg: [[15, 1000]]}
-        - {id: 3, weight: 20, probshow: 20, giftpkg: [[15, 2000]]}
-        - {id: 4, weight: 20, probshow: 20, giftpkg: [[274, 2]]}
-        - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_1:  #普通
-        - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 1000]]}
-        - {id: 10, weight: 10, probshow: 10, giftpkg: [[15, 2500]]}
-        - {id: 11, weight: 30, probshow: 30, giftpkg: [[274, 5]]}
-        - {id: 12, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 13, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_2:  #精英
-        - {id: 17, weight: 30, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 18, weight: 10, probshow: 10, giftpkg: [[15, 10000]]}
-        - {id: 19, weight: 30, probshow: 25, giftpkg: [[274, 10]]}
-        - {id: 20, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 21, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
-        - {id: 22, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_3:   #土豪
-        - {id: 25, weight: 30, probshow: 30, giftpkg: [[15, 10000]]}
-        - {id: 26, weight: 10, probshow: 10, giftpkg: [[15, 50000]]}
-        - {id: 27, weight: 30, probshow: 25, giftpkg: [[274, 15]]}
-        - {id: 28, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
-        - {id: 29, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
-        - {id: 30, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_4:   #至尊
-        - {id: 33, weight: 30, probshow: 30, giftpkg: [[15, 50000]]}
-        - {id: 34, weight: 10, probshow: 10, giftpkg: [[15, 250000]]}
-        - {id: 35, weight: 30, probshow: 25, giftpkg: [[274, 20]]}
-        - {id: 36, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
-        - {id: 37, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
-        - {id: 38, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_5:   #大师
-        - {id: 41, weight: 30, probshow: 30, giftpkg: [[15, 200000]]}
-        - {id: 42, weight: 10, probshow: 10, giftpkg: [[15, 1000000]]}
-        - {id: 43, weight: 30, probshow: 25, giftpkg: [[274, 25]]}
-        - {id: 44, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
-        - {id: 45, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
-        - {id: 46, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_6:   #王牌
-        - {id: 50, weight: 30, probshow: 30, giftpkg: [[15, 1000000]]}
-        - {id: 51, weight: 10, probshow: 10, giftpkg: [[15, 5000000]]}
-        - {id: 52, weight: 30, probshow: 25, giftpkg: [[274, 30]]}
-        - {id: 53, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
-        - {id: 54, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
-        - {id: 55, weight: 20, probshow: 15, giftpkg: [[356, 1]]}     
-  4: #斗地主免洗
-    room_0:
-        - {id: 1, weight: 50, probshow: 20, giftpkg: [[15, 500]]}
-        - {id: 2, weight: 10, probshow: 20, giftpkg: [[15, 1000]]}
-        - {id: 3, weight: 15, probshow: 20, giftpkg: [[15, 2000]]}
-        - {id: 4, weight: 5, probshow: 20, giftpkg: [[274, 2]]}
-        - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_1:  #普通
-        - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 1000]]}
-        - {id: 10, weight: 10, probshow: 10, giftpkg: [[15, 2500]]}
-        - {id: 11, weight: 30, probshow: 30, giftpkg: [[274, 5]]}
-        - {id: 12, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 13, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_2:  #精英
-        - {id: 17, weight: 30, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 18, weight: 10, probshow: 10, giftpkg: [[15, 10000]]}
-        - {id: 19, weight: 30, probshow: 25, giftpkg: [[274, 10]]}
-        - {id: 20, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 21, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
-        - {id: 22, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_3:   #土豪
-        - {id: 25, weight: 30, probshow: 30, giftpkg: [[15, 10000]]}
-        - {id: 26, weight: 10, probshow: 10, giftpkg: [[15, 50000]]}
-        - {id: 27, weight: 30, probshow: 25, giftpkg: [[274, 15]]}
-        - {id: 28, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
-        - {id: 29, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
-        - {id: 30, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_4:   #至尊
-        - {id: 33, weight: 30, probshow: 30, giftpkg: [[15, 50000]]}
-        - {id: 34, weight: 10, probshow: 10, giftpkg: [[15, 250000]]}
-        - {id: 35, weight: 30, probshow: 25, giftpkg: [[274, 20]]}
-        - {id: 36, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
-        - {id: 37, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
-        - {id: 38, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_5:   #大师
-        - {id: 41, weight: 30, probshow: 30, giftpkg: [[15, 200000]]}
-        - {id: 42, weight: 10, probshow: 10, giftpkg: [[15, 1000000]]}
-        - {id: 43, weight: 30, probshow: 25, giftpkg: [[274, 25]]}
-        - {id: 44, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
-        - {id: 45, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
-        - {id: 46, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_6:   #王牌
-        - {id: 50, weight: 30, probshow: 30, giftpkg: [[15, 1000000]]}
-        - {id: 51, weight: 10, probshow: 10, giftpkg: [[15, 5000000]]}
-        - {id: 52, weight: 30, probshow: 25, giftpkg: [[274, 30]]}
-        - {id: 53, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
-        - {id: 54, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
-        - {id: 55, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-  5: #血流8红中
-    room_0:
-        - {id: 1, weight: 20, probshow: 30, giftpkg: [[15, 500]]}
-        - {id: 2, weight: 20, probshow: 10, giftpkg: [[15, 1000]]}
-        - {id: 3, weight: 20, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 4, weight: 20, probshow: 10, giftpkg: [[274, 2]]}
-        - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_1:  #普通
-        - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 1000]]}
-        - {id: 10, weight: 10, probshow: 10, giftpkg: [[15, 2500]]}
-        - {id: 11, weight: 30, probshow: 30, giftpkg: [[274, 5]]}
-        - {id: 12, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 13, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_2:  #精英
-        - {id: 17, weight: 30, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 18, weight: 10, probshow: 10, giftpkg: [[15, 10000]]}
-        - {id: 19, weight: 30, probshow: 25, giftpkg: [[274, 10]]}
-        - {id: 20, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 21, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
-        - {id: 22, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_3:   #土豪
-        - {id: 25, weight: 30, probshow: 30, giftpkg: [[15, 10000]]}
-        - {id: 26, weight: 10, probshow: 10, giftpkg: [[15, 50000]]}
-        - {id: 27, weight: 30, probshow: 25, giftpkg: [[274, 15]]}
-        - {id: 28, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
-        - {id: 29, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
-        - {id: 30, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_4:   #至尊
-        - {id: 33, weight: 30, probshow: 30, giftpkg: [[15, 50000]]}
-        - {id: 34, weight: 10, probshow: 10, giftpkg: [[15, 250000]]}
-        - {id: 35, weight: 30, probshow: 25, giftpkg: [[274, 20]]}
-        - {id: 36, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
-        - {id: 37, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
-        - {id: 38, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_5:   #大师
-        - {id: 41, weight: 30, probshow: 30, giftpkg: [[15, 200000]]}
-        - {id: 42, weight: 10, probshow: 10, giftpkg: [[15, 1000000]]}
-        - {id: 43, weight: 30, probshow: 25, giftpkg: [[274, 25]]}
-        - {id: 44, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
-        - {id: 45, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
-        - {id: 46, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_6:   #王牌
-        - {id: 50, weight: 30, probshow: 30, giftpkg: [[15, 1000000]]}
-        - {id: 51, weight: 10, probshow: 10, giftpkg: [[15, 5000000]]}
-        - {id: 52, weight: 30, probshow: 25, giftpkg: [[274, 30]]}
-        - {id: 53, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
-        - {id: 54, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
-        - {id: 55, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-  6: #血流4红中
-    room_0:
-        - {id: 1, weight: 20, probshow: 20, giftpkg: [[15, 500]]}
-        - {id: 2, weight: 20, probshow: 20, giftpkg: [[15, 1000]]}
-        - {id: 3, weight: 20, probshow: 20, giftpkg: [[15, 2000]]}
-        - {id: 4, weight: 20, probshow: 20, giftpkg: [[274, 2]]}
-        - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_1:  #普通
-        - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 1000]]}
-        - {id: 10, weight: 10, probshow: 10, giftpkg: [[15, 2500]]}
-        - {id: 11, weight: 30, probshow: 30, giftpkg: [[274, 5]]}
-        - {id: 12, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 13, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
-    room_2:  #精英
-        - {id: 17, weight: 30, probshow: 30, giftpkg: [[15, 2000]]}
-        - {id: 18, weight: 10, probshow: 10, giftpkg: [[15, 10000]]}
-        - {id: 19, weight: 30, probshow: 25, giftpkg: [[274, 10]]}
-        - {id: 20, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
-        - {id: 21, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
-        - {id: 22, weight: 20, probshow: 10, giftpkg: [[355, 1]]}
-    room_3:   #土豪
-        - {id: 25, weight: 30, probshow: 30, giftpkg: [[15, 10000]]}
-        - {id: 26, weight: 10, probshow: 10, giftpkg: [[15, 50000]]}
-        - {id: 27, weight: 30, probshow: 25, giftpkg: [[274, 15]]}
-        - {id: 28, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
-        - {id: 29, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
-        - {id: 30, weight: 20, probshow: 15, giftpkg: [[355, 1]]}
-    room_4:   #至尊
-        - {id: 33, weight: 30, probshow: 30, giftpkg: [[15, 50000]]}
-        - {id: 34, weight: 10, probshow: 10, giftpkg: [[15, 250000]]}
-        - {id: 35, weight: 30, probshow: 25, giftpkg: [[274, 20]]}
-        - {id: 36, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
-        - {id: 37, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
-        - {id: 38, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_5:   #大师
-        - {id: 41, weight: 30, probshow: 30, giftpkg: [[15, 200000]]}
-        - {id: 42, weight: 10, probshow: 10, giftpkg: [[15, 1000000]]}
-        - {id: 43, weight: 30, probshow: 25, giftpkg: [[274, 25]]}
-        - {id: 44, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
-        - {id: 45, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
-        - {id: 46, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-    room_6:   #王牌
-        - {id: 50, weight: 30, probshow: 30, giftpkg: [[15, 1000000]]}
-        - {id: 51, weight: 10, probshow: 10, giftpkg: [[15, 5000000]]}
-        - {id: 52, weight: 30, probshow: 25, giftpkg: [[274, 30]]}
-        - {id: 53, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
-        - {id: 54, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
-        - {id: 55, weight: 20, probshow: 15, giftpkg: [[356, 1]]}
-gametypecountv2:
-  1-0: 0,4,999 #短时间游戏通用 (奖励2)
-  1-1: 1,4,999
-  1-2: 1,4,999
-  1-3: 1,4,999
-  1-4: 1,4,999
-  1-5: 1,4,999
-  2-0: 0,3,999 #长时间游戏通用 (奖励2)
-  2-1: 1,3,999
-  2-2: 1,3,999
-  2-3: 1,3,999
-  2-4: 1,3,999
-  2-5: 1,3,999
-  3-0: 0,4,999 #6红中血流  (奖励3)
-  3-1: 1,4,999
-  3-2: 1,4,999
-  3-3: 1,4,999
-  3-4: 1,4,999
-  3-5: 1,4,999
-  3-6: 1,4,999
-  4-0: 0,2,999 #测试 (奖励2)
-  4-1: 1,2,999
-  4-2: 1,2,999
-  4-3: 1,2,999
-  4-4: 1,2,999
-  4-5: 1,2,999
-  5-0: 0,6,999 #斗地主免洗  (奖励4)
-  5-1: 1,6,999
-  5-2: 1,6,999
-  5-3: 1,6,999
-  5-4: 1,6,999
-  5-5: 1,6,999
-  5-6: 1,6,999
-  6-0: 0,4,999 #8红中血流  (奖励5)
-  6-1: 1,4,999
-  6-2: 1,4,999
-  6-3: 1,4,999
-  6-4: 1,4,999
-  6-5: 1,4,999
-  6-6: 1,4,999
-  7-0: 0,4,999 #4红中血流  (奖励6)
-  7-1: 1,4,999
-  7-2: 1,4,999
-  7-3: 1,4,999
-  7-4: 1,4,999
-  7-5: 1,4,999
-  7-6: 1,4,999
-  8-0: 0,4,999 #血流成河[225],血战到底[477] (奖励2)
-  8-1: 1,4,999
-  8-2: 1,4,999
-  8-3: 1,4,999
-  8-4: 1,4,999
-  8-5: 1,4,999
- 
+gametypecount: #旧版本废弃中
+  1-0: 0,3,3,3,4,4,4,5,5
+  1-1: 0,3,3,3,4,4,4,5,5
+  1-2: 1,3,3,3,4,4,4,5,5
+  1-3: 1,3,3,3,4,4,4,5,5
+  1-4: 1,3,3,3,4,4,4,5,5
+  1-5: 1,3,3,3,4,4,4,5,5
+  2-0: 0,3,3,3,3,4,4,4,4
+  2-1: 0,3,3,3,3,4,4,4,4
+  2-2: 1,3,3,3,3,4,4,4,4
+  2-3: 1,3,3,3,3,4,4,4,4
+  2-4: 1,3,3,3,3,4,4,4,4
+  2-5: 1,3,3,3,3,4,4,4,4
+  3-0: 0,2,2,2,3,3,3,4,4
+  3-1: 0,2,2,2,3,3,3,4,4
+  3-2: 1,2,2,2,3,3,3,4,4
+  3-3: 1,2,2,2,3,3,3,4,4
+  3-4: 1,2,2,2,3,3,3,4,4
+  3-5: 1,2,2,2,3,3,3,4,4
+  4-0: 0,2,2,2,2,2,2,2,2
+  4-1: 0,2,2,2,2,2,2,2,2
+  4-2: 1,2,2,2,2,2,2,2,2
+  4-3: 1,2,2,2,2,2,2,2,2
+  4-4: 1,2,2,2,2,2,2,2,2
+  4-5: 1,2,2,2,2,2,2,2,2
+
+gamerangecount: #旧版本废弃中
+  1: 8,8,8,8,8,8
+  2: 8,8,8,8,8,8
+  3: 8,8,8,8,8,8
+  4: 2,2,2,2,2,2
+
+#新手引导开启的appid和channelid
+newuserguide:
+  34: [100,101,201,203,212,246,204,206,207,312,611,612,411,511]
+  33: [101]
+
+giftlist:
+  1: #旧版本废弃中
+    room_0:
+      - {id: 1, weight: 10, probshow: 20, giftpkg: [[272, 2]]}
+      - {id: 2, weight: 20, probshow: 20, giftpkg: [[274, 5]]}
+      - {id: 3, weight: 20, probshow: 20, giftpkg: [[280, 10]]}
+      - {id: 4, weight: 20, probshow: 20, giftpkg: [[411, 2]]}
+      - {id: 5, weight: 15, probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 6, weight: 5, probshow: 20, giftpkg: [[15, 50000]]}
+      - {id: 7, weight: 5, probshow: 20, giftpkg: [[15, 100000]]}
+      - {id: 8, weight: 5, probshow: 20, giftpkg: [[350, 1]]}
+    room_1:
+      - {id: 9, weight: 10, probshow: 20, giftpkg: [[272, 5]]}
+      - {id: 10, weight: 20, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 11, weight: 20, probshow: 20, giftpkg: [[280, 20]]}
+      - {id: 12, weight: 20, probshow: 20, giftpkg: [[411, 5]]}
+      - {id: 13, weight: 15, probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 14, weight: 5, probshow: 20, giftpkg: [[15, 30000]]}
+      - {id: 15, weight: 5, probshow: 20, giftpkg: [[351, 1]]}
+      - {id: 16, weight: 5, probshow: 20, giftpkg: [[350, 3]]}
+    room_2:
+      - {id: 17, weight: 10, probshow: 20, giftpkg: [[272, 10]]}
+      - {id: 18, weight: 20, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 19, weight: 20, probshow: 20, giftpkg: [[280, 30]]}
+      - {id: 20, weight: 20, probshow: 20, giftpkg: [[411, 10]]}
+      - {id: 21, weight: 15, probshow: 20, giftpkg: [[15, 30000]]}
+      - {id: 22, weight: 5, probshow: 20, giftpkg: [[351, 1]]}
+      - {id: 23, weight: 5, probshow: 20, giftpkg: [[351, 3]]}
+      - {id: 24, weight: 5, probshow: 20, giftpkg: [[350, 12]]}
+    room_3:
+      - {id: 25, weight: 10, probshow: 20, giftpkg: [[272, 15]]}
+      - {id: 26, weight: 20, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 27, weight: 20, probshow: 20, giftpkg: [[280, 40]]}
+      - {id: 28, weight: 20, probshow: 20, giftpkg: [[411, 15]]}
+      - {id: 29, weight: 15, probshow: 20, giftpkg: [[350, 1]]}
+      - {id: 30, weight: 5, probshow: 20, giftpkg: [[351, 3]]}
+      - {id: 31, weight: 5, probshow: 20, giftpkg: [[351, 12]]}
+      - {id: 32, weight: 5, probshow: 20, giftpkg: [[350, 36]]}
+    room_4:
+      - {id: 33, weight: 10, probshow: 20, giftpkg: [[272, 20]]}
+      - {id: 34, weight: 20, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 35, weight: 20, probshow: 20, giftpkg: [[280, 50]]}
+      - {id: 36, weight: 20, probshow: 20, giftpkg: [[411, 20]]}
+      - {id: 37, weight: 15, probshow: 20, giftpkg: [[350, 3]]}
+      - {id: 38, weight: 5, probshow: 20, giftpkg: [[351, 12]]}
+      - {id: 39, weight: 5, probshow: 20, giftpkg: [[351, 36]]}
+      - {id: 40, weight: 5, probshow: 20, giftpkg: [[350, 100]]}
+    room_5:
+      - {id: 41, weight: 10, probshow: 20, giftpkg: [[272, 25]]}
+      - {id: 42, weight: 20, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 43, weight: 20, probshow: 20, giftpkg: [[280, 60]]}
+      - {id: 44, weight: 20, probshow: 20, giftpkg: [[411, 30]]}
+      - {id: 45, weight: 15, probshow: 20, giftpkg: [[350, 12]]}
+      - {id: 46, weight: 5, probshow: 20, giftpkg: [[351, 36]]}
+      - {id: 47, weight: 5, probshow: 20, giftpkg: [[351, 100]]}
+      - {id: 48, weight: 5, probshow: 20, giftpkg: [[350, 300]]}
+  2: #通用奖励
+    room_0:
+      - {id: 1, weight: 20,probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20,probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20,probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20,probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 100000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 200000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 500000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 300000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 600000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 1500000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 42, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 43, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 44, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 45, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 46, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_6:   #王牌
+      - {id: 50, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 51, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 52, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 53, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 54, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 55, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+  3: #血流6红中
+    room_0:
+      - {id: 1, weight: 20,probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20,probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20,probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20,probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 100000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 200000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 500000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 300000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 600000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 1500000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 42, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 43, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 44, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 45, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 46, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_6:   #王牌
+      - {id: 50, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 51, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 52, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 53, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 54, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 55, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+  4: #斗地主免洗
+    room_0:
+      - {id: 1, weight: 50, probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 10, probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 15, probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 5, probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 100000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 200000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 500000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 300000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 600000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 1500000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 42, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 43, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 44, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 45, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 46, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_6:   #王牌
+      - {id: 50, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 51, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 52, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 53, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 54, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 55, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+  5: #血流4红中
+    room_0:
+      - {id: 1, weight: 20, probshow: 30, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20, probshow: 10, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20, probshow: 30, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20, probshow: 10, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 50000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 125000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 250000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 250000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 625000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 1250000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 2500000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 30, giftpkg: [[15, 5000000]]}
+      - {id: 42, weight: 15, probshow: 20, giftpkg: [[15, 12500000]]}
+      - {id: 43, weight: 5, probshow: 10, giftpkg: [[15, 25000000]]}
+      - {id: 44, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 45, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 46, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_6:   #王牌
+      - {id: 50, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 51, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 52, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 53, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 54, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 55, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+  6: #血流4红中
+    room_0:
+      - {id: 1, weight: 20,probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20,probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20,probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20,probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 10, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 11, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 12, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 13, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 14, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 300000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 600000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 1500000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 35, giftpkg: [[15, 5000000]]}
+      - {id: 42, weight: 15, probshow: 15, giftpkg: [[15, 12500000]]}
+      - {id: 43, weight: 5, probshow: 5, giftpkg: [[15, 25000000]]}
+      - {id: 44, weight: 35, probshow: 35, giftpkg: [[274, 30]]}
+      - {id: 45, weight: 5, probshow: 5, giftpkg: [[350, 100]]}
+      - {id: 46, weight: 5, probshow: 5, giftpkg: [[351, 50]]}
+  7: #国标免洗
+    room_0:
+      - {id: 1, weight: 20, probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20, probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20, probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20, probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 20000000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 300]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 150]]}
+  8: #吉祥血流8红中
+    room_0:
+      - {id: 1, weight: 20, probshow: 30, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20, probshow: 10, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20, probshow: 30, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20, probshow: 10, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20, probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 35, probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 15, probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 5, probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 12, weight: 35, probshow: 20, giftpkg: [[274, 5]]}
+      - {id: 13, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 50000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 125000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 250000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[350, 1]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[351, 1]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 250000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 625000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 1250000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[350, 5]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[351, 2]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 2500000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 5000000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 25]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 12]]}
+    room_5:   #大师
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 5000000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 12500000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 25000000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[350, 100]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[351, 50]]}
+gametypecountv2: #游戏类型-场次:玩法类型(0-再玩多少局,1-再赢多少局),局数,限定局数
+  1-0: 0,4,999,0,4,999 #短时间游戏通用 (奖励2)
+  1-1: 1,4,999,0,2,999
+  1-2: 1,4,999,1,4,999
+  1-3: 1,4,999,1,4,999
+  1-4: 1,4,999,1,4,999
+  1-5: 1,4,999,1,4,999
+  1-6: 1,4,999,1,4,999
+  2-0: 0,3,999,0,3,999 #长时间游戏通用 (奖励2)
+  2-1: 1,3,999,0,2,999
+  2-2: 1,3,999,1,3,999
+  2-3: 1,3,999,1,3,999
+  2-4: 1,3,999,1,3,999
+  2-5: 1,3,999,1,3,999
+  2-6: 1,3,999,1,3,999
+  3-0: 0,4,999,0,4,999 #4/6/8红中血流  (奖励3)
+  3-1: 1,4,999,0,2,999
+  3-2: 1,4,999,1,4,999
+  3-3: 1,4,999,1,4,999
+  3-4: 1,4,999,1,4,999
+  3-5: 1,4,999,1,4,999
+  3-6: 1,4,999,1,4,999
+  4-0: 0,2,999,0,2,999 #测试 (奖励2)
+  4-1: 1,2,999,0,2,999
+  4-2: 1,2,999,1,2,999
+  4-3: 1,2,999,1,2,999
+  4-4: 1,2,999,1,2,999
+  4-5: 1,2,999,1,2,999
+  4-6: 1,2,999,1,2,999
+  5-0: 0,6,999,0,6,999 #斗地主免洗  (奖励4)
+  5-1: 1,6,999,0,2,999
+  5-2: 1,6,999,1,6,999
+  5-3: 1,6,999,1,6,999
+  5-4: 1,6,999,1,6,999
+  5-5: 1,6,999,1,6,999
+  5-6: 1,6,999,1,6,999
+  6-0: 0,4,999,0,4,999 #8红中血流  (奖励5)
+  6-1: 1,4,999,0,2,999
+  6-2: 1,4,999,1,4,999
+  6-3: 1,4,999,1,4,999
+  6-4: 1,4,999,1,4,999
+  6-5: 1,4,999,1,4,999
+  6-6: 1,4,999,1,4,999
+  7-0: 0,4,999,0,4,999 #4红中血流  (奖励6)
+  7-1: 1,4,999,0,2,999
+  7-2: 1,4,999,1,4,999
+  7-3: 1,4,999,1,4,999
+  7-4: 1,4,999,1,4,999
+  7-5: 1,4,999,1,4,999
+  7-6: 1,4,999,1,4,999
+  8-0: 0,4,999,0,4,999 #血流成河[225],血战到底[477] (奖励2)
+  8-1: 1,4,999,0,2,999
+  8-2: 1,4,999,1,4,999
+  8-3: 1,4,999,1,4,999
+  8-4: 1,4,999,1,4,999
+  8-5: 1,4,999,1,4,999
+  8-6: 1,4,999,1,4,999
+  9-0: 0,4,999,0,4,999 #国标血流 (奖励7)
+  9-1: 1,4,999,0,2,999
+  9-2: 1,4,999,1,4,999
+  9-3: 1,4,999,1,4,999
+  9-4: 1,4,999,1,4,999
+  9-5: 1,4,999,1,4,999
+  9-6: 1,4,999,1,4,999  

+ 66 - 0
yaml/battle_task4.yaml

@@ -0,0 +1,66 @@
+#新手引导开启的appid和channelid
+newuserguide:
+  34: [100,101,201,203,212,246,204,206,207,312,611,612,411,511]
+  33: [101]
+
+giftlist:
+  1: #旧版本已废弃
+  2: #通用奖励
+    room_0:
+      - {id: 1, weight: 20,probshow: 20, giftpkg: [[15, 5000]]}
+      - {id: 2, weight: 20,probshow: 20, giftpkg: [[15, 10000]]}
+      - {id: 3, weight: 20,probshow: 20, giftpkg: [[15, 20000]]}
+      - {id: 4, weight: 20,probshow: 20, giftpkg: [[274, 2]]}
+      - {id: 5, weight: 20,probshow: 20, giftpkg: [[354, 1]]}
+    room_1:  #普通
+      - {id: 9,  weight: 30,probshow: 30, giftpkg: [[15, 10000]]}
+      - {id: 10, weight: 20,probshow: 20, giftpkg: [[15, 25000]]}
+      - {id: 11, weight: 10,probshow: 10, giftpkg: [[15, 50000]]}
+      - {id: 13, weight: 10,probshow: 15, giftpkg: [[15, 100000]]}
+      - {id: 12, weight: 30,probshow: 25, giftpkg: [[274, 5]]}
+    room_2:  #精英
+      - {id: 17, weight: 35, probshow: 30, giftpkg: [[15, 30000]]}
+      - {id: 18, weight: 15, probshow: 20, giftpkg: [[15, 60000]]}
+      - {id: 21, weight: 5, probshow: 10, giftpkg: [[15, 100000]]}
+      - {id: 22, weight: 5, probshow: 10, giftpkg: [[15, 120000]]}
+      - {id: 19, weight: 5, probshow: 10, giftpkg: [[15, 150000]]}
+      - {id: 20, weight: 35, probshow: 20, giftpkg: [[274, 10]]}
+    room_3:   #土豪
+      - {id: 25, weight: 35, probshow: 30, giftpkg: [[15, 100000]]}
+      - {id: 26, weight: 15, probshow: 20, giftpkg: [[15, 200000]]}
+      - {id: 27, weight: 5, probshow: 10, giftpkg: [[15, 500000]]}
+      - {id: 29, weight: 5, probshow: 10, giftpkg: [[15, 300000]]}
+      - {id: 30, weight: 5, probshow: 10, giftpkg: [[15, 400000]]}
+      - {id: 28, weight: 35, probshow: 20, giftpkg: [[274, 15]]}
+    room_4:   #至尊
+      - {id: 33, weight: 35, probshow: 30, giftpkg: [[15, 300000]]}
+      - {id: 34, weight: 15, probshow: 20, giftpkg: [[15, 600000]]}
+      - {id: 37, weight: 5, probshow: 10, giftpkg: [[15, 1200000]]}
+      - {id: 35, weight: 5, probshow: 10, giftpkg: [[15, 1500000]]}
+      - {id: 38, weight: 5, probshow: 10, giftpkg: [[15, 2500000]]}
+      - {id: 36, weight: 35, probshow: 20, giftpkg: [[274, 20]]}
+    room_5:   #大师
+      - {id: 41, weight: 35, probshow: 30, giftpkg: [[15, 1000000]]}
+      - {id: 42, weight: 15, probshow: 20, giftpkg: [[15, 2000000]]}
+      - {id: 45, weight: 5, probshow: 10, giftpkg: [[15, 4000000]]}
+      - {id: 46, weight: 5, probshow: 10, giftpkg: [[15, 6000000]]}
+      - {id: 43, weight: 5, probshow: 10, giftpkg: [[15, 10000000]]}
+      - {id: 44, weight: 35, probshow: 20, giftpkg: [[274, 25]]}
+    room_6:   #王牌
+      - {id: 50, weight: 35, probshow: 30, giftpkg: [[15, 10000000]]}
+      - {id: 51, weight: 15, probshow: 20, giftpkg: [[15, 15000000]]}
+      - {id: 52, weight: 5, probshow: 10, giftpkg: [[15, 20000000]]}
+      - {id: 54, weight: 5, probshow: 10, giftpkg: [[15, 30000000]]}
+      - {id: 55, weight: 5, probshow: 10, giftpkg: [[15, 50000000]]}
+      - {id: 53, weight: 35, probshow: 20, giftpkg: [[274, 30]]}
+  3: #血流6红中
+
+  4: #斗地主免洗
+
+  5: #血流4红中
+
+  6: #血流4红中
+
+  7: #国标免洗
+
+  8: #吉祥血流8红中

+ 201 - 0
yaml/battle_task5.yaml

@@ -0,0 +1,201 @@
+stock: # 库值权重配置
+  1:
+    - { range: [-9223372036854775808, -5000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-5000000, -2000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-2000000, -1000000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-1000000, -500000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-500000, 0], weight: [50, 10, 10, 15, 15, 0] }
+  2:
+    - { range: [-9223372036854775808, -5000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-5000000, -2000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-2000000, -1000000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-1000000, -500000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-500000, 0], weight: [50, 10, 10, 15, 15, 0] }
+  3:
+    - { range: [-9223372036854775808, -5000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-5000000, -2000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-2000000, -1000000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-1000000, -500000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-500000, 0], weight: [50, 10, 10, 15, 15, 0] }
+  4:
+    - { range: [-9223372036854775808, -5000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-5000000, -2000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-2000000, -1000000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-1000000, -500000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-500000, 0], weight: [50, 10, 10, 15, 15, 0] }
+  5:
+    - { range: [-9223372036854775808, -5000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-5000000, -2000000], weight: [100, 0, 0, 0, 0, 0] }
+    - { range: [-2000000, -1000000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-1000000, -500000], weight: [50, 10, 10, 15, 15, 0] }
+    - { range: [-500000, 0], weight: [50, 10, 10, 15, 15, 0] }
+nostock: # 玩家无库值时大奖权重配置
+  1: # 通用配置
+    1: # 房间等级
+      - { range: [1200000, 1800000], weight: 1000 }
+      - { range: [600000, 1200000], weight: 3000 }
+      - { range: [0, 600000], weight: 5000 }
+    2: # 房间等级
+      - { range: [6000000, 9000000], weight: 1000 }
+      - { range: [3000000, 6000000], weight: 3000 }
+      - { range: [0, 3000000], weight: 5000 }
+    3: # 房间等级
+      - { range: [24000000, 36000000], weight: 1000 }
+      - { range: [12000000, 24000000], weight: 3000 }
+      - { range: [0, 12000000], weight: 5000 }
+    4: # 房间等级
+      - { range: [120000000, 180000000], weight: 1000 }
+      - { range: [60000000, 120000000], weight: 3000 }
+      - { range: [0, 60000000], weight: 5000 }
+    5: # 房间等级
+      - { range: [360000000, 540000000], weight: 1000 }
+      - { range: [180000000, 360000000], weight: 3000 }
+      - { range: [0, 180000000], weight: 5000 }
+  2: # 国标配置
+    1: # 房间等级
+      - { range: [1200000, 1800000], weight: 1000 }
+      - { range: [600000, 1200000], weight: 3000 }
+      - { range: [0, 600000], weight: 5000 }
+    2: # 房间等级
+      - { range: [6000000, 9000000], weight: 1000 }
+      - { range: [3000000, 6000000], weight: 3000 }
+      - { range: [0, 3000000], weight: 5000 }
+    3: # 房间等级
+      - { range: [360000000, 540000000], weight: 1000 }
+      - { range: [180000000, 360000000], weight: 3000 }
+      - { range: [0, 180000000], weight: 5000 }
+    4: # 房间等级
+      - { range: [3600000000, 5400000000], weight: 1000 }
+      - { range: [1800000000, 3600000000], weight: 3000 }
+      - { range: [0, 1800000000], weight: 5000 }
+
+newgift:
+  1: # 通用奖励
+    room_1:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 600000, 6000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取60万~600万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 300, showprob: 500, award: [[15, 200000]] }
+        - { weight: 500, showprob: 800, award: [[15, 80000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 50000]] }
+        - { weight: 6000, showprob: 3600, award: [[15, 10000]] }
+        - { weight: 1650, showprob: 3000, award: [[360, 1]] }
+    room_2:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 3000000, 30000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取300万~3000万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 300, showprob: 500, award: [[15, 400000]] }
+        - { weight: 500, showprob: 800, award: [[15, 160000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 100000]] }
+        - { weight: 6000, showprob: 3600, award: [[15, 20000]] }
+        - { weight: 1650, showprob: 3000, award: [[360, 2]] }
+    room_3:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 12000000, 120000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取12000万~1亿2000万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 500, showprob: 500, award: [[15, 800000]] }
+        - { weight: 1500, showprob: 800, award: [[15, 320000]] }
+        - { weight: 2500, showprob: 2000, award: [[15, 200000]] }
+        - { weight: 3000, showprob: 3600, award: [[15, 40000]] }
+        - { weight: 2450, showprob: 3000, award: [[360, 5]] }
+    room_4:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 60000000, 600000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取6000万~1亿6000万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 200, showprob: 500, award: [[15, 5000000]] }
+        - { weight: 500, showprob: 800, award: [[15, 2500000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 1000000]] }
+        - { weight: 5000, showprob: 3600, award: [[15, 500000]] }
+        - { weight: 2750, showprob: 3000, award: [[360, 10]] }
+    room_5:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 180000000, 1800000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取1亿8000万~18亿的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 200, showprob: 500, award: [[15, 25000000]] }
+        - { weight: 300, showprob: 800, award: [[15, 12500000]] }
+        - { weight: 800, showprob: 2000, award: [[15, 5000000]] }
+        - { weight: 6000, showprob: 3600, award: [[15, 3000000]] }
+        - { weight: 2650, showprob: 3000, award: [[280, 10]] }
+
+  2: # 国标免洗
+    room_1:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 600000, 6000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取60万~600万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 300, showprob: 500, award: [[15, 200000]] }
+        - { weight: 500, showprob: 800, award: [[15, 80000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 50000]] }
+        - { weight: 6000, showprob: 3600, award: [[15, 10000]] }
+        - { weight: 1650, showprob: 3000, award: [[360, 1]] }
+    room_2:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 3000000, 30000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取300万~3000万的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 300, showprob: 500, award: [[15, 400000]] }
+        - { weight: 500, showprob: 800, award: [[15, 160000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 100000]] }
+        - { weight: 6000, showprob: 3600, award: [[15, 20000]] }
+        - { weight: 1650, showprob: 3000, award: [[360, 2]] }
+    room_3:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 180000000, 1800000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取1亿8000万~18亿的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 500, showprob: 500, award: [[15, 800000]] }
+        - { weight: 1500, showprob: 800, award: [[15, 320000]] }
+        - { weight: 2500, showprob: 2000, award: [[15, 200000]] }
+        - { weight: 3000, showprob: 3600, award: [[15, 40000]] }
+        - { weight: 2450, showprob: 3000, award: [[360, 5]] }
+    room_4:
+      bigaward: {
+        weight: 50,
+        showprob: 100,
+        award: [[15, 800000000, 3800000000]],
+        rebate: [450, 550],
+        tips: "抽中幸运大奖可以领取8亿~38亿的豆豆",
+      } # 大奖配置 weight 大奖默认权重 award:  [[奖励id,道具数量下限,道具数量上限]] rebate:返点率区间 [返点率下限,返点率上限]
+      normalaward: # 普通奖励配置
+        - { weight: 200, showprob: 500, award: [[15, 6400000]] }
+        - { weight: 500, showprob: 800, award: [[15, 2560000]] }
+        - { weight: 1500, showprob: 2000, award: [[15, 1600000]] }
+        - { weight: 5000, showprob: 3600, award: [[15, 320000]] }
+        - { weight: 2750, showprob: 3000, award: [[360, 10]] }

+ 185 - 185
yaml/turntable.yaml

@@ -1,186 +1,186 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: 17
-        rate: 1
-        number: 100
-      - data_id: 274
-        rate: 150
-        number: 10
-      - data_id: 275
-        rate: 150
-        number: 10
-      - data_id: 281
-        rate: 150
-        number: 10
-      - data_id: 278
-        rate: 150
-        number: 10
-      - data_id: 273
-        rate: 150
-        number: 10
-      - data_id: 272
-        rate: 150
-        number: 10
-      - data_id: 999
-        award:
-          - data_id: 272
-            number: 2
-          - data_id: 274
-            number: 2
-          - data_id: 275
-            number: 2
-          - data_id: 278
-            number: 2
-          - data_id: 281
-            number: 2
-        rate: 99
-        number: 1
-  - type: 0  #0
-    reward_list:
-      - data_id: 17
-        rate: 1
-        number: 100
-      - data_id: 274
-        rate: 150
-        number: 10
-      - data_id: 275
-        rate: 150
-        number: 10
-      - data_id: 281
-        rate: 150
-        number: 10
-      - data_id: 278
-        rate: 150
-        number: 10
-      - data_id: 273
-        rate: 150
-        number: 10
-      - data_id: 272
-        rate: 150
-        number: 10
-      - data_id: 999
-        award:
-          - data_id: 272
-            number: 2
-          - data_id: 274
-            number: 2
-          - data_id: 275
-            number: 2
-          - data_id: 278
-            number: 2
-          - data_id: 281
-            number: 2
-        rate: 99
-        number: 1
-
-
-rate_list:
-  - between: [0,1000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 1
-  - between: [0,1000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 0
-  - between: [100001,3000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 1
-  - between: [1000001,3000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 0
-  - between: [3000001,5000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 1
-  - between: [3000001,5000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 0
-  - between: [5000001,10000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 1
-  - between: [5000001,10000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 0
-  - between: [10000001]
-    rate: [500,1000,400,5,1,4094,2500,1500]
-    level: 1
-  - between: [10000001]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 0
-  - between: [0,1000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 3
-  - between: [0,1000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 2
-  - between: [100001,3000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 3
-  - between: [1000001,3000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 2
-  - between: [3000001,5000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 3
-  - between: [3000001,5000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 2
-  - between: [5000001,10000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 3
-  - between: [5000001,10000000]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 2
-  - between: [10000001]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 3
-  - between: [10000001]
-    rate: [1,150,150,150,150,150,150,99]
-    level: 2
-#rate_list:
-#  - between: [0,1000000]
-#    rate: [10000,0,0,0,0,0,0,0]
-#    level: 1
-#  - between: [0,1000000]
-#    rate: [10000,0,0,0,0,0,0,0]
-#    level: 0
-#  - between: [1000001,3000000]
-#    rate: [0,10000,0,0,0,0,0,0]
-#    level: 1
-#  - between: [1000001,3000000]
-#    rate: [0,10000,0,0,0,0,0,0]
-#    level: 0
-#  - between: [3000001,5000000]
-#    rate: [0,0,10000,0,0,0,0,0]
-#    level: 1
-#  - between: [3000001,5000000]
-#    rate: [0,0,10000,0,0,0,0,0]
-#    level: 0
-#  - between: [5000001,10000000]
-#    rate: [0,0,0,10000,0,0,0,0]
-#    level: 1
-#  - between: [5000001,10000000]
-#    rate: [0,0,0,10000,0,0,0,0]
-#    level: 0
-#  - between: [10000001]
-#    rate: [0,0,0,0,10000,0,0,0]
-#    level: 1
-#  - between: [10000001]
-#    rate: [0,0,0,0,10000,0,0,0]
-#    level: 0
-ext_1:
-  2: [350,1] #位置 2
-  3: [351,1]
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 3
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: 17
+        rate: 1
+        number: 100
+      - data_id: 274
+        rate: 150
+        number: 10
+      - data_id: 275
+        rate: 150
+        number: 10
+      - data_id: 281
+        rate: 150
+        number: 10
+      - data_id: 278
+        rate: 150
+        number: 10
+      - data_id: 273
+        rate: 150
+        number: 10
+      - data_id: 272
+        rate: 150
+        number: 10
+      - data_id: 999
+        award:
+          - data_id: 272
+            number: 2
+          - data_id: 274
+            number: 2
+          - data_id: 275
+            number: 2
+          - data_id: 278
+            number: 2
+          - data_id: 281
+            number: 2
+        rate: 99
+        number: 1
+  - type: 0  #0
+    reward_list:
+      - data_id: 17
+        rate: 1
+        number: 100
+      - data_id: 274
+        rate: 150
+        number: 10
+      - data_id: 275
+        rate: 150
+        number: 10
+      - data_id: 281
+        rate: 150
+        number: 10
+      - data_id: 278
+        rate: 150
+        number: 10
+      - data_id: 273
+        rate: 150
+        number: 10
+      - data_id: 272
+        rate: 150
+        number: 10
+      - data_id: 999
+        award:
+          - data_id: 272
+            number: 2
+          - data_id: 274
+            number: 2
+          - data_id: 275
+            number: 2
+          - data_id: 278
+            number: 2
+          - data_id: 281
+            number: 2
+        rate: 99
+        number: 1
+
+
+rate_list:
+  - between: [0,1000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 1
+  - between: [0,1000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 0
+  - between: [100001,3000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 1
+  - between: [1000001,3000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 0
+  - between: [3000001,5000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 1
+  - between: [3000001,5000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 0
+  - between: [5000001,10000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 1
+  - between: [5000001,10000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 0
+  - between: [10000001]
+    rate: [500,1000,400,5,1,4094,2500,1500]
+    level: 1
+  - between: [10000001]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 0
+  - between: [0,1000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 3
+  - between: [0,1000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 2
+  - between: [100001,3000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 3
+  - between: [1000001,3000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 2
+  - between: [3000001,5000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 3
+  - between: [3000001,5000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 2
+  - between: [5000001,10000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 3
+  - between: [5000001,10000000]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 2
+  - between: [10000001]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 3
+  - between: [10000001]
+    rate: [1,150,150,150,150,150,150,99]
+    level: 2
+#rate_list:
+#  - between: [0,1000000]
+#    rate: [10000,0,0,0,0,0,0,0]
+#    level: 1
+#  - between: [0,1000000]
+#    rate: [10000,0,0,0,0,0,0,0]
+#    level: 0
+#  - between: [1000001,3000000]
+#    rate: [0,10000,0,0,0,0,0,0]
+#    level: 1
+#  - between: [1000001,3000000]
+#    rate: [0,10000,0,0,0,0,0,0]
+#    level: 0
+#  - between: [3000001,5000000]
+#    rate: [0,0,10000,0,0,0,0,0]
+#    level: 1
+#  - between: [3000001,5000000]
+#    rate: [0,0,10000,0,0,0,0,0]
+#    level: 0
+#  - between: [5000001,10000000]
+#    rate: [0,0,0,10000,0,0,0,0]
+#    level: 1
+#  - between: [5000001,10000000]
+#    rate: [0,0,0,10000,0,0,0,0]
+#    level: 0
+#  - between: [10000001]
+#    rate: [0,0,0,0,10000,0,0,0]
+#    level: 1
+#  - between: [10000001]
+#    rate: [0,0,0,0,10000,0,0,0]
+#    level: 0
+ext_1:
+  2: [350,1] #位置 2
+  3: [351,1]
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 3
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
   -3: [[274,10],[273,10],[272,10]] #套餐B

+ 88 - 88
yaml/turntable_fivebless.yaml

@@ -1,88 +1,88 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: -1  #再接再励
-        rate: 2000
-        number: 1
-      - data_id: 15 #5000豆豆
-        rate: 3500
-        number: 5000
-      - data_id: 350 #免输卡
-        rate: 0
-        number: 1
-      - data_id: 0 #魔法道具
-        rate: 2000
-        number: 5
-      - data_id: 15 #10W豆豆
-        rate: 0
-        number: 100000
-      - data_id: 15 #2W豆豆
-        rate: 600
-        number: 20000
-      - data_id: 15 #金蟾卡加成40%  5W豆豆
-        rate: 0
-        number: 50000
-      - data_id: 15 #五福临门   1W豆豆
-        rate: 1000
-        number: 10000
-
-  - type: 0  #0
-    reward_list:
-      - data_id: -1  #再接再励
-        rate: 2000
-        number: 1
-      - data_id: 15 #5000豆豆
-        rate: 3500
-        number: 5000
-      - data_id: 350 #免输卡
-        rate: 300
-        number: 1
-      - data_id: 0 #魔法道具
-        rate: 2000
-        number: 5
-      - data_id: 15 #10W豆豆
-        rate: 200
-        number: 100000
-      - data_id: 15 #2W豆豆
-        rate: 600
-        number: 20000 
-      - data_id: 15 #金蟾卡加成40%  5W豆豆
-        rate: 400
-        number: 50000
-      - data_id: 15 #五福临门   1W豆豆
-        rate: 1000
-        number: 10000
-
-rate_list:
-  - between: [0,30000]
-    rate: [2000,3500,300,2000,200,600,400,1000]
-    level: 1
-  - between: [0,30000]
-    rate: [2000,3500,0,2000,0,600,0,1000]
-    level: 1
-  - between: [30001]
-    rate: [2000,3500,300,2000,200,600,400,1000]
-    level: 1
-  - between: [30001]
-    rate: [2000,3500,0,2000,0,600,0,1000]
-    level: 0
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 8
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
-  -3: [[274,10],[273,10],[272,10]] #套餐B
-
-mahjong_reward:
-  11: # 版本号
-    5: # 要替换的奖励的下标
-      data_id: 402 # 海底捞月卡
-      number: 1
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 50000
+      - data_id: 350 #免输卡
+        rate: 0
+        number: 1
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 0
+        number: 1000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 200000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 0
+        number: 500000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 1000
+        number: 100000
+
+  - type: 0  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 50000
+      - data_id: 350 #免输卡
+        rate: 300
+        number: 1
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 200
+        number: 1000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 200000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 400
+        number: 500000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 1000
+        number: 100000
+
+rate_list:
+  - between: [0,30000]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [0,30000]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 8
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
+  -3: [[274,10],[273,10],[272,10]] #套餐B
+
+mahjong_reward:
+  11: # 版本号
+    5: # 要替换的奖励的下标
+      data_id: 402 # 海底捞月卡
+      number: 1

+ 81 - 88
yaml/turntable_fivelucky.yaml

@@ -1,88 +1,81 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: -1  #再接再励
-        rate: 2000
-        number: 1
-      - data_id: 15 #5000豆豆
-        rate: 3500
-        number: 5000
-      - data_id: 350 #免输卡
-        rate: 0
-        number: 1
-      - data_id: 0 #魔法道具
-        rate: 2000
-        number: 5
-      - data_id: 15 #10W豆豆
-        rate: 0
-        number: 100000
-      - data_id: 15 #2W豆豆
-        rate: 600
-        number: 20000
-      - data_id: 15 #金蟾卡加成40%  5W豆豆
-        rate: 0
-        number: 50000
-      - data_id: 15 #五福临门   1W豆豆
-        rate: 1000
-        number: 10000
-
-  - type: 0  #0
-    reward_list:
-      - data_id: -1  #再接再励
-        rate: 2000
-        number: 1
-      - data_id: 15 #5000豆豆
-        rate: 3500
-        number: 5000
-      - data_id: 350 #免输卡
-        rate: 300
-        number: 1
-      - data_id: 0 #魔法道具
-        rate: 2000
-        number: 5
-      - data_id: 15 #10W豆豆
-        rate: 200
-        number: 100000
-      - data_id: 15 #2W豆豆
-        rate: 600
-        number: 20000 
-      - data_id: 15 #金蟾卡加成40%  5W豆豆
-        rate: 400
-        number: 50000
-      - data_id: 15 #五福临门   1W豆豆
-        rate: 1000
-        number: 10000
-
-rate_list:
-  - between: [0,30000]
-    rate: [2000,3500,300,2000,200,600,400,1000]
-    level: 1
-  - between: [0,30000]
-    rate: [2000,3500,0,2000,0,600,0,1000]
-    level: 1
-  - between: [30001]
-    rate: [2000,3500,300,2000,200,600,400,1000]
-    level: 1
-  - between: [30001]
-    rate: [2000,3500,0,2000,0,600,0,1000]
-    level: 0
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 8
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
-  -3: [[274,10],[273,10],[272,10]] #套餐B
-
-mahjong_reward:
-  11: # 版本号
-    5: # 要替换的奖励的下标
-      data_id: 402 # 海底捞月卡
-      number: 1
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: 359  #
+        rate: 2000
+        number: 1
+      - data_id: 15
+        rate: 3000
+        number: 200000
+      - data_id: 15
+        rate: 0
+        number: 1000000
+      - data_id: 0
+        rate: 2000
+        number: 5
+      - data_id: 411
+        rate: 2000
+        number: 2
+      - data_id: 350
+        rate: 0
+        number: 1
+      - data_id: 351
+        rate: 1000
+        number: 1
+      - data_id: 354
+        rate: 0
+        number: 1
+  - type: 0  #0
+    reward_list:
+      - data_id: 359  #
+        rate: 2000
+        number: 1
+      - data_id: 15
+        rate: 2000
+        number: 200000
+      - data_id: 15
+        rate: 1000
+        number: 1000000
+      - data_id: 0
+        rate: 1000
+        number: 5
+      - data_id: 411
+        rate: 1000
+        number: 2
+      - data_id: 350
+        rate: 1000
+        number: 1
+      - data_id: 351
+        rate: 1000
+        number: 1
+      - data_id: 354
+        rate: 1000
+        number: 1
+
+rate_list:
+  - between: [0,50000]
+    rate: [2000,2000,1000,1000,1000,1000,1000,1000]
+    level: 1
+  - between: [0,50000]
+    rate: [2000,3000,0,2000,2000,0,1000,0]
+    level: 1
+  - between: [50001]
+    rate: [1300,1300,900,1300,1300,1300,1300,1300]
+    level: 1
+  - between: [50001]
+    rate: [1300,2200,0,2600,2600,0,1300,0]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 3
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
+  -3: [[274,10],[273,10],[272,10]] #套餐B

+ 80 - 80
yaml/turntable_jinchan.yaml

@@ -1,81 +1,81 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: 15  #
-        rate: 2000
-        number: 5000
-      - data_id: 15
-        rate: 3000
-        number: 20000
-      - data_id: 15
-        rate: 0
-        number: 100000
-      - data_id: 0
-        rate: 2000
-        number: 5
-      - data_id: 411
-        rate: 2000
-        number: 2
-      - data_id: 350
-        rate: 0
-        number: 1
-      - data_id: 351
-        rate: 1000
-        number: 1
-      - data_id: 354
-        rate: 0
-        number: 1
-  - type: 0  #0
-    reward_list:
-      - data_id: 15  #
-        rate: 2000
-        number: 5000
-      - data_id: 15
-        rate: 2000
-        number: 20000
-      - data_id: 15
-        rate: 1000
-        number: 100000
-      - data_id: 0
-        rate: 1000
-        number: 5
-      - data_id: 411
-        rate: 1000
-        number: 2
-      - data_id: 350
-        rate: 1000
-        number: 1
-      - data_id: 351
-        rate: 1000
-        number: 1
-      - data_id: 354
-        rate: 1000
-        number: 1
-
-rate_list:
-  - between: [0,50000]
-    rate: [2000,2000,1000,1000,1000,1000,1000,1000]
-    level: 1
-  - between: [0,50000]
-    rate: [2000,3000,0,2000,2000,0,1000,0]
-    level: 1
-  - between: [50001]
-    rate: [1300,1300,900,1300,1300,1300,1300,1300]
-    level: 1
-  - between: [50001]
-    rate: [1300,2200,0,2600,2600,0,1300,0]
-    level: 0
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 3
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: 15  #
+        rate: 2000
+        number: 50000
+      - data_id: 15
+        rate: 3000
+        number: 200000
+      - data_id: 15
+        rate: 0
+        number: 1000000
+      - data_id: 0
+        rate: 2000
+        number: 5
+      - data_id: 411
+        rate: 2000
+        number: 2
+      - data_id: 350
+        rate: 0
+        number: 1
+      - data_id: 351
+        rate: 1000
+        number: 1
+      - data_id: 354
+        rate: 0
+        number: 1
+  - type: 0  #0
+    reward_list:
+      - data_id: 15  #
+        rate: 2000
+        number: 50000
+      - data_id: 15
+        rate: 2000
+        number: 200000
+      - data_id: 15
+        rate: 1000
+        number: 1000000
+      - data_id: 0
+        rate: 1000
+        number: 5
+      - data_id: 411
+        rate: 1000
+        number: 2
+      - data_id: 350
+        rate: 1000
+        number: 1
+      - data_id: 351
+        rate: 1000
+        number: 1
+      - data_id: 354
+        rate: 1000
+        number: 1
+
+rate_list:
+  - between: [0,50000]
+    rate: [2000,2000,1000,1000,1000,1000,1000,1000]
+    level: 1
+  - between: [0,50000]
+    rate: [2000,3000,0,2000,2000,0,1000,0]
+    level: 1
+  - between: [50001]
+    rate: [1300,1300,900,1300,1300,1300,1300,1300]
+    level: 1
+  - between: [50001]
+    rate: [1300,2200,0,2600,2600,0,1300,0]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 3
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
   -3: [[274,10],[273,10],[272,10]] #套餐B

+ 3 - 3
yaml/turntable_kafka.yaml

@@ -1,4 +1,4 @@
-brokers: ['192.168.67.152:9092']
-groupid: 'sign'
-minbytes: 1
+brokers: ['192.168.67.152:9092']
+groupid: 'sign'
+minbytes: 1
 maxbytes: 10000000

+ 44 - 0
yaml/turntable_monthcard.yaml

@@ -0,0 +1,44 @@
+receive_list:
+  - type: 1  #月卡-转盘未订阅提醒
+    reward_list:
+      - data_id: 15
+        number: 3600000
+        rate: 200  #[0-200]
+        data_desc: 360万豆 #道具说明
+        rate_desc: 2% #概率说明
+      - data_id: 15
+        number: 800000
+        rate: 1800
+        data_desc: 80万豆 #道具说明
+        rate_desc: 18% #概率说明
+      - data_id: 15
+        number: 2000000
+        rate: 500
+        data_desc: 200万豆 #道具说明
+        rate_desc: 5% #概率说明
+      - data_id: 15
+        number: 1600000
+        rate: 1000
+        data_desc: 160万豆 #道具说明
+        rate_desc: 10% #概率说明
+      - data_id: 15
+        number: 2000000
+        rate: 500
+        data_desc: 200万豆 #道具说明
+        rate_desc: 5% #概率说明
+      - data_id: 15
+        number: 800000
+        rate: 1800
+        data_desc: 80万豆 #道具说明
+        rate_desc: 18% #概率说明
+      - data_id: 15
+        number: 1600000
+        rate: 1000
+        data_desc: 160万豆 #道具说明
+        rate_desc: 10% #概率说明
+      - data_id: 15
+        number: 400000
+        rate: 3200
+        data_desc: 40万豆 #道具说明
+        rate_desc: 32% #概率说明
+data_list: [272,273,274,275,278,280,281]

+ 44 - 0
yaml/turntable_monthcardv2.yaml

@@ -0,0 +1,44 @@
+receive_list:
+  - type: 1  #月卡-转盘未订阅提醒
+    reward_list:
+      - data_id: 15
+        number: 50000000
+        rate: 200  #[0-200]
+        data_desc: 5000万豆 #道具说明
+        rate_desc: 2% #概率说明
+      - data_id: 15
+        number: 10000000
+        rate: 1800
+        data_desc: 1000万豆 #道具说明
+        rate_desc: 18% #概率说明
+      - data_id: 15
+        number: 30000000
+        rate: 500
+        data_desc: 3000万豆 #道具说明
+        rate_desc: 5% #概率说明
+      - data_id: 15
+        number: 20000000
+        rate: 1000
+        data_desc: 2000万豆 #道具说明
+        rate_desc: 10% #概率说明
+      - data_id: 15
+        number: 30000000
+        rate: 500
+        data_desc: 3000万豆 #道具说明
+        rate_desc: 5% #概率说明
+      - data_id: 15
+        number: 10000000
+        rate: 1800
+        data_desc: 1000万豆 #道具说明
+        rate_desc: 18% #概率说明
+      - data_id: 15
+        number: 20000000
+        rate: 1000
+        data_desc: 2000万豆 #道具说明
+        rate_desc: 10% #概率说明
+      - data_id: 15
+        number: 5000000
+        rate: 3200
+        data_desc: 500万豆 #道具说明
+        rate_desc: 32% #概率说明
+data_list: [272,273,274,275,278,280,281]

+ 8 - 8
yaml/turntable_mysql.yaml

@@ -1,8 +1,8 @@
-mysql_log:
-  addr: rm-2zefd772420bxy12d.mysql.rds.aliyuncs.com:3306  # 数据库信息
-  user: userapi     # 用户
-  password: userapi@xinyue0923 # 密码
-  db: log        # 数据库
-  charset: utf8mb4
-  max_open: 0          # 最大连接数
-  max_idle: -1         # 最大空闲数
+mysql_log:
+  addr: 192.168.67.9:3306
+  user: root
+  password: weile2017i
+  db: log
+  charset: utf8mb4
+  max_open: 100
+  max_idle: 10

+ 82 - 100
yaml/turntable_normal.yaml

@@ -1,100 +1,82 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: 17
-        rate: 1
-        number: 100
-      - data_id: 274
-        rate: 150
-        number: 10
-      - data_id: 275
-        rate: 150
-        number: 10
-      - data_id: 281
-        rate: 150
-        number: 10
-      - data_id: 278
-        rate: 150
-        number: 10
-      - data_id: 273
-        rate: 150
-        number: 10
-      - data_id: 272
-        rate: 150
-        number: 10
-      - data_id: 999
-        award:
-          - data_id: 272
-            number: 2
-          - data_id: 274
-            number: 2
-          - data_id: 275
-            number: 2
-          - data_id: 278
-            number: 2
-          - data_id: 281
-            number: 2
-        rate: 99
-        number: 1
-  - type: 0  #0
-    reward_list:
-      - data_id: 17
-        rate: 1
-        number: 100
-      - data_id: 274
-        rate: 150
-        number: 10
-      - data_id: 275
-        rate: 150
-        number: 10
-      - data_id: 281
-        rate: 150
-        number: 10
-      - data_id: 278
-        rate: 150
-        number: 10
-      - data_id: 273
-        rate: 150
-        number: 10
-      - data_id: 272
-        rate: 150
-        number: 10
-      - data_id: 999
-        award:
-          - data_id: 272
-            number: 2
-          - data_id: 274
-            number: 2
-          - data_id: 275
-            number: 2
-          - data_id: 278
-            number: 2
-          - data_id: 281
-            number: 2
-        rate: 99
-        number: 1
-
-rate_list:
-  - between: [0,0]
-    rate: [10,1500,1500,1500,1500,1500,1500,990]
-    level: 1
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 8
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
-  -3: [[274,10],[273,10],[272,10]] #套餐B
-
-mahjong_reward:
-  11: # 版本号
-    5: # 要替换的奖励的下标
-      data_id: 402 # 海底捞月卡
-      number: 1
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 50000
+      - data_id: 350 #免输卡
+        rate: 0
+        number: 1
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 0
+        number: 1000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 200000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 0
+        number: 500000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 1000
+        number: 100000
+
+  - type: 0  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 50000
+      - data_id: 350 #免输卡
+        rate: 300
+        number: 1
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 200
+        number: 1000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 200000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 400
+        number: 500000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 1000
+        number: 100000
+
+rate_list:
+  - between: [0,30000]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [0,30000]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 8
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
+  -3: [[274,10],[273,10],[272,10]] #套餐B

+ 88 - 0
yaml/turntable_normalv2.yaml

@@ -0,0 +1,88 @@
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 100000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 0
+        number: 200000
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 0
+        number: 2000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 400000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 0
+        number: 1000000
+      - data_id: 0 #魔法道具
+        rate: 1000
+        number: 10
+
+  - type: 0  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 100000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 300
+        number: 200000
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 200
+        number: 2000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 400000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 400
+        number: 1000000
+      - data_id: 0 #魔法道具
+        rate: 1000
+        number: 10
+
+rate_list:
+  - between: [0,30000]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [0,30000]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 8
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
+  -3: [[274,10],[273,10],[272,10]] #套餐B
+  
+mahjong_reward:
+  11: # 版本号
+    5: # 要替换的奖励的下标
+      data_id: 402 # 海底捞月卡
+      number: 1

+ 88 - 0
yaml/turntable_normalv3.yaml

@@ -0,0 +1,88 @@
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 250000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 0
+        number: 500000
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 0
+        number: 5000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 1000000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 0
+        number: 2500000
+      - data_id: 0 #魔法道具
+        rate: 1000
+        number: 10
+
+  - type: 0  #0
+    reward_list:
+      - data_id: -1  #再接再励
+        rate: 2000
+        number: 1
+      - data_id: 15 #5000豆豆
+        rate: 3500
+        number: 250000
+      - data_id: 15 #五福临门   1W豆豆
+        rate: 300
+        number: 500000
+      - data_id: 0 #魔法道具
+        rate: 2000
+        number: 5
+      - data_id: 15 #10W豆豆
+        rate: 200
+        number: 5000000
+      - data_id: 15 #2W豆豆
+        rate: 600
+        number: 1000000
+      - data_id: 15 #金蟾卡加成40%  5W豆豆
+        rate: 400
+        number: 2500000
+      - data_id: 0 #魔法道具
+        rate: 1000
+        number: 10
+
+rate_list:
+  - between: [0,30000]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [0,30000]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,300,2000,200,600,400,1000]
+    level: 1
+  - between: [30001]
+    rate: [2000,3500,0,2000,0,600,0,1000]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 8
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
+  -3: [[274,10],[273,10],[272,10]] #套餐B
+
+mahjong_reward:
+  11: # 版本号
+    5: # 要替换的奖励的下标
+      data_id: 402 # 海底捞月卡
+      number: 1

+ 81 - 81
yaml/turntable_v2.yaml

@@ -1,82 +1,82 @@
-receive_list:
-  - type: -1  #0
-    reward_list:
-      - data_id: 15
-        rate: 2500
-        number: 5000
-      - data_id: 15
-        rate: 1900
-        number: 20000
-      - data_id: 15
-        rate: 0
-        number: 500000
-      - data_id: 0
-        rate: 2500
-        number: 5
-      - data_id: 0
-        rate: 2500
-        number: 10
-      - data_id: 350
-        rate: 0
-        number: 1
-      - data_id: 351
-        rate: 600
-        number: 1
-      - data_id: 351
-        rate: 0
-        number: 5
-  - type: 0  #0
-    reward_list:
-      - data_id: 15
-        rate: 2500
-        number: 5000
-      - data_id: 15
-        rate: 1850
-        number: 20000
-      - data_id: 15
-        rate: 50
-        number: 500000
-      - data_id: 0
-        rate: 2500
-        number: 5
-      - data_id: 0
-        rate: 2000
-        number: 10
-      - data_id: 350
-        rate: 500
-        number: 1
-      - data_id: 351
-        rate: 500
-        number: 1
-      - data_id: 351
-        rate: 100
-        number: 5
-
-
-rate_list:
-  - between: [0,50000]
-    rate: [2500,1850,50,2500,2000,500,500,100]
-    level: 1
-  - between: [0,50000]
-    rate: [2500,1900,0,2500,2500,0,600,0]
-    level: 0
-  - between: [50001]
-    rate: [500,500,50,2500,2000,2500,18500,100]
-    level: 1
-  - between: [50001]
-    rate: [500,550,0,2500,4500,0,19500,0]
-    level: 0
-
-data_list: [272,273,274,275,278,280,281]
-second: 120
-
-app_limit: 1
-small_limit: 3
-
-version: 0
-
-total: 10000
-
-tao_map:
-  -2: [[360,10],[361,10],[362,10]]   #套餐A
+receive_list:
+  - type: -1  #0
+    reward_list:
+      - data_id: 15
+        rate: 2500
+        number: 50000
+      - data_id: 15
+        rate: 1900
+        number: 200000
+      - data_id: 15
+        rate: 0
+        number: 5000000
+      - data_id: 0
+        rate: 2500
+        number: 5
+      - data_id: 0
+        rate: 2500
+        number: 10
+      - data_id: 350
+        rate: 0
+        number: 1
+      - data_id: 351
+        rate: 600
+        number: 1
+      - data_id: 351
+        rate: 0
+        number: 5
+  - type: 0  #0
+    reward_list:
+      - data_id: 15
+        rate: 2500
+        number: 50000
+      - data_id: 15
+        rate: 1850
+        number: 200000
+      - data_id: 15
+        rate: 50
+        number: 5000000
+      - data_id: 0
+        rate: 2500
+        number: 5
+      - data_id: 0
+        rate: 2000
+        number: 10
+      - data_id: 350
+        rate: 500
+        number: 1
+      - data_id: 351
+        rate: 500
+        number: 1
+      - data_id: 351
+        rate: 100
+        number: 5
+
+
+rate_list:
+  - between: [0,50000]
+    rate: [2500,1850,50,2500,2000,500,500,100]
+    level: 1
+  - between: [0,50000]
+    rate: [2500,1900,0,2500,2500,0,600,0]
+    level: 0
+  - between: [50001]
+    rate: [500,500,50,2500,2000,2500,18500,100]
+    level: 1
+  - between: [50001]
+    rate: [500,550,0,2500,4500,0,19500,0]
+    level: 0
+
+data_list: [272,273,274,275,278,280,281]
+second: 120
+
+app_limit: 1
+small_limit: 3
+
+version: 0
+
+total: 10000
+
+tao_map:
+  -2: [[360,10],[361,10],[362,10]]   #套餐A
   -3: [[274,10],[273,10],[272,10]] #套餐B

+ 1 - 1
yaml/vip.yaml

@@ -1,2 +1,2 @@
-vip_list: [500,2000,5000,10000,25000,50000,100000,200000,300000]
+vip_list: [500,2000,5000,10000,25000,50000,100000,200000,300000]
 zp_list: [0,1,1,2,2,2,3,3,3,3]