Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/module/pigBank/texture/close.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 53,
-  "height": 49,
+  "width": 88,
+  "height": 88,
   "platformSettings": {},
   "subMetas": {
     "close": {

assets/resources/module/turnable/particleEff.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "6da8f751-dcee-4d65-8ca9-54b993f30524",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/turnable/particleEff/starAni.prefab

@@ -0,0 +1,190 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "starAni",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_prefab": {
+      "__id__": 3
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        116,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": true,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ParticleSystem",
+    "_name": "boom<ParticleSystem>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 1,
+    "_dstBlendFactor": 771,
+    "_custom": true,
+    "_file": {
+      "__uuid__": "b2687ac4-099e-403c-a192-ff477686f4f5"
+    },
+    "_spriteFrame": {
+      "__uuid__": "f0fb9b52-c280-4db8-b4a0-57d4103c7de8"
+    },
+    "_texture": null,
+    "_stopped": false,
+    "playOnLoad": false,
+    "autoRemoveOnFinish": true,
+    "totalParticles": 25,
+    "duration": -1,
+    "emissionRate": 25,
+    "life": 0.6,
+    "lifeVar": 1,
+    "_startColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_startColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 0
+    },
+    "_endColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_endColorVar": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 0
+    },
+    "angle": 0,
+    "angleVar": 360,
+    "startSize": 70,
+    "startSizeVar": 30,
+    "endSize": 50,
+    "endSizeVar": 50,
+    "startSpin": 0,
+    "startSpinVar": 90,
+    "endSpin": 360,
+    "endSpinVar": 360,
+    "sourcePos": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "posVar": {
+      "__type__": "cc.Vec2",
+      "x": 7,
+      "y": 7
+    },
+    "_positionType": 1,
+    "positionType": 1,
+    "emitterMode": 0,
+    "gravity": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "speed": 500,
+    "speedVar": 150,
+    "tangentialAccel": -30,
+    "tangentialAccelVar": -200,
+    "radialAccel": -30,
+    "radialAccelVar": -200,
+    "rotationIsDir": false,
+    "startRadius": 0,
+    "startRadiusVar": 0,
+    "endRadius": 0,
+    "endRadiusVar": 0,
+    "rotatePerS": 0,
+    "rotatePerSVar": 0,
+    "_N$preview": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "e1CaiOKltPmJB3vTvLz7KC",
+    "sync": false
+  }
+]

assets/resources/module/turnable/particleEff/starAni.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "733df39b-9710-4883-af0a-fba687154fc2",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/turnable/spine.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "a6836f19-8274-4a4c-9031-350f60d354df",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/turnable/spine/baozha.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "49f577d1-a0f3-43b6-98b6-29603288ed13",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/turnable/spine/baozha/skeleton.atlas

@@ -0,0 +1,62 @@
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

assets/resources/module/turnable/spine/baozha/skeleton.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "d20d76d5-2805-46f5-97ed-c028f6f6b2cc",
+  "subMetas": {}
+}

assets/resources/module/turnable/spine/baozha/skeleton.json

@@ -0,0 +1,54 @@
+{
+"skeleton": {
+	"hash": "buLuJqseJ3XNzQTnNnuqvIUZJcw",
+	"spine": "3.8.95",
+	"x": -396.9,
+	"y": -502.82,
+	"width": 750,
+	"height": 1334,
+	"images": "D:/设计资源/亿万人生/spine/撒花",
+	"audio": ""
+},
+"bones": [
+	{ "name": "root" }
+],
+"slots": [
+	{ "name": "1", "bone": "root", "attachment": "1" }
+],
+"skins": [
+	{
+		"name": "default",
+		"attachments": {
+			"1": {
+				"1": { "width": 145, "height": 141 },
+				"2": { "width": 359, "height": 359 },
+				"3": { "width": 347, "height": 348 },
+				"4": { "width": 350, "height": 349 },
+				"5": { "width": 361, "height": 362 },
+				"6": { "width": 359, "height": 362 },
+				"7": { "width": 359, "height": 362 },
+				"8": { "width": 351, "height": 357 }
+			}
+		}
+	}
+],
+"animations": {
+	"animation": {
+		"slots": {
+			"1": {
+				"attachment": [
+					{ "name": "1" },
+					{ "time": 0.0667, "name": "2" },
+					{ "time": 0.1333, "name": "3" },
+					{ "time": 0.2, "name": "4" },
+					{ "time": 0.2667, "name": "5" },
+					{ "time": 0.3333, "name": "6" },
+					{ "time": 0.4, "name": "7" },
+					{ "time": 0.4667, "name": "8" },
+					{ "time": 0.5333, "name": null }
+				]
+			}
+		}
+	}
+}
+}

