wuwangdong 4 gadi atpakaļ
vecāks
revīzija
206fef95a0
79 mainītis faili ar 2806 papildinājumiem un 1614 dzēšanām
  1. 204 333
      assets/resources/game/coregame/coregame.prefab
  2. 13 13
      assets/resources/game/coregame/texture/animations/bird/flyBird_1.anim
  3. 13 13
      assets/resources/game/coregame/texture/animations/bird/flyBird_2.anim
  4. 37 37
      assets/resources/game/coregame/texture/animations/dog/dogMove.anim
  5. 12 0
      assets/resources/game/coregame/texture/animations/farmer.meta
  6. 55 0
      assets/resources/game/coregame/texture/animations/farmer/f_w.anim
  7. 5 0
      assets/resources/game/coregame/texture/animations/farmer/f_w.anim.meta
  8. 55 0
      assets/resources/game/coregame/texture/animations/farmer/f_w_b.anim
  9. 5 0
      assets/resources/game/coregame/texture/animations/farmer/f_w_b.anim.meta
  10. 18 34
      assets/resources/game/coregame/texture/animations/sheep/sheepMove_3.anim
  11. 9 9
      assets/resources/game/coregame/texture/animations/sheep/sheepStand.anim
  12. 12 0
      assets/resources/game/coregame/texture/walk.meta
  13. BIN
      assets/resources/game/coregame/texture/walk/f_w_1.png
  14. 36 0
      assets/resources/game/coregame/texture/walk/f_w_1.png.meta
  15. BIN
      assets/resources/game/coregame/texture/walk/f_w_2.png
  16. 36 0
      assets/resources/game/coregame/texture/walk/f_w_2.png.meta
  17. BIN
      assets/resources/game/coregame/texture/walk/f_w_3.png
  18. 36 0
      assets/resources/game/coregame/texture/walk/f_w_3.png.meta
  19. BIN
      assets/resources/game/coregame/texture/walk/f_w_4.png
  20. 36 0
      assets/resources/game/coregame/texture/walk/f_w_4.png.meta
  21. BIN
      assets/resources/game/coregame/texture/walk/f_w_5.png
  22. 36 0
      assets/resources/game/coregame/texture/walk/f_w_5.png.meta
  23. BIN
      assets/resources/game/coregame/texture/walk/f_w_6.png
  24. 36 0
      assets/resources/game/coregame/texture/walk/f_w_6.png.meta
  25. BIN
      assets/resources/game/coregame/texture/walk/f_w_7.png
  26. 36 0
      assets/resources/game/coregame/texture/walk/f_w_7.png.meta
  27. BIN
      assets/resources/game/coregame/texture/walk/f_w_8.png
  28. 36 0
      assets/resources/game/coregame/texture/walk/f_w_8.png.meta
  29. BIN
      assets/resources/game/coregame/texture/walk/f_w_9.png
  30. 36 0
      assets/resources/game/coregame/texture/walk/f_w_9.png.meta
  31. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_1.png
  32. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_1.png.meta
  33. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_2.png
  34. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_2.png.meta
  35. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_3.png
  36. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_3.png.meta
  37. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_4.png
  38. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_4.png.meta
  39. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_5.png
  40. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_5.png.meta
  41. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_6.png
  42. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_6.png.meta
  43. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_7.png
  44. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_7.png.meta
  45. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_8.png
  46. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_8.png.meta
  47. BIN
      assets/resources/game/coregame/texture/walk/f_w_b_9.png
  48. 36 0
      assets/resources/game/coregame/texture/walk/f_w_b_9.png.meta
  49. 126 752
      assets/resources/game/prefab/game.prefab
  50. BIN
      assets/resources/game/texture/farmerMask.png
  51. 36 0
      assets/resources/game/texture/farmerMask.png.meta
  52. BIN
      assets/resources/game/texture/hb_person.png
  53. 36 0
      assets/resources/game/texture/hb_person.png.meta
  54. BIN
      assets/resources/game/texture/qipao.png
  55. 36 0
      assets/resources/game/texture/qipao.png.meta
  56. 173 137
      assets/resources/module/gradeReward/gradeReward.prefab
  57. 5 5
      assets/resources/module/gradeReward/gradeRewardItem.prefab
  58. 10 10
      assets/resources/module/login/login.prefab
  59. 36 11
      assets/resources/module/newCashUI/walletCashOut.prefab
  60. 9 9
      assets/resources/module/redBagTask/redBagTask.prefab
  61. 6 2
      assets/script/game/game/AniControl.ts
  62. 4 0
      assets/script/game/game/ChangeAni.ts
  63. 37 0
      assets/script/game/game/Farmer.ts
  64. 9 0
      assets/script/game/game/Farmer.ts.meta
  65. 2 27
      assets/script/game/game/Game.ts
  66. 187 0
      assets/script/game/game/TakeAwalk.ts
  67. 9 0
      assets/script/game/game/TakeAwalk.ts.meta
  68. 5 2
      assets/script/game/module/newCashUI/WalletCashOut.ts
  69. 2 1
      assets/script/game/module/redBagTask/RedBagTask.ts
  70. 87 87
      build/jsb-link/frameworks/runtime-src/Classes/AppDelegate.cpp
  71. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  72. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/misc.xml
  73. 1 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml
  74. 178 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml
  75. 27 0
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml
  76. 54 54
      build/jsb-link/frameworks/runtime-src/proj.android-studio/game/AndroidManifest.xml
  77. 6 6
      build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties
  78. 636 69
      build/jsb-link/js backups (useful for debugging)/main.index.js
  79. 2 2
      packages-hot-update/cfg.json

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 204 - 333
assets/resources/game/coregame/coregame.prefab


+ 13 - 13
assets/resources/game/coregame/texture/animations/bird/flyBird_1.anim

@@ -3,8 +3,8 @@
   "_name": "flyBird_1",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 3,
