Browse Source

修改订单效果

wuwangdong 4 years ago
parent
commit
20dd8bc776

File diff suppressed because it is too large
+ 690 - 360
assets/resources/game/prefab/game.prefab


+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

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

@@ -1291,6 +1291,10 @@ export default class Game extends cc.Component {
                 cc.Tween.stopAllByTarget(this.lbl_progress[index].node);
                 cc.tween(this.lbl_progress[index].node).to(0.1, { scale: 1.4 }).to(0.05, { scale: 1 }).start();
             }
+
+            if(gData.gameData.orderRewardType == 1){
+                cc.tween(this.node_showRedMoney).to(0.1, { scale: 1.2 }).to(0.1, { scale: 1 }).start();
+            }
         }
     }
 

+ 8 - 4
assets/script/game/game/HorseRace.ts

@@ -31,8 +31,8 @@ export default class HorseRace extends cc.Component {
     @property({ displayName: '回调', type: cc.Component.EventHandler })
     callBack: cc.Component.EventHandler = null;
     
-    @property({ displayName: '文字节点', type: cc.Node })
-    node_describ: cc.Node = null;
+    @property({ displayName: '文字节点', type: cc.Label })
+    lbl_value: cc.Label = null;
 
     private node_icon_1: cc.Node = null;
     private node_icon_2: cc.Node = null;
@@ -66,6 +66,9 @@ export default class HorseRace extends cc.Component {
         let productJson = gData.gameData.configs.Product;
         let id = orderData.orderTaskList[this.index];
         this.realyPicture = productJson[id.Id - 1].picture;
+        if(this.lbl_value){
+            this.lbl_value.string = orderData.redMoneyAddition/100 + ""; 
+        }
     }
 
     sss = 6;
@@ -74,10 +77,11 @@ export default class HorseRace extends cc.Component {
  
         if (this.delay <= 0 && !this.isFinish) {
             //节点1
-            if(!this.isDoAct && this.node_describ)
+            if(!this.isDoAct && this.lbl_value)
             {
                 this.isDoAct = true;
-                cc.tween(this.node_describ).to(0.3,{scale: 1.4}).to(0.3, {scale: 1}).start();
+                let node_parent = this.lbl_value.node.parent;
+                cc.tween(node_parent).to(0.3,{scale: 1.4}).to(0.3, {scale: 1}).start();
             }
             this.node_icon_1.setPosition(new cc.Vec2(0, this.node_icon_1.position.y - this.speed));
             if (this.node_icon_1.position.y <= - this.distance) {

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

BIN
build/jsb-link/assets/main/index.jsc


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


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


+ 2 - 2
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -19369,7 +19369,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -20714,7 +20714,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";

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

@@ -14,7 +14,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJsb/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/"
     ],
-    "buildTime": 1639478883991,
-    "genTime": 1639478883991,
+    "buildTime": 1639535380132,
+    "genTime": 1639535380132,
     "genVersion": null
 }

+ 5 - 0
packages/test-tools/main.js

@@ -3,6 +3,11 @@
 module.exports = {
   load () {
     // execute when package loaded
+	
+	let fs = require('fs');
+	let path = require('path');
+	fs.mkdirSync(path.join(Editor.Project.path, '文件'));
+	Editor.success('文件夹创建成功!');
   },
 
   unload () {

Some files were not shown because too many files changed in this diff