assets/resources/module/turnable/spine/baozha/skeleton.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "5210cba6-9314-4f36-85a2-4754a0df287f",
+  "textures": [
+    "13369b9a-db11-4668-8196-fca06498d9a7"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/resources/module/turnable/spine/baozha/skeleton.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "13369b9a-db11-4668-8196-fca06498d9a7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1386,
+  "height": 710,
+  "platformSettings": {},
+  "subMetas": {
+    "skeleton": {
+      "ver": "1.0.4",
+      "uuid": "ef7f8055-4e83-4e81-bd4a-3c4fdea2cf3f",
+      "rawTextureUuid": "13369b9a-db11-4668-8196-fca06498d9a7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 1382,
+      "height": 706,
+      "rawWidth": 1386,
+      "rawHeight": 710,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/turnable/texture/close.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 53,
-  "height": 49,
+  "width": 88,
+  "height": 88,
   "platformSettings": {},
   "subMetas": {
     "close": {

assets/resources/module/turnable/texture/turntable_icon_star1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "842185da-fd41-4708-a525-fb6b29fba711",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": true,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 107,
+  "height": 105,
+  "platformSettings": {},
+  "subMetas": {
+    "turntable_icon_star1": {
+      "ver": "1.0.4",
+      "uuid": "f0fb9b52-c280-4db8-b4a0-57d4103c7de8",
+      "rawTextureUuid": "842185da-fd41-4708-a525-fb6b29fba711",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 1,
+      "width": 107,
+      "height": 104,
+      "rawWidth": 107,
+      "rawHeight": 105,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/game/module/redeem/RedeemNode.ts

@@ -41,6 +41,10 @@ export default class RedeemNode extends cc.Component {
 
     rewardData: any = null;
 
+    onEnable() {
+        gData.redeem.init_redeemData = true;
+    }
+
     update() {
         if (gData.redeem.init_redeemData) {
             this.InitData();
@@ -69,13 +73,8 @@ export default class RedeemNode extends cc.Component {
                 this.rd_imgs[i].spriteFrame = res;
                 this.suc_rd_imgs[i].spriteFrame = res;
             });
-            if (this.rewardData[i].type == "10001") {
-                this.rd_txts[i].string = mk.math.format(this.rewardData[i].count) + "分钟";
-                this.suc_rd_txts[i].string = mk.math.format(this.rewardData[i].count) + "分钟";
-            } else {
-                this.rd_txts[i].string = mk.math.format(this.rewardData[i].count);
-                this.suc_rd_txts[i].string = mk.math.format(this.rewardData[i].count);
-            }
+            this.rd_txts[i].string = mk.math.format(this.rewardData[i].count);
+            this.suc_rd_txts[i].string = mk.math.format(this.rewardData[i].count);
         }
     }
 

assets/script/game/module/turntable/Turnable.ts

@@ -20,6 +20,12 @@ export default class Turnable extends cc.Component {
     @property(cc.RichText)
     lbl_left: cc.RichText = null;
 
+    @property(cc.ParticleSystem)
+    starAni: cc.ParticleSystem = null;
+
+    @property(sp.Skeleton)
+    baozhaAni: sp.Skeleton = null;
+
     private audioId: number;
 
     private endAngle = 0
@@ -30,6 +36,7 @@ export default class Turnable extends cc.Component {
     private perMinus = 0
 
     onLoad() {
+        this.baozhaAni.node.active = false;
         this.initData();
     }
 
@@ -71,6 +78,9 @@ export default class Turnable extends cc.Component {
         this.perMinus = this.perAdd / (this.slowDis / (this.perAdd * 0.5));
         this.startDraw = true;
 
+        this.starAni.resetSystem()
+        this.starAni.node.active = true
+
         // this.node_turn.angle = 1800;
         // let tar = index * 60;
         // cc.tween(this.node_turn)
@@ -114,6 +124,9 @@ export default class Turnable extends cc.Component {
 
             if (this.node_turn.angle <= this.endAngle) {
                 this.startDraw = false;
+                this.starAni.node.active = false
+                this.baozhaAni.node.active = true
+                this.baozhaAni.setAnimation(0, 'animation', false)
                 this.playOver();
             }
         }