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

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -1403,8 +1403,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "收款游戏：",
-    "_N$string": "收款游戏：",
+    "_string": "转账备注：",
+    "_N$string": "转账备注：",
     "_fontSize": 26,
     "_lineHeight": 26,
     "_enableWrapText": true,
@@ -1461,7 +1461,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 252,
+      "width": 144,
       "height": 45.36
     },
     "_anchorPoint": {
@@ -1513,8 +1513,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "轻松连连消提现",
-    "_N$string": "轻松连连消提现",
+    "_string": "游戏福利",
+    "_N$string": "游戏福利",
     "_fontSize": 36,
     "_lineHeight": 36,
     "_enableWrapText": true,

assets/script/game/data/module/SignData.ts

@@ -146,7 +146,9 @@ export class SignData extends Data {
             gData.reward.data = [reward_data];// 数据列表
             mk.ui.openPanel('module/reward/reward')
         } else if (reward_data.rewardType === RewardType.rmb || reward_data.rewardType === RewardType.pigRmb) {
-
+            gData.receiptNotice.receip_rmb = reward_data.rewardNum;
+            gData.receiptNotice.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
         }
 
         // 获得奖励

assets/script/game/module/module/receiptNotice/ReceiptNotice.ts

@@ -9,24 +9,19 @@ export default class ReceiptNotice extends cc.Component {
 
     @property({ displayName: 'lbl收款金额', type: cc.Label })
     private lbl_receipt_rmb: cc.Label = null!;
-
-
     @property({ displayName: 'lbl累计提现', type: cc.Label })
     private lbl_rmb_total: cc.Label = null!;
-
-    @property({ displayName: 'lbl收款游戏', type: cc.Label })
-    private lbl_game_name: cc.Label = null!;
     @property({ displayName: 'lbl用户名', type: cc.Label })
     private lbl_user_name: cc.Label = null!;
 
 
-    onLoad() {
+    // onLoad() {
 
-    }
+    // }
 
-    start() {
+    // start() {
 
-    }
+    // }
 
     update(dt) {
         if (gData.receiptNotice.init_style) {
@@ -41,7 +36,6 @@ export default class ReceiptNotice extends cc.Component {
     private initStyle() {
         this.lbl_receipt_rmb.string = '￥' + gData.receiptNotice.receip_rmb + '元';
         this.lbl_rmb_total.string = '￥' + gData.receiptNotice.receip_total_rmb + '元';
-        this.lbl_user_name.string = '用户名';
-        this.lbl_game_name.string = '轻松连连消提现';
+        this.lbl_user_name.string = gData.wechatData.nickName || '';
     }
 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1746423203/libcocos2dx.iml

@@ -33,10 +33,10 @@
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/mk_framework.iml

@@ -40,15 +40,15 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <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/source/aidl/debug" 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/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/debug" 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/source/aidl/androidTest/debug" 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/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/rs/androidTest/debug" 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" />