-  "sample": 4,
+  "_duration": 2,
+  "sample": 6,
   "speed": 1,
   "wrapMode": 2,
   "curveData": {
@@ -18,67 +18,67 @@
             }
           },
           {
-            "frame": 0.25,
+            "frame": 0.16666666666666666,
             "value": {
               "__uuid__": "544f892f-4e39-4bb0-9411-d4a2f711f0a2"
             }
           },
           {
-            "frame": 0.5,
+            "frame": 0.3333333333333333,
             "value": {
               "__uuid__": "994fec6e-bad9-4651-ba9f-e809d20f7f83"
             }
           },
           {
-            "frame": 0.75,
+            "frame": 0.5,
             "value": {
               "__uuid__": "d4747a27-4f85-4d79-842b-fecc50e7bff8"
             }
           },
           {
-            "frame": 1,
+            "frame": 0.6666666666666666,
             "value": {
               "__uuid__": "0210e398-c0b6-4a7a-8295-c6217bf2cc02"
             }
           },
           {
-            "frame": 1.25,
+            "frame": 0.8333333333333334,
             "value": {
               "__uuid__": "04a89c66-ba3e-498b-b326-6964f1fe2d02"
             }
           },
           {
-            "frame": 1.5,
+            "frame": 1,
             "value": {
               "__uuid__": "54a1081e-f2bd-4933-a344-c74a853c3d6e"
             }
           },
           {
-            "frame": 1.75,
+            "frame": 1.1666666666666667,
             "value": {
               "__uuid__": "01e24959-8f77-4a3e-b573-e9f09afedd4f"
             }
           },
           {
-            "frame": 2,
+            "frame": 1.3333333333333333,
             "value": {
               "__uuid__": "4856c8e0-2de6-489a-9f9c-ab55656de339"
             }
           },
           {
-            "frame": 2.25,
+            "frame": 1.5,
             "value": {
               "__uuid__": "1771ae41-df8f-45c7-b661-83a206a38762"
             }
           },
           {
-            "frame": 2.5,
+            "frame": 1.6666666666666667,
             "value": {
               "__uuid__": "78407aab-649f-4554-ab7b-767be8655642"
             }
           },
           {
-            "frame": 2.75,
+            "frame": 1.8333333333333333,
             "value": {
               "__uuid__": "3ea76a3c-3516-47f7-a115-1e99f3f66764"
             }

+ 13 - 13
assets/resources/game/coregame/texture/animations/bird/flyBird_2.anim

@@ -3,8 +3,8 @@
   "_name": "flyBird_2",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 3,
-  "sample": 4,
+  "_duration": 2,
+  "sample": 6,
   "speed": 1,
   "wrapMode": 2,
   "curveData": {
@@ -18,67 +18,67 @@
             }
           },
           {
-            "frame": 0.25,
+            "frame": 0.16666666666666666,
             "value": {
               "__uuid__": "b8a5756f-632e-4822-ac19-f31d1bf4fc6e"
             }
           },
           {
-            "frame": 0.5,
+            "frame": 0.3333333333333333,
             "value": {
               "__uuid__": "72dc1d4b-bd68-4855-806b-e3d7826ce7c0"
             }
           },
           {
-            "frame": 0.75,
+            "frame": 0.5,
             "value": {
               "__uuid__": "bcb1e454-2b57-46b9-b0a7-8bd4db5db508"
             }
           },
           {
-            "frame": 1,
+            "frame": 0.6666666666666666,
             "value": {
               "__uuid__": "d1ca6418-5b61-448d-9b42-9ad32ff45a39"
             }
           },
           {
-            "frame": 1.25,
+            "frame": 0.8333333333333334,
             "value": {
               "__uuid__": "ba0834ec-22e9-469d-a7b6-48786470e05e"
             }
           },
           {
-            "frame": 1.5,
+            "frame": 1,
             "value": {
               "__uuid__": "9e28e2be-97de-4d55-93c2-7907740b2d6e"
             }
           },
           {
-            "frame": 1.75,
+            "frame": 1.1666666666666667,
             "value": {
               "__uuid__": "1bf438de-32ca-472a-aca1-e69ac8178fac"
             }
           },
           {
-            "frame": 2,
+            "frame": 1.3333333333333333,
             "value": {
               "__uuid__": "aa25acb8-bd0b-4bad-958b-db832f3b8384"
             }
           },
           {
-            "frame": 2.25,
+            "frame": 1.5,
             "value": {
               "__uuid__": "3a9c7ed5-e96c-44ce-8286-dd011cad266f"
             }
           },
           {
-            "frame": 2.5,
+            "frame": 1.6666666666666667,
             "value": {
               "__uuid__": "8ecebcdd-e16f-4f75-929a-e5b7ffe9e16e"
             }
           },
           {
-            "frame": 2.75,
+            "frame": 1.8333333333333333,
             "value": {
               "__uuid__": "8f564a40-cd8b-4b25-9b15-850faac5a7c3"
             }

+ 37 - 37
assets/resources/game/coregame/texture/animations/dog/dogMove.anim

@@ -3,8 +3,8 @@
   "_name": "dogMove",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 15.5,
-  "sample": 10,
+  "_duration": 31,
+  "sample": 5,
   "speed": 1,
   "wrapMode": 1,
   "curveData": {
@@ -19,7 +19,7 @@
           ]
         },
         {
-          "frame": 1,
+          "frame": 2,
           "value": [
             0,
             0,
@@ -27,7 +27,7 @@
           ]
         },
         {
-          "frame": 1.5,
+          "frame": 3,
           "value": [
             121.887,
             -86.038,
@@ -35,7 +35,7 @@
           ]
         },
         {
-          "frame": 2,
+          "frame": 4,
           "value": [
             246.163,
             -157.735,
@@ -43,7 +43,7 @@
           ]
         },
         {
-          "frame": 2.5,
+          "frame": 5,
           "value": [
             368.049,
             -253.332,
@@ -51,7 +51,7 @@
           ]
         },
         {
-          "frame": 3,
+          "frame": 6,
           "value": [
             485.155,
             -336.979,
@@ -59,7 +59,7 @@
           ]
         },
         {
-          "frame": 3.5,
+          "frame": 7,
           "value": [
             601.822,
             -420.312,
@@ -67,7 +67,7 @@
           ]
         },
         {
-          "frame": 4,
+          "frame": 8,
           "value": [
             745.155,
             -533.645,
@@ -75,7 +75,7 @@
           ]
         },
         {
-          "frame": 4.5,
+          "frame": 9,
           "value": [
             861.822,
             -636.978,
@@ -83,7 +83,7 @@
           ]
         },
         {
-          "frame": 5,
+          "frame": 10,
           "value": [
             725.155,
             -720.311,
@@ -91,7 +91,7 @@
           ]
         },
         {
-          "frame": 5.5,
+          "frame": 11,
           "value": [
             581.822,
             -813.644,
@@ -99,7 +99,7 @@
           ]
         },
         {
-          "frame": 6,
+          "frame": 12,
           "value": [
             438.489,
             -906.978,
@@ -107,7 +107,7 @@
           ]
         },
         {
-          "frame": 6.5,
+          "frame": 13,
           "value": [
             285.156,
             -1006.978,
@@ -115,7 +115,7 @@
           ]
         },
         {
-          "frame": 7,
+          "frame": 14,
           "value": [
             145.156,
             -1106.978,
@@ -123,7 +123,7 @@
           ]
         },
         {
-          "frame": 7.5,
+          "frame": 15,
           "value": [
             1.823,
             -1206.978,
@@ -131,7 +131,7 @@
           ]
         },
         {
-          "frame": 8,
+          "frame": 16,
           "value": [
             -154.844,
             -1303.645,
@@ -139,7 +139,7 @@
           ]
         },
         {
-          "frame": 8.5,
+          "frame": 17,
           "value": [
             -298.24,
             -1392.072,
@@ -147,7 +147,7 @@
           ]
         },
         {
-          "frame": 9,
+          "frame": 18,
           "value": [
             -439.246,
             -1466.16,
@@ -155,7 +155,7 @@
           ]
         },
         {
-          "frame": 9.5,
+          "frame": 19,
           "value": [
             -589.811,
             -1556.977,
@@ -163,7 +163,7 @@
           ]
         },
         {
-          "frame": 10,
+          "frame": 20,
           "value": [
             -733.144,
             -1640.31,
@@ -171,7 +171,7 @@
           ]
         },
         {
-          "frame": 10.5,
+          "frame": 21,
           "value": [
             -563.868,
             -1738.726,
@@ -179,7 +179,7 @@
           ]
         },
         {
-          "frame": 11,
+          "frame": 22,
           "value": [
             -436.856,
             -1834.69,
@@ -187,7 +187,7 @@
           ]
         },
         {
-          "frame": 11.5,
+          "frame": 23,
           "value": [
             -312.667,
             -1910.897,
@@ -195,7 +195,7 @@
           ]
         },
         {
-          "frame": 12,
+          "frame": 24,
           "value": [
             -168.72,
             -2012.506,
@@ -203,7 +203,7 @@
           ]
         },
         {
-          "frame": 12.5,
+          "frame": 25,
           "value": [
             -2.193,
             -2114.115,
@@ -211,7 +211,7 @@
           ]
         },
         {
-          "frame": 13,
+          "frame": 26,
           "value": [
             136.109,
             -2215.724,
@@ -219,7 +219,7 @@
           ]
         },
         {
-          "frame": 13.5,
+          "frame": 27,
           "value": [
             285.701,
             -2303.221,
@@ -227,7 +227,7 @@
           ]
         },
         {
-          "frame": 14,
+          "frame": 28,
           "value": [
             440.938,
             -2402.008,
@@ -235,7 +235,7 @@
           ]
         },
         {
-          "frame": 14.5,
+          "frame": 29,
           "value": [
             607.465,
             -2517.73,
@@ -249,15 +249,15 @@
           "value": 0
         },
         {
-          "frame": 1,
+          "frame": 2,
           "value": 255
         },
         {
-          "frame": 14.5,
+          "frame": 29,
           "value": 255
         },
         {
-          "frame": 15.5,
+          "frame": 31,
           "value": 0
         }
       ],
@@ -267,19 +267,19 @@
           "value": 1
         },
         {
-          "frame": 4.4,
+          "frame": 8.8,
           "value": 1
         },
         {
-          "frame": 4.5,
+          "frame": 9,
           "value": -1
         },
         {
-          "frame": 9.9,
+          "frame": 19.8,
           "value": -1
         },
         {
-          "frame": 10,
+          "frame": 20,
           "value": 1
         }
       ]

+ 12 - 0
assets/resources/game/coregame/texture/animations/farmer.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "24179de5-0d25-4dbe-82a1-d51ddc2630e9",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 55 - 0
assets/resources/game/coregame/texture/animations/farmer/f_w.anim

@@ -0,0 +1,55 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "f_w",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1,
+  "sample": 6,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "4cd0ccdf-4776-4969-b59f-27ce79ef4be9"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "8b692316-3fa9-4415-80dd-0156bf8eb1a9"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "46a595cf-148f-429e-803a-db01d3c5af1f"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "755beb09-b2ce-43a3-8c5a-426015d5185b"
+            }
+          },
+          {
+            "frame": 0.6666666666666666,
+            "value": {
+              "__uuid__": "4411f811-b51d-4fe3-b24f-c926cc5d11ee"
+            }
+          },
+          {
+            "frame": 0.8333333333333334,
+            "value": {
+              "__uuid__": "1ca71ee6-73ba-4480-a368-074a50f2cbc0"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/resources/game/coregame/texture/animations/farmer/f_w.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "49677b6f-d464-4614-9d93-d81f3f557266",
+  "subMetas": {}
+}

+ 55 - 0
assets/resources/game/coregame/texture/animations/farmer/f_w_b.anim

@@ -0,0 +1,55 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "f_w_b",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1,
+  "sample": 6,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "c354aaf8-0c86-406e-943b-13d049372e83"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "ba45b23a-8744-48a0-83cc-b460099daf93"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "6a167f4c-1a37-4f66-8745-51399262f6b8"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "2e63bd9c-0139-4407-aac2-f2865c9697fb"
+            }
+          },
+          {
+            "frame": 0.6666666666666666,
+            "value": {
+              "__uuid__": "9d8b3782-18bc-4d81-bcf8-7b0f4734f36a"
+            }
+          },
+          {
+            "frame": 0.8333333333333334,
+            "value": {
+              "__uuid__": "455dd4ff-33e6-4447-b443-814ebcdf2a4f"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

+ 5 - 0
assets/resources/game/coregame/texture/animations/farmer/f_w_b.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "774d7a38-5a2a-47ee-a23f-7d2ed4962941",
+  "subMetas": {}
+}

+ 18 - 34
assets/resources/game/coregame/texture/animations/sheep/sheepMove_3.anim

@@ -3,7 +3,7 @@
   "_name": "sheepMove_3",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 23,
+  "_duration": 19,
   "sample": 1,
   "speed": 1,
   "wrapMode": 1,
@@ -37,80 +37,64 @@
         {
           "frame": 5,
           "value": [
-            -465.551,
-            272.049,
+            -493.776,
+            291.806,
             0
           ]
         },
         {
           "frame": 7,
           "value": [
-            -687.796,
-            145.523,
+            -724.488,
+            162.458,
             0
           ]
         },
         {
           "frame": 9,
           "value": [
-            -939.361,
-            11.481,
+            -967.586,
+            22.771,
             0
           ]
         },
         {
           "frame": 11,
           "value": [
-            -1172.018,
-            -135.939,
+            -1205.888,
+            -116.182,
             0
           ]
         },
         {
           "frame": 13,
           "value": [
-            -1351.487,
-            -233.888,
+            -1385.357,
+            -211.308,
             0
           ]
         },
         {
           "frame": 15,
           "value": [
-            -1605.366,
-            -395.845,
+            -1653.348,
+            -367.62,
             0
           ]
         },
         {
           "frame": 17,
           "value": [
-            -1377.75,
-            -553.425,
+            -1427.75,
+            -593.425,
             0
           ]
         },
         {
           "frame": 19,
           "value": [
-            -1189.529,
-            -689.119,
-            0
-          ]
-        },
-        {
-          "frame": 21,
-          "value": [
-            -975.045,
-            -837.945,
-            0
-          ]
-        },
-        {
-          "frame": 23,
-          "value": [
-            -721.166,
-            -1004.28,
+            -1239.529,
+            -739.119,
             0
           ]
         }
@@ -143,7 +127,7 @@
       ]
     },
     {
-      "frame": 23,
+      "frame": 19,
       "func": "changeAni",
       "params": [
         2

+ 9 - 9
assets/resources/game/coregame/texture/animations/sheep/sheepStand.anim

@@ -3,8 +3,8 @@
   "_name": "sheepStand",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 8,
-  "sample": 1,
+  "_duration": 2.2857142857142856,
+  "sample": 3.5,
   "speed": 1,
   "wrapMode": 2,
   "curveData": {
@@ -18,43 +18,43 @@
             }
           },
           {
-            "frame": 1,
+            "frame": 0.2857142857142857,
             "value": {
               "__uuid__": "cce3c544-eff1-46db-877a-ff6319551d3a"
             }
           },
           {
-            "frame": 2,
+            "frame": 0.5714285714285714,
             "value": {
               "__uuid__": "a6a78977-8c1b-44a5-a9e1-dbb47c0bafe5"
             }
           },
           {
-            "frame": 3,
+            "frame": 0.8571428571428571,
             "value": {
               "__uuid__": "dce4b12c-a963-40f5-9c1c-63440a27af25"
             }
           },
           {
-            "frame": 4,
+            "frame": 1.1428571428571428,
             "value": {
               "__uuid__": "b3e8f2d9-d51d-4d41-a888-badbed778925"
             }
           },
           {
-            "frame": 5,
+            "frame": 1.4285714285714286,
             "value": {
               "__uuid__": "cfd4cdf9-4aba-4ce5-8507-c1a8910cd6a2"
             }
           },
           {
-            "frame": 6,
+            "frame": 1.7142857142857142,
             "value": {
               "__uuid__": "f933353c-3ae5-4237-a079-18c813ca0ef3"
             }
           },
           {
-            "frame": 7,
+            "frame": 2,
             "value": {
               "__uuid__": "11bc7f60-9714-42a5-98d4-c1f70ec792a7"
             }

+ 12 - 0
assets/resources/game/coregame/texture/walk.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "a325fa1b-4220-4dfc-8f38-974d3ae7ca96",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_1.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "832688bd-56d2-4f58-a9ad-0f6d5d4d4d31",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_1": {
+      "ver": "1.0.4",
+      "uuid": "4cd0ccdf-4776-4969-b59f-27ce79ef4be9",
+      "rawTextureUuid": "832688bd-56d2-4f58-a9ad-0f6d5d4d4d31",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 24.5,
+      "offsetY": 17,
+      "trimX": 62,
+      "trimY": 29,
+      "width": 123,
+      "height": 196,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_2.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "010a66eb-3b83-4995-9dd1-e3589bda3c6a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_2": {
+      "ver": "1.0.4",
+      "uuid": "8b692316-3fa9-4415-80dd-0156bf8eb1a9",
+      "rawTextureUuid": "010a66eb-3b83-4995-9dd1-e3589bda3c6a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 23,
+      "offsetY": 17,
+      "trimX": 61,
+      "trimY": 26,
+      "width": 122,
+      "height": 202,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_3.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "59df62b8-cb94-453c-9f60-0bf459c47b17",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_3": {
+      "ver": "1.0.4",
+      "uuid": "46a595cf-148f-429e-803a-db01d3c5af1f",
+      "rawTextureUuid": "59df62b8-cb94-453c-9f60-0bf459c47b17",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 22.5,
+      "offsetY": 14,
+      "trimX": 60,
+      "trimY": 24,
+      "width": 123,
+      "height": 212,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_4.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ee997a77-912a-4950-a24d-dc889db3157e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_4": {
+      "ver": "1.0.4",
+      "uuid": "755beb09-b2ce-43a3-8c5a-426015d5185b",
+      "rawTextureUuid": "ee997a77-912a-4950-a24d-dc889db3157e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 26.5,
+      "offsetY": 5,
+      "trimX": 64,
+      "trimY": 28,
+      "width": 123,
+      "height": 222,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_5.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "eb08d99b-91ca-4c42-a763-76d137ba1498",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_5": {
+      "ver": "1.0.4",
+      "uuid": "4411f811-b51d-4fe3-b24f-c926cc5d11ee",
+      "rawTextureUuid": "eb08d99b-91ca-4c42-a763-76d137ba1498",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 29,
+      "offsetY": 8,
+      "trimX": 65,
+      "trimY": 32,
+      "width": 126,
+      "height": 208,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_6.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0ffc227e-86c5-46be-a678-761e9d71ebac",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_6": {
+      "ver": "1.0.4",
+      "uuid": "1ca71ee6-73ba-4480-a368-074a50f2cbc0",
+      "rawTextureUuid": "0ffc227e-86c5-46be-a678-761e9d71ebac",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 27.5,
+      "offsetY": 7,
+      "trimX": 65,
+      "trimY": 28,
+      "width": 123,
+      "height": 218,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_7.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0c2af5eb-dc4f-4c5b-92ed-a8babaef77e5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_7": {
+      "ver": "1.0.4",
+      "uuid": "ee0c739e-6652-453e-8090-b2028f531a52",
+      "rawTextureUuid": "0c2af5eb-dc4f-4c5b-92ed-a8babaef77e5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 24,
+      "offsetY": 11.5,
+      "trimX": 62,
+      "trimY": 24,
+      "width": 122,
+      "height": 217,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_8.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_8.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "f3532608-c95e-40a4-8afd-4e766b2061a7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_8": {
+      "ver": "1.0.4",
+      "uuid": "07978e5a-ffe3-4fba-a4f8-83dc61c42188",
+      "rawTextureUuid": "f3532608-c95e-40a4-8afd-4e766b2061a7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 24,
+      "offsetY": 16,
+      "trimX": 62,
+      "trimY": 26,
+      "width": 122,
+      "height": 204,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_9.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_9.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "7fdd8bbd-2124-43c5-8f26-eb00cf6a2bea",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_9": {
+      "ver": "1.0.4",
+      "uuid": "d190ea5f-9afd-4c14-92d2-5a149066eca0",
+      "rawTextureUuid": "7fdd8bbd-2124-43c5-8f26-eb00cf6a2bea",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 24.5,
+      "offsetY": 17,
+      "trimX": 62,
+      "trimY": 29,
+      "width": 123,
+      "height": 196,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_1.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b67c9988-b84e-4fbb-865f-4e64bda7f097",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_1": {
+      "ver": "1.0.4",
+      "uuid": "c354aaf8-0c86-406e-943b-13d049372e83",
+      "rawTextureUuid": "b67c9988-b84e-4fbb-865f-4e64bda7f097",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -9,
+      "trimX": 16,
+      "trimY": 50,
+      "width": 164,
+      "height": 206,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_2.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "15861077-03ba-4257-be60-c3ba6b82e74f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_2": {
+      "ver": "1.0.4",
+      "uuid": "ba45b23a-8744-48a0-83cc-b460099daf93",
+      "rawTextureUuid": "15861077-03ba-4257-be60-c3ba6b82e74f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -4,
+      "offsetY": -8,
+      "trimX": 14,
+      "trimY": 43,
+      "width": 162,
+      "height": 218,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_3.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "815e4e8a-7517-4364-b7a6-a317bf8d8dd7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_3": {
+      "ver": "1.0.4",
+      "uuid": "6a167f4c-1a37-4f66-8745-51399262f6b8",
+      "rawTextureUuid": "815e4e8a-7517-4364-b7a6-a317bf8d8dd7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -7.5,
+      "offsetY": -0.5,
+      "trimX": 12,
+      "trimY": 38,
+      "width": 159,
+      "height": 213,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_4.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "16e8d993-81de-450c-b455-153854f8413b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_4": {
+      "ver": "1.0.4",
+      "uuid": "2e63bd9c-0139-4407-aac2-f2865c9697fb",
+      "rawTextureUuid": "16e8d993-81de-450c-b455-153854f8413b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -8,
+      "offsetY": 3,
+      "trimX": 10,
+      "trimY": 46,
+      "width": 162,
+      "height": 190,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_5.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "dc610945-4982-42c5-9a35-03db31b56de2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_5": {
+      "ver": "1.0.4",
+      "uuid": "9d8b3782-18bc-4d81-bcf8-7b0f4734f36a",
+      "rawTextureUuid": "dc610945-4982-42c5-9a35-03db31b56de2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -7.5,
+      "offsetY": -3.5,
+      "trimX": 10,
+      "trimY": 52,
+      "width": 163,
+      "height": 191,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_6.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c693ea8e-d634-4ff1-80ac-34743ecfe9fe",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_6": {
+      "ver": "1.0.4",
+      "uuid": "455dd4ff-33e6-4447-b443-814ebcdf2a4f",
+      "rawTextureUuid": "c693ea8e-d634-4ff1-80ac-34743ecfe9fe",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -6.5,
+      "offsetY": 1,
+      "trimX": 12,
+      "trimY": 47,
+      "width": 161,
+      "height": 192,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_7.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "e4e0b066-58a1-4d23-99d9-8161397c7eb3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_7": {
+      "ver": "1.0.4",
+      "uuid": "0e53760b-11af-4d77-a71f-a211ca852567",
+      "rawTextureUuid": "e4e0b066-58a1-4d23-99d9-8161397c7eb3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -5.5,
+      "offsetY": 2,
+      "trimX": 14,
+      "trimY": 40,
+      "width": 159,
+      "height": 204,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_8.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_8.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a2d96ba6-aef0-440a-aeb7-40f2d96af22d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_8": {
+      "ver": "1.0.4",
+      "uuid": "b7de08be-adf1-4411-8f90-f5f9ca6f618e",
+      "rawTextureUuid": "a2d96ba6-aef0-440a-aeb7-40f2d96af22d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3.5,
+      "offsetY": -4.5,
+      "trimX": 15,
+      "trimY": 44,
+      "width": 161,
+      "height": 209,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/coregame/texture/walk/f_w_b_9.png


+ 36 - 0
assets/resources/game/coregame/texture/walk/f_w_b_9.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "00d3e399-535c-4a0f-9b8f-8704b672b049",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 198,
+  "height": 288,
+  "platformSettings": {},
+  "subMetas": {
+    "f_w_b_9": {
+      "ver": "1.0.4",
+      "uuid": "c9848f40-fe7e-46ca-b288-b6e44d7f21a8",
+      "rawTextureUuid": "00d3e399-535c-4a0f-9b8f-8704b672b049",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -9,
+      "trimX": 16,
+      "trimY": 50,
+      "width": 164,
+      "height": 206,
+      "rawWidth": 198,
+      "rawHeight": 288,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 126 - 752
assets/resources/game/prefab/game.prefab


BIN
assets/resources/game/texture/farmerMask.png


+ 36 - 0
assets/resources/game/texture/farmerMask.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c95c3faf-caae-4425-93c3-f704b7fc92bf",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 100,
+  "height": 100,
+  "platformSettings": {},
+  "subMetas": {
+    "farmerMask": {
+      "ver": "1.0.4",
+      "uuid": "45209f1e-8ce0-400d-bbe9-eae0a62f6b8c",
+      "rawTextureUuid": "c95c3faf-caae-4425-93c3-f704b7fc92bf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 100,
+      "height": 100,
+      "rawWidth": 100,
+      "rawHeight": 100,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/texture/hb_person.png


+ 36 - 0
assets/resources/game/texture/hb_person.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "68271a29-02c9-436d-9260-991269f651b1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 64,
+  "height": 71,
+  "platformSettings": {},
+  "subMetas": {
+    "hb_person": {
+      "ver": "1.0.4",
+      "uuid": "5abbf7c1-a43e-4a8a-9682-202851c05c7e",
+      "rawTextureUuid": "68271a29-02c9-436d-9260-991269f651b1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 64,
+      "height": 71,
+      "rawWidth": 64,
+      "rawHeight": 71,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/game/texture/qipao.png


+ 36 - 0
assets/resources/game/texture/qipao.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5d652fa1-ea71-408b-be05-bf0d257b982c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 101,
+  "height": 86,
+  "platformSettings": {},
+  "subMetas": {
+    "qipao": {
+      "ver": "1.0.4",
+      "uuid": "a49d2dbd-1ad5-426f-83d4-0dbcaa8bf2d7",
+      "rawTextureUuid": "5d652fa1-ea71-408b-be05-bf0d257b982c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 101,
+      "height": 86,
+      "rawWidth": 101,
+      "rawHeight": 86,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 173 - 137
assets/resources/module/gradeReward/gradeReward.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 105
-      },
-      {
         "__id__": 106
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 108
+      },
+      {
+        "__id__": 109
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 110
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 104
+      "__id__": 105
     },
     "_opacity": 255,
     "_color": {
@@ -168,26 +168,26 @@
         "__id__": 10
       },
       {
-        "__id__": 83
+        "__id__": 84
       },
       {
-        "__id__": 86
+        "__id__": 87
       },
       {
-        "__id__": 95
+        "__id__": 96
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 101
+        "__id__": 102
       },
       {
-        "__id__": 102
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 104
     },
     "_opacity": 255,
     "_color": {
@@ -370,7 +370,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 288,
+      "width": 336,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -424,7 +424,7 @@
     "_dstBlendFactor": 771,
     "_string": "看视频将获得大量等级经验",
     "_N$string": "看视频将获得大量等级经验",
-    "_fontSize": 24,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -463,17 +463,17 @@
         "__id__": 11
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -544,10 +544,13 @@
       },
       {
         "__id__": 20
+      },
+      {
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -626,8 +629,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 62,
-      "height": 52.4
+      "width": 64,
+      "height": 54.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -711,7 +714,7 @@
       "b": 56,
       "a": 255
     },
-    "_width": 1,
+    "_width": 2,
     "_id": ""
   },
   {
@@ -949,6 +952,25 @@
     "customEventData": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -968,35 +990,35 @@
     },
     "_children": [
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 27
+        "__id__": 28
       },
       {
-        "__id__": 30
+        "__id__": 31
       },
       {
-        "__id__": 39
+        "__id__": 40
       },
       {
-        "__id__": 48
+        "__id__": 49
       },
       {
-        "__id__": 57
+        "__id__": 58
       },
       {
-        "__id__": 66
+        "__id__": 67
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -1050,17 +1072,17 @@
     "_name": "slider",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -1114,7 +1136,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1157,17 +1179,17 @@
     "_name": "sliderBorder",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1221,7 +1243,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1264,23 +1286,23 @@
     "_name": "进度1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
-      },
-      {
         "__id__": 32
       },
       {
         "__id__": 33
+      },
+      {
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1334,7 +1356,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_materials": [
@@ -1367,7 +1389,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_color": {
@@ -1385,27 +1407,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 34
+      "__id__": 35
     },
     "targetData": [
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "target": {
-      "__id__": 30
+      "__id__": 31
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 37
+      "__id__": 38
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -1422,7 +1446,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 36
+      "__id__": 37
     },
     "duration": 0.3,
     "delay": 0.5,
@@ -1466,23 +1490,23 @@
     "_name": "进度2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
-      },
-      {
         "__id__": 41
       },
       {
         "__id__": 42
+      },
+      {
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1536,7 +1560,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1569,7 +1593,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 40
     },
     "_enabled": true,
     "_color": {
@@ -1587,27 +1611,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 40
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 43
+      "__id__": 44
     },
     "targetData": [
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "target": {
-      "__id__": 39
+      "__id__": 40
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 46
+      "__id__": 47
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -1624,7 +1650,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 45
+      "__id__": 46
     },
     "duration": 0.3,
     "delay": 0.6,
@@ -1668,23 +1694,23 @@
     "_name": "进度3",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
-      },
-      {
         "__id__": 50
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -1738,7 +1764,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1771,7 +1797,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 49
     },
     "_enabled": true,
     "_color": {
@@ -1789,27 +1815,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 49
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 52
+      "__id__": 53
     },
     "targetData": [
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "target": {
-      "__id__": 48
+      "__id__": 49
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 55
+      "__id__": 56
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -1826,7 +1854,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 54
+      "__id__": 55
     },
     "duration": 0.3,
     "delay": 0.7,
@@ -1870,23 +1898,23 @@
     "_name": "进度4",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
-      },
-      {
         "__id__": 59
       },
       {
         "__id__": 60
+      },
+      {
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -1940,7 +1968,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -1973,7 +2001,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 58
     },
     "_enabled": true,
     "_color": {
@@ -1991,27 +2019,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 58
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 61
+      "__id__": 62
     },
     "targetData": [
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "target": {
-      "__id__": 57
+      "__id__": 58
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 64
+      "__id__": 65
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -2028,7 +2058,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 63
+      "__id__": 64
     },
     "duration": 0.3,
     "delay": 0.8,
@@ -2072,23 +2102,23 @@
     "_name": "进度5",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
-      },
-      {
         "__id__": 68
       },
       {
         "__id__": 69
+      },
+      {
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2142,7 +2172,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 67
     },
     "_enabled": true,
     "_materials": [
@@ -2175,7 +2205,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 67
     },
     "_enabled": true,
     "_color": {
@@ -2193,27 +2223,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 67
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 70
+      "__id__": 71
     },
     "targetData": [
       {
-        "__id__": 71
+        "__id__": 72
       }
     ],
     "target": {
-      "__id__": 66
+      "__id__": 67
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 73
+      "__id__": 74
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -2230,7 +2262,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 72
+      "__id__": 73
     },
     "duration": 0.3,
     "delay": 0.9,
@@ -2274,7 +2306,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -2321,11 +2353,11 @@
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 78
+      "__id__": 79
     },
     "targetData": [
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "target": {
@@ -2334,10 +2366,12 @@
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 81
+      "__id__": 82
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -2354,7 +2388,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 80
+      "__id__": 81
     },
     "duration": 0.2,
     "delay": 0.3,
@@ -2404,11 +2438,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -2462,7 +2496,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 83
+      "__id__": 84
     },
     "_enabled": true,
     "_layoutSize": {
@@ -2511,17 +2545,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 87
-      },
-      {
         "__id__": 88
       },
       {
         "__id__": 89
+      },
+      {
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -2575,7 +2609,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 87
     },
     "_enabled": true,
     "_materials": [
@@ -2607,7 +2641,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 87
     },
     "_enabled": true,
     "node_panel": {
@@ -2622,27 +2656,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 87
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 90
+      "__id__": 91
     },
     "targetData": [
       {
-        "__id__": 91
+        "__id__": 92
       }
     ],
     "target": {
-      "__id__": 86
+      "__id__": 87
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 93
+      "__id__": 94
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -2659,7 +2695,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 92
+      "__id__": 93
     },
     "duration": 0.3,
     "delay": 1,
@@ -2707,17 +2743,17 @@
     },
     "_children": [
       {
-        "__id__": 96
+        "__id__": 97
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 101
     },
     "_opacity": 255,
     "_color": {
@@ -2771,17 +2807,17 @@
     "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 95
+      "__id__": 96
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -2835,7 +2871,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 96
+      "__id__": 97
     },
     "_enabled": true,
     "_materials": [
@@ -2878,7 +2914,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 95
+      "__id__": 96
     },
     "_enabled": true,
     "_materials": [
@@ -3055,29 +3091,29 @@
     },
     "_enabled": true,
     "sp_slider": {
-      "__id__": 25
+      "__id__": 26
     },
     "node_content": {
-      "__id__": 83
+      "__id__": 84
     },
     "node_child": {
       "__uuid__": "c1aed361-0f66-4292-8257-cd81d5de25af"
     },
     "lbl_progress": [
       {
-        "__id__": 67
+        "__id__": 68
       },
       {
-        "__id__": 58
+        "__id__": 59
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 40
+        "__id__": 41
       },
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_id": ""

+ 5 - 5
assets/resources/module/gradeReward/gradeRewardItem.prefab

@@ -410,7 +410,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 62.05,
+      "width": 69.44,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -464,14 +464,14 @@
     "_dstBlendFactor": 771,
     "_string": "LV:12",
     "_N$string": "LV:12",
-    "_fontSize": 24,
+    "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 0,
+    "_styleFlags": 1,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -761,7 +761,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 63.22,
+      "width": 67.78,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -815,7 +815,7 @@
     "_dstBlendFactor": 771,
     "_string": "提 现",
     "_N$string": "提 现",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,

+ 10 - 10
assets/resources/module/login/login.prefab

@@ -274,7 +274,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        446.08400000000006,
+        467.48,
         0,
         0,
         0,
@@ -317,7 +317,7 @@
       "__uuid__": "90615ce3-b34e-4efe-b50f-9f624d50cbbf"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -337,14 +337,14 @@
     "node": {
       "__id__": 6
     },
-    "_enabled": true,
+    "_enabled": false,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 1,
-    "_left": 0,
-    "_right": 0,
-    "_top": 92.91599999999994,
-    "_bottom": 0,
+    "_alignFlags": 4,
+    "_left": 192.5,
+    "_right": 192.5,
+    "_top": 62,
+    "_bottom": 1006.48,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -353,8 +353,8 @@
     "_isAbsBottom": true,
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
+    "_originalWidth": 365,
+    "_originalHeight": 256,
     "_id": ""
   },
   {

+ 36 - 11
assets/resources/module/newCashUI/walletCashOut.prefab

@@ -389,7 +389,9 @@
       "__id__": 12
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -680,7 +682,9 @@
       "__id__": 23
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -1055,7 +1059,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "9fT8I48cBMnbYarJ5WcYGU",
+    "fileId": "bc/KuMvptC0olIm53/PYm7",
     "sync": false
   },
   {
@@ -1264,7 +1268,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "b1lAy0IZlPfYBPupgu8Nrh",
+    "fileId": "1bGRRafotIS4R+Blsa40O3",
     "sync": false
   },
   {
@@ -1408,7 +1412,9 @@
       "__id__": 47
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -3621,7 +3627,9 @@
       "__id__": 111
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -4360,7 +4368,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 95.61,
+      "width": 117.85,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -4412,8 +4420,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0.2元",
-    "_N$string": "0.2元",
+    "_string": "0.23元",
+    "_N$string": "0.23元",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -8739,7 +8747,9 @@
       "__id__": 254
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -9007,7 +9017,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 259.17,
+      "width": 282.73,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9019,7 +9029,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        12.541,
+        37.102,
         -22.575,
         0,
         0,
@@ -9061,7 +9071,7 @@
     "_dstBlendFactor": 771,
     "_string": "需要0.3元,当前只有0.2元",
     "_N$string": "需要0.3元,当前只有0.2元",
-    "_fontSize": 22,
+    "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -9604,7 +9614,9 @@
       "__id__": 281
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -9717,7 +9729,9 @@
       "__id__": 288
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -10117,7 +10131,9 @@
       "__id__": 302
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": true,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -10301,9 +10317,18 @@
       "__id__": 1
     },
     "_enabled": true,
-    "lbl_notice": null,
-    "sp_progress": null,
-    "lbl_tip": null,
+    "sp_progress": {
+      "__id__": 84
+    },
+    "lbl_redMoney": {
+      "__id__": 126
+    },
+    "lbl_value": {
+      "__id__": 129
+    },
+    "lbl_tip": {
+      "__id__": 261
+    },
     "check_button": [
       {
         "__id__": 151

+ 9 - 9
assets/resources/module/redBagTask/redBagTask.prefab

@@ -886,7 +886,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -72.437,
+        -58.787,
         167.299,
         0,
         0,
@@ -1177,7 +1177,7 @@
       "__id__": 22
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 32
@@ -1340,7 +1340,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        98.44999999999999,
+        60.10999999999999,
         0,
         0,
         0,
@@ -1469,7 +1469,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        170.19,
+        131.85,
         0,
         0,
         0,
@@ -1563,7 +1563,7 @@
     "node": {
       "__id__": 22
     },
-    "_enabled": false,
+    "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,
@@ -2957,7 +2957,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "40kCC5TVNAzYukLH3pmpiX",
+    "fileId": "83i+qi46FGvJRSIBi0MZBX",
     "sync": false
   },
   {
@@ -3066,7 +3066,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "acFwaL/DJEho6rLV3mrP4a",
+    "fileId": "43ibtFFr1NM6PkrJtJ31dv",
     "sync": false
   },
   {
@@ -3175,7 +3175,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "55alZr/ptEfKTdbweay+d8",
+    "fileId": "2dYr3fIhBFcJFcP5wih4kS",
     "sync": false
   },
   {
@@ -3284,7 +3284,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "67Q1QeudxHHo6eYWqZfYDE",
+    "fileId": "0bwnEmSolKPojzvB+negBd",
     "sync": false
   },
   {

+ 6 - 2
assets/script/game/game/AniControl.ts

@@ -26,9 +26,12 @@ export default class AniControl extends cc.Component {
     @property({displayName: 'moveSheep', type: cc.Animation})
     private moveSheep: cc.Animation = null;
 
-    @property({displayName: 'heep', type: cc.Animation})
+    @property({displayName: 'sheep', type: cc.Animation})
     private sheep: cc.Animation = null;
 
+    @property({displayName: '红包按钮', type: cc.Node})
+    private hb_btn: cc.Node = null;
+
     private starPos_1: cc.Vec2 = cc.Vec2.ZERO;
     private starPos_2: cc.Vec2 = cc.Vec2.ZERO;
     private starPos_3: cc.Vec2 = cc.Vec2.ZERO;
@@ -46,7 +49,7 @@ export default class AniControl extends cc.Component {
         this.doFlyBirdLogic();
         this.doStarLogic();
         this.doDogMoveLogic();
-        this.doDuckMoveLogic(); 
+        //this.doDuckMoveLogic(); 
         this.doSheepMoveLogic();
     }
 
@@ -155,6 +158,7 @@ export default class AniControl extends cc.Component {
         if(this.sheepMoveEnd)
         {
             this.sheepMoveEnd = false;
+            this.hb_btn.active = true;
             this.moveSheep.node.active = false;
             let time = mk.math.random(5, 8);
             cc.tween(this.moveSheep.node).delay(time).call(()=>{

+ 4 - 0
assets/script/game/game/ChangeAni.ts

@@ -8,6 +8,9 @@ export default class ChangeAni extends cc.Component {
     @property({displayName: 'sheepAni', type: cc.Animation})
     private sheepAni: cc.Animation = null;
 
+    @property({displayName: '红包节点', type: cc.Node})
+    private hb_node: cc.Node = null;
+
 
     private changeAni(num: number)
     {
@@ -21,6 +24,7 @@ export default class ChangeAni extends cc.Component {
         }else if( num == 2)
         {
             this.sheepAni.play('sheepStand');
+            this.hb_node.active = true;
         }
     }
 }

+ 37 - 0
assets/script/game/game/Farmer.ts

@@ -0,0 +1,37 @@
+import { TakeAwalk, WalkState } from "./TakeAwalk";
+
+
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export class Farmer extends cc.Component {
+    @property({ type: TakeAwalk, tooltip: "散步组件" }) walk: TakeAwalk = null;
+    @property({ type: cc.Animation, tooltip: "动画组件" }) animation: cc.Animation = null;
+    @property({ type: cc.Sprite, tooltip: "动画组件" }) forwardMask: cc.Sprite = null;
+    @property({ type: cc.Sprite, tooltip: "动画组件" }) backMask: cc.Sprite = null;
+
+    private clips: cc.AnimationClip[] = [];
+    
+    start(){
+
+        this.clips = this.animation.getClips();
+    }
+    update() {
+        if (this.walk.curTargetPoint && this.walk.curTargetPoint.x > this.node.position.x) {
+            this.node.setScale(cc.v3(-1, 1, 1));
+        } else {
+            this.node.setScale(cc.v3(1, 1, 1));
+        }
+        if (this.walk.state == WalkState.Stop) {
+            if (this.walk.curTargetPoint && this.walk.curTargetPoint.y > this.node.position.y) {
+                this.animation.play(this.clips[1].name);
+                this.forwardMask.node.active = !(this.backMask.node.active = true);
+            } else {
+                this.animation.play(this.clips[0].name);
+                this.forwardMask.node.active = !(this.backMask.node.active = false);
+            }
+        }
+    }
+}
+

+ 9 - 0
assets/script/game/game/Farmer.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c6d47085-e2df-4dfb-bc5d-6035e9e25ccd",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 2 - 27
assets/script/game/game/Game.ts

@@ -27,12 +27,8 @@ export default class Game extends cc.Component {
     node_gameplay: cc.Node = null;
     @property({ type: cc.Node, displayName: "功能按钮" })
     node_btn: cc.Node = null;
-    @property({ type: cc.Sprite, displayName: "头像" })
-    img_head: cc.Sprite = null;
     @property({ type: cc.Label, displayName: "红包币" })
     lbl_redMoney: cc.Label = null;
-    @property({ type: cc.Label, displayName: "金猪币" })
-    lbl_rmb: cc.Label = null;
     @property({ type: cc.Sprite, displayName: "红包提现" })
     btn_cashOutNormal: cc.Sprite = null;
     @property({ type: cc.Sprite, displayName: "金猪提现" })
@@ -112,11 +108,6 @@ export default class Game extends cc.Component {
     }
 
     update() {
-        if (gData.gameData.updatePiggyBankValue) {
-            this.updatePiggyBankValue();
-            gData.gameData.updatePiggyBankValue = false;
-
-        }
         if (gData.gameData.init_coin) {
             this.changeInfo();
         }
@@ -158,33 +149,17 @@ export default class Game extends cc.Component {
 
     private initInfo() {
         this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
-        // this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
-        const new_count = gData.gameData.gameData.piggyBank / 100;
-        this.lbl_rmb.string = new_count.toFixed(2);
         gData.gameData.init_coin = false;
     }
 
     private changeInfo() {
         this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.gameData.redMoney);
-        // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
-
-        const new_count = gData.gameData.gameData.piggyBank / 100;
-        if (parseInt(this.lbl_rmb.string) == 0 && new_count != 0 || parseInt(this.lbl_rmb.string) != 0 && new_count == 0) {
-            if (this.lbl_rmb.string != new_count.toFixed(2)) {
-                this.lbl_rmb.node.getComponent(mk.component.numberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
-            }
-        }
         gData.gameData.init_coin = false;
     }
 
     private async initHead() {
-        let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
-        this.img_head.spriteFrame = new cc.SpriteFrame(result);
-    }
-
-    private updatePiggyBankValue() {
-        this.lbl_rmb.string = (gData.gameData.gameData.piggyBank / 100).toFixed(2);
-        gData.gameData.updatePiggyBankValue = false;
+        //let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
+        //this.img_head.spriteFrame = new cc.SpriteFrame(result);
     }
 
     /**

+ 187 - 0
assets/script/game/game/TakeAwalk.ts

@@ -0,0 +1,187 @@
+
+const { ccclass, property } = cc._decorator;
+
+export enum WalkTargetType {
+    Line,
+    Random
+}
+export enum WalkDeleyDataType {
+    Const,
+    Random
+}
+export enum WalkDeleyType {
+    Step,
+    Round
+}
+
+export enum WalkState {
+    Walk,
+    Stop,
+}
+
+@ccclass("WalkDeleyData")
+export class WalkDeleyData {
+    @property({
+        type: cc.Enum(WalkDeleyDataType),
+        tooltip: "延迟类型:\nConst:固定时间\nRandom:随机时间"
+    })
+    type: WalkDeleyDataType = WalkDeleyDataType.Const;
+    @property({
+        tooltip: "延迟时间(常量)", visible() {
+            return this.type == WalkDeleyDataType.Const;
+        }
+    })
+    private deley_const: number = 0;
+    @property({
+        tooltip: "延迟时间(随机值)", visible() {
+            return this.type == WalkDeleyDataType.Random;
+        }
+    })
+    private deley_random: cc.Vec2 = new cc.Vec2();
+
+    public get deley(): number {
+        if (this.type == WalkDeleyDataType.Const) {
+            return this.deley_const;
+        } else if (this.type == WalkDeleyDataType.Random) {
+            return this.random(this.deley_random.x, this.deley_random.y);
+        }
+        return 0;
+    }
+
+    private random(min: number, max: number): number {
+        return min + Math.random() * (max - min);
+    }
+}
+
+@ccclass
+export class TakeAwalk extends cc.Component {
+    @property({ type: cc.Node, tooltip: "散步目标点" }) points: Array<cc.Node> = [];
+    @property({ tooltip: "速度系数(每帧)" }) speed: number = 1;
+
+    @property({
+        type: cc.Enum(WalkTargetType),
+        tooltip: "散步目标选择方式:\nLine:根据目标点集合,逐个前往\nRandom:在目标点集合中随机选择前往"
+    }) walkTargetType: WalkTargetType = WalkTargetType.Random;
+
+    @property({
+        type: cc.Enum(WalkDeleyType),
+        tooltip: "散步延迟方式:\nStep:每到一个点开始延迟(随机目标,固定使用这个方式)\nRound:所有目标点都经过后开始延迟",
+        visible() {
+            return this.walkTargetType == WalkTargetType.Line;
+        }
+    }) deleyType: WalkDeleyType = WalkDeleyType.Step;
+    @property({
+        tooltip: "线性行走完成后是否循环",
+        visible() {
+            return this.walkTargetType == WalkTargetType.Line;
+        }
+    }) loop: boolean = true;
+    @property({
+        type: cc.Component.EventHandler, tooltip: "非循环模式,完成后的回调",
+        visible() {
+            return this.walkTargetType == WalkTargetType.Line && !this.loop;
+        }
+    }) complete: cc.Component.EventHandler = null;
+
+    @property({
+        type: WalkDeleyData, tooltip: "散步延迟数据"
+    }) deley: WalkDeleyData = new WalkDeleyData();
+
+    @property({ tooltip: "初始化时是否设置散步节点到第一个目标点位置" }) resetPosOnLoad: boolean = false;
+    @property({ tooltip: "是否初始化后开始移动" }) walkOnLoad: boolean = false;
+
+    @property({displayName: '某一个父节点', type: cc.Node})
+    private parent_node: cc.Node = null;
+    @property({displayName: '参照节点', type: cc.Node})
+    private reference_node: cc.Node = null;
+    @property({displayName: '指定位置index'})
+    private posIndex: number = 0;
+
+
+    private curPointIndex = -1;
+    private walkTotleFarme = 0;
+    private beenStop = false;
+    /**当前目标点 */
+    public curTargetPoint: cc.Vec3;
+    /**当前状态 */
+    public state: WalkState = WalkState.Stop;
+    start() {
+        if (this.resetPosOnLoad) {
+            this.curPointIndex = 0;
+            this.node.setPosition(this.points[this.curPointIndex].position);
+        }
+        if (this.walkTargetType == WalkTargetType.Random) {
+            this.deleyType = WalkDeleyType.Step;
+        }
+        this.walkOnLoad && this.walk();
+    }
+
+    public walk(): void {
+        this.beenStop = false;
+        this.next(0);
+    }
+    
+    public stopE(): void {
+        this.beenStop = true;
+        this.state = WalkState.Stop;
+    }
+
+    private next(deley: number = -1): void {
+        if (this.walkTargetType == WalkTargetType.Random) {
+            this.curPointIndex = this.random_int(0, this.points.length - 1);
+        } else {
+            this.curPointIndex++;
+            if(this.parent_node)
+            {
+                if(this.curPointIndex == this.posIndex)
+                {
+                    this.parent_node.zIndex  = this.reference_node.zIndex -1;
+                }
+            }
+            if (this.curPointIndex >= this.points.length) {
+                if (this.loop) {
+                    this.curPointIndex = 0;
+                    if(this.parent_node)
+                    {
+                        this.parent_node.zIndex  = this.reference_node.zIndex +1;
+                    }
+                } else {
+                    this.curPointIndex = -1;
+                    this.stopE();
+                    this.complete && this.complete.emit(null);
+                    return;
+                }
+            }
+        }
+        let d = 0;
+        if (this.deleyType == WalkDeleyType.Step || (this.deleyType == WalkDeleyType.Round && this.curPointIndex == 0)) {
+            d = this.deley.deley;
+        }
+        deley >= 0 && (d = deley);
+        this.curTargetPoint = this.points[this.curPointIndex].position;
+        let distance = cc.Vec3.distance(this.node.position, this.curTargetPoint);
+        this.walkTotleFarme = distance / this.speed;
+        this.scheduleOnce(() => {
+            this.state = WalkState.Walk;
+        }, d);
+    }
+
+    update() {
+        if (this.state == WalkState.Walk && !this.beenStop) {
+            let angle = Math.atan2(this.curTargetPoint.y - this.node.position.y, this.curTargetPoint.x - this.node.position.x);
+            let x = Math.cos(angle) * this.speed;
+            let y = Math.sin(angle) * this.speed;
+            this.node.setPosition(this.node.position.add(cc.v3(x, y, 0)));
+            this.walkTotleFarme--;
+            if (this.walkTotleFarme <= 0) {
+                this.node.setPosition(this.curTargetPoint);
+                this.next();
+                this.state = WalkState.Stop;
+            }
+        }
+    }
+
+    private random_int(min: number, max: number): number {
+        return min + Math.round(Math.random() * (max - min))
+    }
+}

+ 9 - 0
assets/script/game/game/TakeAwalk.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "bfb97138-5d97-4951-bc28-a2770f841c9d",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 5 - 2
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -8,10 +8,13 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class WalletCashOut extends cc.Component {
 
-    @property({displayName: '公告', type: cc.Label})
-    private lbl_notice: cc.Label = null;
     @property({displayName: '进度条', type: cc.Sprite})
     private sp_progress: cc.Sprite = null;
+
+    @property({displayName: '红包币', type: cc.Label})
+    private lbl_redMoney: cc.Label = null;
+    @property({displayName: '金额', type: cc.Label})
+    private lbl_value: cc.Label = null;
     @property({displayName: '提示', type: cc.Label})
     private lbl_tip: cc.Label = null;
 

+ 2 - 1
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -93,7 +93,8 @@ export default class RedBagTask extends cc.Component{
 
     private clickGetRewardBtn()
     {
-        
+        //gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
+        //mk.ui.openPanel('module/newNotice/newNotice');
     }
     
     /**

+ 87 - 87
build/jsb-link/frameworks/runtime-src/Classes/AppDelegate.cpp

@@ -1,88 +1,88 @@
-/****************************************************************************
- Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
- http://www.cocos.com
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated engine source code (the "Software"), a limited,
- worldwide, royalty-free, non-assignable, revocable and non-exclusive license
- to use Cocos Creator solely to develop games on your target platforms. You shall
- not use Cocos Creator software for developing other software or tools that's
- used for developing games. You are not granted to publish, distribute,
- sublicense, and/or sell copies of Cocos Creator.
- 
- The software or tools in this License Agreement are licensed, not sold.
- Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#include "AppDelegate.h"
-
-#include "cocos2d.h"
-
-#include "cocos/scripting/js-bindings/manual/jsb_module_register.hpp"
-#include "cocos/scripting/js-bindings/manual/jsb_global.h"
-#include "cocos/scripting/js-bindings/jswrapper/SeApi.h"
-#include "cocos/scripting/js-bindings/event/EventDispatcher.h"
-#include "cocos/scripting/js-bindings/manual/jsb_classtype.hpp"
-
-USING_NS_CC;
-
-AppDelegate::AppDelegate(int width, int height) : Application("Cocos Game", width, height)
-{
-}
-
-AppDelegate::~AppDelegate()
-{
-}
-
-bool AppDelegate::applicationDidFinishLaunching()
-{
-    se::ScriptEngine *se = se::ScriptEngine::getInstance();
-    
+/****************************************************************************
+ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ 
+ http://www.cocos.com
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated engine source code (the "Software"), a limited,
+ worldwide, royalty-free, non-assignable, revocable and non-exclusive license
+ to use Cocos Creator solely to develop games on your target platforms. You shall
+ not use Cocos Creator software for developing other software or tools that's
+ used for developing games. You are not granted to publish, distribute,
+ sublicense, and/or sell copies of Cocos Creator.
+ 
+ The software or tools in this License Agreement are licensed, not sold.
+ Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#include "AppDelegate.h"
+
+#include "cocos2d.h"
+
+#include "cocos/scripting/js-bindings/manual/jsb_module_register.hpp"
+#include "cocos/scripting/js-bindings/manual/jsb_global.h"
+#include "cocos/scripting/js-bindings/jswrapper/SeApi.h"
+#include "cocos/scripting/js-bindings/event/EventDispatcher.h"
+#include "cocos/scripting/js-bindings/manual/jsb_classtype.hpp"
+
+USING_NS_CC;
+
+AppDelegate::AppDelegate(int width, int height) : Application("Cocos Game", width, height)
+{
+}
+
+AppDelegate::~AppDelegate()
+{
+}
+
+bool AppDelegate::applicationDidFinishLaunching()
+{
+    se::ScriptEngine *se = se::ScriptEngine::getInstance();
+    
     jsb_set_xxtea_key("0ecabcfa-d7d5-4e");
-    jsb_init_file_operation_delegate();
-    
-#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
-    // Enable debugger here
-    jsb_enable_debugger("0.0.0.0", 6086, false);
-#endif
-    
-    se->setExceptionCallback([](const char *location, const char *message, const char *stack) {
-        // Send exception information to server like Tencent Bugly.
-        cocos2d::log("\nUncaught Exception:\n - location :  %s\n - msg : %s\n - detail : \n      %s\n", location, message, stack);
-    });
-    
-    jsb_register_all_modules();
-    
-    se->start();
-    
-    se::AutoHandleScope hs;
-    jsb_run_script("jsb-adapter/jsb-builtin.js");
-    jsb_run_script("main.js");
-    
-    se->addAfterCleanupHook([]() {
-        JSBClassType::destroy();
-    });
-    
-    return true;
-}
-
-// This function will be called when the app is inactive. When comes a phone call,it's be invoked too
-void AppDelegate::onPause()
-{
-    EventDispatcher::dispatchOnPauseEvent();
-}
-
-// this function will be called when the app is active again
-void AppDelegate::onResume()
-{
-    EventDispatcher::dispatchOnResumeEvent();
-}
+    jsb_init_file_operation_delegate();
+    
+#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
+    // Enable debugger here
+    jsb_enable_debugger("0.0.0.0", 6086, false);
+#endif
+    
+    se->setExceptionCallback([](const char *location, const char *message, const char *stack) {
+        // Send exception information to server like Tencent Bugly.
+        cocos2d::log("\nUncaught Exception:\n - location :  %s\n - msg : %s\n - detail : \n      %s\n", location, message, stack);
+    });
+    
+    jsb_register_all_modules();
+    
+    se->start();
+    
+    se::AutoHandleScope hs;
+    jsb_run_script("jsb-adapter/jsb-builtin.js");
+    jsb_run_script("main.js");
+    
+    se->addAfterCleanupHook([]() {
+        JSBClassType::destroy();
+    });
+    
+    return true;
+}
+
+// This function will be called when the app is inactive. When comes a phone call,it's be invoked too
+void AppDelegate::onPause()
+{
+    EventDispatcher::dispatchOnPauseEvent();
+}
+
+// this function will be called when the app is active again
+void AppDelegate::onResume()
+{
+    EventDispatcher::dispatchOnResumeEvent();
+}

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 1 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />

+ 178 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":kxnly" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":kxnly" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
+      </configuration>
+    </facet>
+    <facet type="native-android-gradle" name="Native-Android-Gradle">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug-armeabi-v7a" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../res;file://$MODULE_DIR$/../../../app/res;file://$MODULE_DIR$/../../../app/libs/topon/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/test/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/testDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/libs/topon/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/.cxx" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/.externalNativeBuild" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../res">
+      <sourceFolder url="file://$MODULE_DIR$/../../../res" type="java-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 31 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/gson-2.8.4.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-common-9.4.0.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-game-9.2.0+G.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/utdid4all-1.5.2.1-proguard.jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/anythink_cocosjs_bridge.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_banner.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_china_core.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_core.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_interstitial.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_native.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_baidu.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_gdt.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_kuaishou.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_pangle_china.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_sigmob.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_rewardvideo.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_splash.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.1.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.351.1221.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.9-publishRelease-4ea04e00c.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.5.0.8.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-2.25.2.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/thinkingdata/ThinkingSDK.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
+  </component>
+</module>

+ 27 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/android-libcocos2dx.iml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="$MODULE_DIR$/../../../../../../../../../../../../../null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../../../../../../../../../../../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_KNOWN_AGP_VERSION" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../../../../../../../../../../../../null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../../../../../../../../../../../null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../../../../null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../../../../../null/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 54 - 54
build/jsb-link/frameworks/runtime-src/proj.android-studio/game/AndroidManifest.xml

@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.cocos2dx.javascript">
-    <dist:module dist:instant="true" />
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
-        android:usesCleartextTraffic="true"
-        android:supportsRtl="true">
-        <meta-data
-            android:name="aia-compat-api-min-version"
-            android:value="1" />
-
-        <meta-data android:name="android.app.lib_name"
-            android:value="cocos2djs" />
-
-        <activity
-            android:name="org.cocos2dx.javascript.InstantAppActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-
-            <intent-filter android:order="1">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    <uses-feature android:glEsVersion="0x00020000" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.cocos2dx.javascript">
+    <dist:module dist:instant="true" />
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true"
+        android:supportsRtl="true">
+        <meta-data
+            android:name="aia-compat-api-min-version"
+            android:value="1" />
+
+        <meta-data android:name="android.app.lib_name"
+            android:value="cocos2djs" />
+
+        <activity
+            android:name="org.cocos2dx.javascript.InstantAppActivity"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
+            <intent-filter android:order="1">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-feature android:glEsVersion="0x00020000" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
 </manifest>

+ 6 - 6
build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -18,13 +18,13 @@
 # org.gradle.parallel=true
 
 # Android SDK version that will be used as the compile project
-PROP_COMPILE_SDK_VERSION=29
+PROP_COMPILE_SDK_VERSION=31
 
 # Android SDK version that will be used as the earliest version of android this application can run on
 PROP_MIN_SDK_VERSION=21
 
 # Android SDK version that will be used as the latest version of android this application has been tested on
-PROP_TARGET_SDK_VERSION=29
+PROP_TARGET_SDK_VERSION=31
 
 # Android Build Tools version that will be used as the compile project
 PROP_BUILD_TOOLS_VERSION=28.0.3
@@ -36,10 +36,10 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey.keystore
-RELEASE_STORE_PASSWORD=szmoka
-RELEASE_KEY_ALIAS=mokakey
-RELEASE_KEY_PASSWORD=szmoka
+#RELEASE_STORE_FILE=C:/CocosDashboard_1.0.12/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
+RELEASE_STORE_PASSWORD=123456
+RELEASE_KEY_ALIAS=debug_keystore
+RELEASE_KEY_PASSWORD=123456
 
 android.injected.testOnly=false
 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 636 - 69
build/jsb-link/js backups (useful for debugging)/main.index.js


+ 2 - 2
packages-hot-update/cfg.json

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1629890775955,
-    "genTime": 1629890775955,
+    "buildTime": 1629968260870,
+    "genTime": 1629968260870,
     "genVersion": null
 }

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels