Browse Source

no message

汤金涛 5 months ago
parent
commit
3fed50a0d4
100 changed files with 904 additions and 397 deletions
  1. 7 7
      Flowers/assets/core/util_class/GameData.ts
  2. 23 2
      Flowers/assets/module_extra/Customize/Customize_Ani.ts
  3. 2 1
      Flowers/assets/module_extra/Customize/Customize_Event.ts
  4. 0 25
      Flowers/assets/module_extra/Table_Json/flower_color.json
  5. 1 1
      Flowers/assets/module_extra/Table_Json/game.json
  6. 6 8
      Flowers/assets/module_game/game/flower/Flower.ts
  7. 7 3
      Flowers/assets/module_game/game/flower/Flowers_Show.ts
  8. 59 28
      Flowers/assets/module_game/game/process/GameCtl.ts
  9. 3 2
      Flowers/assets/module_game/game/process/Root.ts
  10. 103 102
      Flowers/assets/module_game/prefab/FP.prefab
  11. 28 0
      Flowers/assets/module_game/ui/UI/UI_Item.ts
  12. 3 3
      Flowers/assets/module_game/ui/UI_Game/Game.prefab
  13. 396 115
      Flowers/assets/module_game/ui/UI_Main/Main.prefab
  14. 31 10
      Flowers/assets/module_game/ui/UI_PiggyBank/UI_PiggyBank.ts
  15. 4 0
      Flowers/assets/module_game/ui/UI_Prop/UI_Prop.ts
  16. 6 3
      Flowers/assets/module_game/ui/UI_Settings/UI_Settings.ts
  17. 4 4
      Flowers/assets/module_game/ui/UI_Store/Item.prefab
  18. 2 1
      Flowers/assets/module_game/ui/UI_Store/Store_Item.ts
  19. 2 1
      Flowers/assets/module_game/ui/UI_TimeOver/UI_TimeOver.ts
  20. BIN
      Flowers/assets/res/ui/main/game_bg014.png
  21. 134 0
      Flowers/assets/res/ui/main/game_bg014.png.meta
  22. 3 1
      Flowers/assets/start/Start.ts
  23. 4 4
      Flowers/assets/start/start.scene
  24. 0 61
      Flowers/build/web-desktop/application.4aa9a.js
  25. 61 0
      Flowers/build/web-desktop/application.7b4ce.js
  26. 0 1
      Flowers/build/web-desktop/assets/main/config.1e45c.json
  27. 1 0
      Flowers/build/web-desktop/assets/main/config.4c13f.json
  28. 0 0
      Flowers/build/web-desktop/assets/main/import/0b/0bfd41034.72b1e.json
  29. 0 0
      Flowers/build/web-desktop/assets/main/import/0b/0bfd41034.bac6a.json
  30. 0 2
      Flowers/build/web-desktop/assets/main/index.1e45c.js
  31. 2 0
      Flowers/build/web-desktop/assets/main/index.4c13f.js
  32. BIN
      Flowers/build/web-desktop/assets/main/native/1f/1fafc3fd-94f6-4b39-b34b-fcc6f905103f.18521.png
  33. BIN
      Flowers/build/web-desktop/assets/main/native/1f/1fafc3fd-94f6-4b39-b34b-fcc6f905103f.99178.png
  34. BIN
      Flowers/build/web-desktop/assets/main/native/26/26e8d143-668e-4058-8c83-dda07a299124.4c76c.png
  35. BIN
      Flowers/build/web-desktop/assets/main/native/26/26e8d143-668e-4058-8c83-dda07a299124.8c7d4.png
  36. BIN
      Flowers/build/web-desktop/assets/main/native/47/4707f156-b9b9-460a-8f11-6a6822e0e503.1a300.png
  37. BIN
      Flowers/build/web-desktop/assets/main/native/47/4707f156-b9b9-460a-8f11-6a6822e0e503.6443b.png
  38. BIN
      Flowers/build/web-desktop/assets/main/native/88/8808328c-b342-4e6b-98fb-414ea10934bb.83778.png
  39. BIN
      Flowers/build/web-desktop/assets/main/native/88/8808328c-b342-4e6b-98fb-414ea10934bb.d2181.png
  40. 0 0
      Flowers/build/web-desktop/assets/module_basic/config.a34b4.json
  41. 0 10
      Flowers/build/web-desktop/assets/module_basic/index.2bce5.js
  42. 10 0
      Flowers/build/web-desktop/assets/module_basic/index.a34b4.js
  43. 0 0
      Flowers/build/web-desktop/assets/module_extra/config.0b6d0.json
  44. 0 0
      Flowers/build/web-desktop/assets/module_extra/config.f7d75.json
  45. 0 0
      Flowers/build/web-desktop/assets/module_extra/import/5d/5d1e4515-6c6b-43b0-b110-986566793c45.19033.json
  46. 0 0
      Flowers/build/web-desktop/assets/module_extra/import/5d/5d1e4515-6c6b-43b0-b110-986566793c45.bb63f.json
  47. 1 0
      Flowers/build/web-desktop/assets/module_extra/import/d5/d59a69fd-7878-4fbd-9fe8-aca182d5feb0.77ce1.json
  48. 0 1
      Flowers/build/web-desktop/assets/module_extra/import/d5/d59a69fd-7878-4fbd-9fe8-aca182d5feb0.c68c3.json
  49. 0 1
      Flowers/build/web-desktop/assets/module_extra/import/ea/ea02bbbe-2c83-4c2d-9d56-97f1dc66ab08.0cd57.json
  50. 1 0
      Flowers/build/web-desktop/assets/module_extra/import/ea/ea02bbbe-2c83-4c2d-9d56-97f1dc66ab08.72a1e.json
  51. 0 0
      Flowers/build/web-desktop/assets/module_extra/index.0b6d0.js
  52. 0 0
      Flowers/build/web-desktop/assets/module_extra/index.f7d75.js
  53. 0 0
      Flowers/build/web-desktop/assets/module_game/config.3bf4c.json
  54. 0 0
      Flowers/build/web-desktop/assets/module_game/config.b18d9.json
  55. 0 0
      Flowers/build/web-desktop/assets/module_game/import/02/028e1ee78.bb396.json
  56. 0 0
      Flowers/build/web-desktop/assets/module_game/import/02/029adb2aa.742e8.json
  57. 0 0
      Flowers/build/web-desktop/assets/module_game/import/02/029adb2aa.b11fd.json
  58. 0 0
      Flowers/build/web-desktop/assets/module_game/import/03/0347b7de9.2e3e5.json
  59. 0 0
      Flowers/build/web-desktop/assets/module_game/import/03/036e7fbf4.f378a.json
  60. 0 0
      Flowers/build/web-desktop/assets/module_game/import/03/036e7fbf4.fed2d.json
  61. 0 0
      Flowers/build/web-desktop/assets/module_game/import/03/0378122e6.72d56.json
  62. 0 0
      Flowers/build/web-desktop/assets/module_game/import/03/0378122e6.bb629.json
  63. 0 0
      Flowers/build/web-desktop/assets/module_game/import/04/040f8e62a.2b947.json
  64. 0 0
      Flowers/build/web-desktop/assets/module_game/import/04/044da1086.d92bf.json
  65. 0 0
      Flowers/build/web-desktop/assets/module_game/import/04/04c857f7-7f29-47a9-96f8-34f6d40539ac.a2533.json
  66. 0 0
      Flowers/build/web-desktop/assets/module_game/import/05/05cbd7402.785ce.json
  67. 0 0
      Flowers/build/web-desktop/assets/module_game/import/06/06049bf2c.61d8d.json
  68. 0 0
      Flowers/build/web-desktop/assets/module_game/import/06/06049bf2c.e7ca7.json
  69. 0 0
      Flowers/build/web-desktop/assets/module_game/import/08/0860c6160.c86f4.json
  70. 0 0
      Flowers/build/web-desktop/assets/module_game/import/08/08acdf9bb.7476f.json
  71. 0 0
      Flowers/build/web-desktop/assets/module_game/import/08/08acdf9bb.c063a.json
  72. 0 0
      Flowers/build/web-desktop/assets/module_game/import/08/08fcf7d04.ac8e8.json
  73. 0 0
      Flowers/build/web-desktop/assets/module_game/import/09/0970df281.16d73.json
  74. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0a/0a5a2f57a.46b18.json
  75. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0a/0a5a2f57a.b742e.json
  76. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0a/0a750e086.aeddb.json
  77. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0a/0abd41c04.a0252.json
  78. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0c/0c4e47c5c.2b586.json
  79. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0e/0e95fa791.3d808.json
  80. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0f/0fce9d352.5f455.json
  81. 0 0
      Flowers/build/web-desktop/assets/module_game/import/0f/0fd53d036.9e6bb.json
  82. 0 0
      Flowers/build/web-desktop/assets/module_game/import/13/13e9e7ec-1a86-4757-bd28-986ecc52c2e3.a2533.json
  83. 0 0
      Flowers/build/web-desktop/assets/module_game/import/4b/4bb38379-69e2-4132-b14f-d9051d88b8f5.a2533.json
  84. 0 0
      Flowers/build/web-desktop/assets/module_game/import/df/dfbe9417-9925-449c-bcc3-2a99a72cbe9f.a2533.json
  85. 0 0
      Flowers/build/web-desktop/assets/module_game/import/fa/fa16a973-a752-4d81-86cc-0c1e71897626.a2533.json
  86. 0 0
      Flowers/build/web-desktop/assets/module_game/index.3bf4c.js
  87. 0 0
      Flowers/build/web-desktop/assets/module_game/index.b18d9.js
  88. BIN
      Flowers/build/web-desktop/assets/module_game/native/00/00c42157-a87b-4f5b-8b1a-79b5c181bb48.1a8f8.png
  89. BIN
      Flowers/build/web-desktop/assets/module_game/native/00/00c42157-a87b-4f5b-8b1a-79b5c181bb48.4faef.png
  90. BIN
      Flowers/build/web-desktop/assets/module_game/native/04/04c857f7-7f29-47a9-96f8-34f6d40539ac.db0d7.png
  91. BIN
      Flowers/build/web-desktop/assets/module_game/native/05/05092450-80bd-4610-bd14-2c5a587d092e.61fa4.png
  92. BIN
      Flowers/build/web-desktop/assets/module_game/native/05/05092450-80bd-4610-bd14-2c5a587d092e.8f354.png
  93. BIN
      Flowers/build/web-desktop/assets/module_game/native/05/0597ef0c-3402-41ce-92d8-2d27510d8c4a.1d2be.png
  94. BIN
      Flowers/build/web-desktop/assets/module_game/native/05/0597ef0c-3402-41ce-92d8-2d27510d8c4a.68fdf.png
  95. BIN
      Flowers/build/web-desktop/assets/module_game/native/0f/0fe5c408-6b79-4ac6-8134-d5f20645e185.0f4b3.png
  96. BIN
      Flowers/build/web-desktop/assets/module_game/native/0f/0fe5c408-6b79-4ac6-8134-d5f20645e185.bdd16.png
  97. BIN
      Flowers/build/web-desktop/assets/module_game/native/13/13e9e7ec-1a86-4757-bd28-986ecc52c2e3.926a0.png
  98. BIN
      Flowers/build/web-desktop/assets/module_game/native/14/140483f0-271c-42f0-aba2-55b9657e1f35.2311a.png
  99. BIN
      Flowers/build/web-desktop/assets/module_game/native/14/140483f0-271c-42f0-aba2-55b9657e1f35.f57ed.png
  100. BIN
      Flowers/build/web-desktop/assets/module_game/native/15/15731c86-5857-4340-af9f-220bb8e571f2.1a30e.png

+ 7 - 7
Flowers/assets/core/util_class/GameData.ts

@@ -104,19 +104,19 @@ export default class GameData<T extends string | number | symbol, DT extends str
          if (ch.sdk.get_inited() && load_data.uid != this._uid) load_data = null;
       }
 
-      // let remote_data;
-      // if (!load_data) {
-      //    remote_data = await this.loadGameDataWithRetry();
-      //    load_data = remote_data;
-      // }
+      let remote_data;
+      if (!load_data) {
+         remote_data = await this.loadGameDataWithRetry();
+         load_data = remote_data;
+      }
       // else if (remote_data && this.on_check(load_data, remote_data)) {
       //    load_data = remote_data;
       // }
 
       if (!load_data) {
          this.on_init();
-         ch.audio.volumeMusic = 0;
-         ch.audio.save();
+         // ch.audio.volumeMusic = 0;
+         // ch.audio.save();
          console.log("无数据所以初始化");
       } else {
          this.unserialize(load_data);

+ 23 - 2
Flowers/assets/module_extra/Customize/Customize_Ani.ts

@@ -292,10 +292,31 @@ export function fade_anim(node: Node, duration: number = 0.2, curOpacity: number
 }
 
 //放大缩小动画
-export function scale_anim(node: Node, duration: number = 0.2, curScale: Vec3 = new Vec3(0, 0, 0), targetScale: Vec3 = new Vec3(1, 1, 1), delay: number = 0, onFinish?: () => void) {
-    tween(node).to(duration, { scale: targetScale }).delay(delay).call(onFinish).start();
+export function scale_anim(node: Node, duration: number = 0.2, curScale: Vec3 = new Vec3(0, 0, 0), targetScale: Vec3 = new Vec3(1, 1, 1), delay: number = 0, onFinish?: () => void, loop: boolean = false, backDuration: number = 0.1) {
+    Tween.stopAllByTarget(node);
+
+    // 平滑缩回初始 scale
+    tween(node)
+        .to(backDuration, { scale: curScale })
+        .call(() => {
+            const anim = tween(node).to(duration, { scale: targetScale }).delay(delay);
+
+            if (loop) {
+                anim
+                    .to(duration, { scale: curScale })
+                    .union()
+                    .repeatForever()
+                    .start();
+            } else {
+                anim.call(() => {
+                    if (onFinish) onFinish();
+                }).start();
+            }
+        })
+        .start();
 }
 
+
 export type RotateAnimType = 'once' | 'loop' | 'swing';
 
 export interface RotateAnimOptions {

+ 2 - 1
Flowers/assets/module_extra/Customize/Customize_Event.ts

@@ -20,7 +20,8 @@ export interface operate_event_protocol {
 
     UpdateGuide(flag: boolean): void;//道具使用指引
 
-    LongTimeNoTouch(): void;//长时间无触摸
+    LongTimeNoTouch(type: number): void;//长时间无触摸
+    HadTouch(): void;//触摸
 }
 
 //定义UI更新事件

+ 0 - 25
Flowers/assets/module_extra/Table_Json/flower_color.json

@@ -58,30 +58,5 @@
     "id": "12",
     "colour_name": "绿色",
     "colour_id": "aecb4d"
-  },
-  {
-    "id": "",
-    "colour_name": "",
-    "colour_id": ""
-  },
-  {
-    "id": "",
-    "colour_name": "",
-    "colour_id": ""
-  },
-  {
-    "id": "",
-    "colour_name": "",
-    "colour_id": ""
-  },
-  {
-    "id": "",
-    "colour_name": "",
-    "colour_id": ""
-  },
-  {
-    "id": "",
-    "colour_name": "",
-    "colour_id": ""
   }
 ]

+ 1 - 1
Flowers/assets/module_extra/Table_Json/game.json

@@ -110,7 +110,7 @@
     {
         "id": "19",
         "name": "flower_draw",
-        "value": "500",
+        "value": "15",
         "text": "玩家每天可以抽花卡的次数"
     },
     {

+ 6 - 8
Flowers/assets/module_game/game/flower/Flower.ts

@@ -27,7 +27,7 @@ export class Flower extends Component {
 
     private flower_info: flower_info = null;
 
-    public canTouch: boolean = true;
+    public canTouch: boolean = false;
 
     get_Flower_Info() {
         return this.flower_info;
@@ -39,12 +39,6 @@ export class Flower extends Component {
 
     onLoad() {
         this.Flower_Sprite = this.node.getComponentInChildren(Sprite);
-
-        this.node.on(Node.EventType.TOUCH_START, this.touch_start, this);
-        this.node.on(Node.EventType.TOUCH_MOVE, this.touch_move, this);
-        this.node.on(Node.EventType.TOUCH_END, this.touch_end, this);
-        this.node.on(Node.EventType.TOUCH_CANCEL, this.touch_end, this);
-
         this.node.setScale(1, 1, 1);
     }
 
@@ -86,6 +80,10 @@ export class Flower extends Component {
             .to(0.5, { color: new Color(255, 255, 255, 255) }).call(() => {
                 this.canTouch = true;
                 this.originalParent = this.node?.parent?.parent?.getChildByName("Flowers");
+                this.node.on(Node.EventType.TOUCH_START, this.touch_start, this);
+                this.node.on(Node.EventType.TOUCH_MOVE, this.touch_move, this);
+                this.node.on(Node.EventType.TOUCH_END, this.touch_end, this);
+                this.node.on(Node.EventType.TOUCH_CANCEL, this.touch_end, this);
             }).start();
         // let color = new Color(255, 255, 255, 255);
         // this.Flower_Sprite.color = color;
@@ -164,7 +162,7 @@ export class Flower extends Component {
             let oldPos = this.node.getWorldPosition();
             //计算最终的位置
             let target = this.getEnteredTarget(GameCtl.getInstance().create_Pots.Pots);
-            if (target) {
+            if (target && this.originalParent) {
                 //将原数据抹除
                 let oldParent = this.originalParent;
                 let index = this.originalParent.parent.getComponent(Flowers_Show).F_Info.delete_Front_Flower(this.flower_info);

+ 7 - 3
Flowers/assets/module_game/game/flower/Flowers_Show.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Director, director, instantiate, Label, Node, NodeEventType, ParticleSystem2D, Prefab, sp, Sprite, SpriteFrame, tween, UIOpacity } from 'cc';
+import { _decorator, Component, Director, director, instantiate, Label, Node, NodeEventType, ParticleSystem2D, Prefab, sp, Sprite, SpriteFrame, tween, UIOpacity, Vec3 } from 'cc';
 import { Flowers_Info } from './Flowers_Info';
 
 import { Flower } from './Flower';
@@ -10,6 +10,7 @@ import { hexToColor } from '../../../module_extra/Customize/Customize_Util';
 import { Table_Flower_Color } from '../../../module_extra/Table_Ts/Table_Flower_Color';
 import { Table_Flowers } from '../../../module_extra/Table_Ts/Table_Flowers';
 import { play_Sound, resume_bgm, SoundName } from '../../../module_extra/Customize/Customize_Sound';
+import { scale_anim } from 'db://assets/module_extra/Customize/Customize_Ani';
 
 const { ccclass, property } = _decorator;
 
@@ -169,7 +170,7 @@ export class Flowers_Show extends Component {
         if (count >= this.unlock_require && this.Type == 6) {
             console.log("解锁");
             if (this.Lock_Node) {
-                this.Lock_Node.getComponentInChildren(Label).string = (this.unlock_require - count).toString();
+                this.Lock_Node.getChildByName('ch_yd').getComponentInChildren(Label).string = (this.unlock_require - count).toString();
                 //播放销毁动画
                 this.playdestroyAnimation();
                 Root.getInstance().operate_event.off(Root.getInstance().operate_event.key.UpdateEliminateCount, this.judgeUnLock, this);
@@ -178,7 +179,10 @@ export class Flowers_Show extends Component {
         } else if (this.Type == 6) {
             //破冰
             if (this.Lock_Node) {
-                this.Lock_Node.getComponentInChildren(Label).string = (this.unlock_require - count).toString();
+                this.Lock_Node.getChildByName('ch_yd').getComponentInChildren(Label).string = (this.unlock_require - count).toString();
+                scale_anim(this.Lock_Node.getChildByName('ch_yd'), 0.1, new Vec3(1, 1, 1), new Vec3(1.2, 1.2, 1), 0.1, () => {
+                    scale_anim(this.Lock_Node.getChildByName('ch_yd'), 0.1, new Vec3(1.2, 1.2, 1), new Vec3(1, 1, 1));
+                })
             }
 
         }

+ 59 - 28
Flowers/assets/module_game/game/process/GameCtl.ts

@@ -137,14 +137,15 @@ export class GameCtl extends Component {
 
     //初始化并刷新界面显示
     initGame() {
+        chsdk.reportEvent('enter', { lv: Root.getInstance().player.get_max_floor() + 1 });
         this.time_ice_valid = true;
-        for (let i = 0; i < 10; i++) {
-            Root.getInstance().player.update_Task_Percent(4);
-            Root.getInstance().player.update_bg_percent(1);
-            Root.getInstance().player.update_box_percent('level_award_box');
-            Root.getInstance().player.update_box_percent('flower_award_box');
-            Root.getInstance().player.set_bank_gold(Root.getInstance().player.get_bank_gold() + Root.getInstance().getGameConfigByName('level_gold_collect').Value);
-        }
+        // for (let i = 0; i < 10; i++) {
+        //     Root.getInstance().player.update_Task_Percent(4);
+        //     Root.getInstance().player.update_bg_percent(1);
+        //     Root.getInstance().player.update_box_percent('level_award_box');
+        //     Root.getInstance().player.update_box_percent('flower_award_box');
+        //     Root.getInstance().player.set_bank_gold(Root.getInstance().player.get_bank_gold() + Root.getInstance().getGameConfigByName('level_gold_collect').Value);
+        // }
         if (Root.getInstance().player.get_max_floor() > 0) {
             this.Mask.parent.active = false;
         } else {
@@ -214,7 +215,12 @@ export class GameCtl extends Component {
 
     //暂停游戏
     pauseGame() {
+        Root.getInstance().Job.PauseTimeTask(this.tid);
+    }
 
+    //继续游戏
+    resumeGame() {
+        Root.getInstance().Job.ResumeTimeTask(this.tid);
     }
 
     //结束游戏,flag:是否需要弹出弹窗,res:胜利还是失败
@@ -231,6 +237,7 @@ export class GameCtl extends Component {
         //判断输赢
         if (res == true) {
             console.log("win2");
+            chsdk.reportEvent('pass', { lv: Root.getInstance().player.get_max_floor() + 1 });
             Root.getInstance().player.set_max_floor(Root.getInstance().player.get_max_floor() + 1);
             Root.getInstance().player.set_bank_gold(Root.getInstance().player.get_bank_gold() + Root.getInstance().getGameConfigByName('level_gold_collect').Value);
             Root.getInstance().player.update_bg_percent(1);
@@ -293,15 +300,18 @@ export class GameCtl extends Component {
             this.tid = 0;
             this.time_ice_valid = true;
             this.stopTip();
+            Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.HadTouch);
         }
     }
 
     updateCount_Down() {
-        if (this.longTime_NoTouch == 20) {
+        if (this.longTime_NoTouch == 10) {
+            Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.HadTouch);
             this.tip_Flower_Nodes = this.showTip();
             this.longTime_NoTouch = 0;
         } else if (this.longTime_NoTouch == 0) {
             this.stopTip();
+            Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.HadTouch);
         }
         //刷新UI显示
         this.gametime--;
@@ -316,16 +326,35 @@ export class GameCtl extends Component {
         //花朵提示,遍历花盆表层
         let res = this.querySingleFlowerGroups();
         if (res) {
-            let Flower_Map = res.Flower_Map;
-            let nodes = Flower_Map.get(res.type);
-            for (let i = 0; i < nodes.length; i++) {
-                //果冻拉伸动画
-                jelly_anim_ext(nodes[i], { delay: 2.0 });
+            let rand = ch.util.getRandomInt(0, 2);
+            console.log("随机显示提示:", rand);
+            if (rand) {
+                //随机
+                let Flower_Map = res.Flower_Map;
+                let nodes = Flower_Map.get(res.type);
+                for (let i = 0; i < nodes.length; i++) {
+                    //果冻拉伸动画
+                    jelly_anim_ext(nodes[i], { delay: 2.0 });
+                }
+                return nodes;
+            } else {
+                this.stopTip();
+                Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.LongTimeNoTouch, 4);
+                return [];
             }
-            return nodes;
+
         }
         //无表面花朵可消除,提示相应道具(消除|刷新),时间不够提示道具(沙漏) 需考虑解锁状态
         else {
+            this.stopTip();
+            if (this.gametime < 20) {
+                Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.LongTimeNoTouch, 5);
+            }
+            else if (this.queryDoubleFlowerGroups()) {
+                Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.LongTimeNoTouch, 3);
+            } else {
+                Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.LongTimeNoTouch, 6);
+            }
             return [];
         }
     }
@@ -400,18 +429,20 @@ export class GameCtl extends Component {
         let type = 0;
         for (let i = 0; i < pots.length; i++) {
             let pot = pots[i];
-            let nodes = pot.getComponent(Flowers_Show).Front_Nodes;
-            for (let j = 0; j < nodes.length; j++) {
-                let node = nodes[j];
-                if (node == null) {
-                    continue;
-                }
-                if (node?.isValid) {
-                    type = node?.getComponent(Flower)?.get_Flower_Info().type;
-                    if (type) {
-                        (Flower_Map.get(type) ?? Flower_Map.set(type, []).get(type))!.push(node);
-                        if (Flower_Map.get(type).length == 3) {
-                            return { Flower_Map, type };
+            if (pot.getComponent(Flowers_Show).Type == 1 || pot.getComponent(Flowers_Show).Type == 2) {
+                let nodes = pot.getComponent(Flowers_Show).Front_Nodes;
+                for (let j = 0; j < nodes.length; j++) {
+                    let node = nodes[j];
+                    if (node == null) {
+                        continue;
+                    }
+                    if (node?.isValid) {
+                        type = node?.getComponent(Flower)?.get_Flower_Info().type;
+                        if (type) {
+                            (Flower_Map.get(type) ?? Flower_Map.set(type, []).get(type))!.push(node);
+                            if (Flower_Map.get(type).length == 3) {
+                                return { Flower_Map, type };
+                            }
                         }
                     }
                 }
@@ -649,9 +680,9 @@ export class GameCtl extends Component {
     freeze() {
         play_Sound(SoundName.freeze);
         this.time_ice_valid = true;
-        Root.getInstance().Job.PauseTimeTask(this.tid);
+        this.pauseGame();
         this._resumeTask = () => {
-            Root.getInstance().Job.ResumeTimeTask(this.tid);
+            this.resumeGame();
             this.time_ice_valid = false;
         };
         this.scheduleOnce(this._resumeTask, this.time_ice);

+ 3 - 2
Flowers/assets/module_game/game/process/Root.ts

@@ -200,8 +200,6 @@ export class Root extends Component {
         //初始化红点模块
         await this.initRedPointTree();
         this.game_Config = Table_Game.getList();
-        this.player_hp_max = this.getGameConfigByName('player_hp_max').Value;
-        this.player_hp_add = this.getGameConfigByName('player_hp_add').Value;
 
         // 初始化玩家数据
         this.player = PlayerData.getInstance(ch.sdk.get_gid(), ch.sdk.get_uid().toString());
@@ -209,6 +207,9 @@ export class Root extends Component {
         this.player.init_user_info();
         await this.player.load();
 
+        this.player_hp_max = this.getGameConfigByName('player_hp_max').Value;
+        this.player_hp_add = this.getGameConfigByName('player_hp_add').Value;
+
         UIManager.getInstance().pushUI(UIName.HALL);
         this.Job.AddTimeTask(this.updateLuckyGiftTime.bind(this), 1, -1);
 

+ 103 - 102
Flowers/assets/module_game/prefab/FP.prefab

@@ -1803,9 +1803,6 @@
       },
       {
         "__id__": 107
-      },
-      {
-        "__id__": 113
       }
     ],
     "_active": true,
@@ -2537,18 +2534,22 @@
     "_parent": {
       "__id__": 76
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 108
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 114
       },
       {
-        "__id__": 110
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 118
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2580,116 +2581,30 @@
     "_id": ""
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 107
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 109
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 39,
-      "height": 39
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3bXodGJ+tOvZDFTVO23WNR"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 107
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 111
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "a72ba3cc-c1a9-4536-a72d-23b36d748035@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a7x3PncJNAD4qMkMrVQK2h"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "49ULWbJLxNkorqRe2vRiWj",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
     "__type__": "cc.Node",
     "_name": "Num",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 76
+      "__id__": 107
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 114
+        "__id__": 109
       },
       {
-        "__id__": 116
+        "__id__": 111
       }
     ],
     "_prefab": {
-      "__id__": 118
+      "__id__": 113
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 45.315000000000055,
+      "y": 3.6860000000000355,
       "z": 0
     },
     "_lrot": {
@@ -2721,11 +2636,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 113
+      "__id__": 108
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 110
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2749,11 +2664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 113
+      "__id__": 108
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 112
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2830,6 +2745,92 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
+      "__id__": 107
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 115
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 39,
+      "height": 39
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3bXodGJ+tOvZDFTVO23WNR"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 107
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 117
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "a72ba3cc-c1a9-4536-a72d-23b36d748035@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a7x3PncJNAD4qMkMrVQK2h"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "49ULWbJLxNkorqRe2vRiWj",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
       "__id__": 76
     },
     "_enabled": true,

+ 28 - 0
Flowers/assets/module_game/ui/UI/UI_Item.ts

@@ -5,6 +5,7 @@ import { play_Sound, SoundName } from '../../../module_extra/Customize/Customize
 import { GameCtl } from '../../game/process/GameCtl';
 import { UIManager } from './UIManager';
 import { UIName } from './UI_ClassManager';
+import { scale_anim } from 'db://assets/module_extra/Customize/Customize_Ani';
 
 
 const { ccclass, property } = _decorator;
@@ -13,6 +14,8 @@ export class UI_Item extends Component {
     @property
     type: number = 0;
     @property(Sprite)
+    Light: Sprite;
+    @property(Sprite)
     Ad: Sprite;
     @property(Sprite)
     Cd_Bar: Sprite;
@@ -41,10 +44,15 @@ export class UI_Item extends Component {
         this.UpdateProps();
         Root.getInstance().player.event.on(Root.getInstance().player.event.key.item_count, this.show, this);
         Root.getInstance().ui_update_event.on(Root.getInstance().ui_update_event.key.UpdatePropsShow, this.UpdateProps, this);
+        Root.getInstance().operate_event.on(Root.getInstance().operate_event.key.LongTimeNoTouch, this.showTip, this);
+        Root.getInstance().operate_event.on(Root.getInstance().operate_event.key.HadTouch, this.hideTip, this);
+        this.Light.node.active = false;
     }
     protected onDestroy(): void {
         Root.getInstance().player.event.off(Root.getInstance().player.event.key.item_count, this.show, this);
         Root.getInstance().ui_update_event.off(Root.getInstance().ui_update_event.key.UpdatePropsShow);
+        Root.getInstance().operate_event.off(Root.getInstance().operate_event.key.LongTimeNoTouch, this.showTip, this);
+        Root.getInstance().operate_event.off(Root.getInstance().operate_event.key.HadTouch, this.hideTip, this);
     }
     show(type: number, count: number): void {
         if (type != this.type) return;
@@ -95,6 +103,7 @@ export class UI_Item extends Component {
                         Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.StartCountDown);
                         this.total_cd = 0.5;
                         this.cur_cd = 0.5;
+                        GameCtl.getInstance().longTime_NoTouch = 0;
                     }
                 }
                 if (this.type == 4) {
@@ -107,6 +116,7 @@ export class UI_Item extends Component {
                         Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.StartCountDown);
                         this.total_cd = 0.5;
                         this.cur_cd = 0.5;
+                        GameCtl.getInstance().longTime_NoTouch = 0;
                     }
                 }
                 if (this.type == 5) {
@@ -128,6 +138,7 @@ export class UI_Item extends Component {
                         Root.getInstance().operate_event.emit(Root.getInstance().operate_event.key.StartCountDown);
                         this.total_cd = 0.5;
                         this.cur_cd = 0.5;
+                        GameCtl.getInstance().longTime_NoTouch = 0;
                     }
                 }
                 Root.getInstance().player.update_bg_percent(2);
@@ -142,6 +153,23 @@ export class UI_Item extends Component {
         }
     }
 
+    showTip(type: number) {
+        if (type == this.type) {
+            this.Light.node.active = true;
+            scale_anim(this.Light.node, 0.5, new Vec3(1.25, 1.25, 1), new Vec3(1.5, 1.5, 1), 0, null, true);
+        } else {
+            Tween.stopAllByTarget(this.Light.node);
+            this.Light.node.setScale(new Vec3(1.25, 1.25, 1));
+            this.Light.node.active = false;
+        }
+    }
+
+    hideTip() {
+        Tween.stopAllByTarget(this.Light.node);
+        this.Light.node.setScale(new Vec3(1.25, 1.25, 1));
+        this.Light.node.active = false;
+    }
+
     UpdateProps() {
         if (this.node) {
             if (Root.getInstance().player.get_max_floor() >= this.require - 1 && this.require != 0) {

+ 3 - 3
Flowers/assets/module_game/ui/UI_Game/Game.prefab

@@ -602,8 +602,6 @@
       "__id__": 0
     },
     "fileId": "1bo0gb0kJKK6up0TaNqZH2",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -689,7 +687,7 @@
         "__id__": 23
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 29
@@ -1710,6 +1708,8 @@
       "__id__": 0
     },
     "fileId": "bd2WOxLYtLAI6VbZp5OtPZ",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

File diff suppressed because it is too large
+ 396 - 115
Flowers/assets/module_game/ui/UI_Main/Main.prefab


+ 31 - 10
Flowers/assets/module_game/ui/UI_PiggyBank/UI_PiggyBank.ts

@@ -95,17 +95,38 @@ export class UI_PiggyBank extends ui_base {
         }
     }
 
-    private initFly(node: Node, Target: Node) {
-        let newNode = instantiate(node);
-        newNode.parent = Target.parent;
-        newNode.worldPosition = node.getWorldPosition();
-        const startPos = newNode.getPosition();
-        const targetPos = Target.getPosition();
-        const tweenObj = { t: 0, scale: 1 };
-
-        this.flyToPos(tweenObj, newNode, startPos, targetPos, 0.8, 1.2, 0, 0.44, 0.55, 1.15);
-    }
+    private initFly(node: Node, Target: Node, count: number = 10) {
+        const parent = Target.parent;
+        const worldTargetPos = Target.getWorldPosition();
+
+        for (let i = 0; i < count; i++) {
+            // 克隆节点
+            const newNode = instantiate(node);
+            newNode.parent = parent;
+
+            // 初始位置:大致屏幕中心 + 随机偏移(例如 -80 ~ +80)
+            const center = new Vec3(0, 0, 0);
+            node.getWorldPosition(center);
+            const offsetX = (Math.random() - 0.5) * 160; // [-80, 80]
+            const offsetY = (Math.random() - 0.5) * 160;
+            const spawnPos = center.clone().add(new Vec3(offsetX, offsetY, 0));
+            newNode.setWorldPosition(spawnPos);
+
+            // 缩放、透明等初始视觉设置(可选)
+            newNode.setScale(0.6, 0.6, 0.6);
+
+            // 飞行动画参数
+            const startPos = newNode.getPosition();  // 本地坐标
+            const targetPos = Target.getPosition();
 
+            const delay = Math.random() * 0.3; // 每个飞行稍有错峰延迟
+
+            const tweenObj = { t: 0, scale: 1 };
+
+            // 启动飞行动画
+            this.flyToPos(tweenObj, newNode, startPos, targetPos, 0.8, 1.2, 0, 0.44, 0.55, 0.8 + delay);
+        }
+    }
     private flyToPos(tweenObj: any, node: Node, startPos: Vec3, targetPos: Vec3, time: number, scale: number, px1: number, py1: number, px2: number, py2: number) {
         targetScaleBezier(tweenObj, node, startPos, targetPos, time, scale, px1, py1, px2, py2, 0.3, this.updateHallUp.bind(this), this.cancelFly.bind(this, node));
     }

+ 4 - 0
Flowers/assets/module_game/ui/UI_Prop/UI_Prop.ts

@@ -9,6 +9,7 @@ import { UIManager } from '../UI/UIManager';
 import { Root } from '../../game/process/Root';
 import { ch } from '../../../ch/ch';
 import { Table_Store } from '../../../module_extra/Table_Ts/Table_Store';
+import { GameCtl } from '../../game/process/GameCtl';
 const { ccclass, property } = _decorator;
 
 @ccclass('UI_Prop')
@@ -44,6 +45,7 @@ export class UI_Prop extends ui_base {
 
     public showPanel() {
         super.showPanel();
+        GameCtl.getInstance().pauseGame();
         play_Sound(SoundName.pop_up);
         this.replace();
         const layout = this.getLayout<Layout_Prop>();
@@ -69,6 +71,7 @@ export class UI_Prop extends ui_base {
 
     private clickClose() {
         play_Sound(SoundName.button);
+        GameCtl.getInstance().resumeGame();
         UIManager.getInstance().PopNotify();
         UIManager.getInstance().PopUI();
     }
@@ -91,6 +94,7 @@ export class UI_Prop extends ui_base {
         if (ret) {
             Root.getInstance().player.add_item(Root.getInstance().prop_Type, 1);
             Root.getInstance().player.update_Task_Percent(2);
+            GameCtl.getInstance().resumeGame();
             UIManager.getInstance().PopUI();
             resume_bgm();
         }

+ 6 - 3
Flowers/assets/module_game/ui/UI_Settings/UI_Settings.ts

@@ -40,6 +40,7 @@ export class UI_Settings extends ui_base {
             layout.Return_Btn.node.active = true;
             layout.Restart_Btn.node.active = true;
             layout.Question_Btn.node.active = false;
+            GameCtl.getInstance().pauseGame();
             console.log("底部是main");
         }
 
@@ -61,7 +62,7 @@ export class UI_Settings extends ui_base {
         layout.Sound_Toggle.isChecked = ch.audio.switchEffect;
         layout.Vibrate_Toggle.isChecked = Root.getInstance().Vibrate;
 
-        toggleMoveTo(layout.Music_Toggle.node.getChildByName('Sprite'), this.offset[ch.audio.volumeMusic], 0);
+        toggleMoveTo(layout.Music_Toggle.node.getChildByName('Sprite'), this.offset[ch.audio.volumeMusic ? 1 : 0], 0);
         toggleMoveTo(layout.Sound_Toggle.node.getChildByName('Sprite'), this.offset[ch.audio.switchEffect ? 1 : 0], 0);
         toggleMoveTo(layout.Vibrate_Toggle.node.getChildByName('Sprite'), this.offset[Root.getInstance().Vibrate ? 1 : 0], 0);
 
@@ -84,6 +85,7 @@ export class UI_Settings extends ui_base {
     private clickClose() {
         play_Sound(SoundName.button);
         ch.sdk.destoryFeedbackButton();
+        GameCtl.getInstance().resumeGame();
         UIManager.getInstance().PopUI();
     }
 
@@ -98,13 +100,14 @@ export class UI_Settings extends ui_base {
     private clickRestart() {
         if (Root.getInstance().player.get_life() < 15) {
             UIManager.getInstance().PushNotify("体力不足");
-            UIManager.getInstance().pushUI(UIName.HALL_UP);
+            UIManager.getInstance().pushUI(UIName.HALL_UP, true);
             UIManager.getInstance().pushUI(UIName.LIFE, true);
             return;
         }
         Root.getInstance().costLife();
         // UIManager.getInstance().DestoryAllUI();
         // UIManager.getInstance().pushUI(UIName.Loading);
+        // chsdk.reportEvent('restart', { lv: Root.getInstance().player.get_max_floor() + 1 });
         GameCtl.getInstance().restartGame();
         UIManager.getInstance().PopUI();
     }
@@ -113,7 +116,7 @@ export class UI_Settings extends ui_base {
         const layout = this.getLayout<Layout_Settings>();
         play_Sound(SoundName.button);
         ch.audio.volumeMusic = layout.Music_Toggle.isChecked ? 1 : 0;
-        toggleMoveTo(layout.Music_Toggle.node.getChildByName('Sprite'), this.offset[ch.audio.volumeMusic], 0.1);
+        toggleMoveTo(layout.Music_Toggle.node.getChildByName('Sprite'), this.offset[ch.audio.volumeMusic ? 1 : 0], 0.1);
         ch.audio.save();
     }
 

+ 4 - 4
Flowers/assets/module_game/ui/UI_Store/Item.prefab

@@ -414,8 +414,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 76,
-      "height": 79
+      "width": 61,
+      "height": 61
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -451,7 +451,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "f0ce6ba2-73b5-430b-b333-304feceeac2b@f9941",
+      "__uuid__": "4ae69179-2950-4e0d-b19a-d9e808dee837@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1280,7 +1280,7 @@
     ],
     "Icon_SpriteFrame": [
       {
-        "__uuid__": "f0ce6ba2-73b5-430b-b333-304feceeac2b@f9941",
+        "__uuid__": "4ae69179-2950-4e0d-b19a-d9e808dee837@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {

+ 2 - 1
Flowers/assets/module_game/ui/UI_Store/Store_Item.ts

@@ -62,6 +62,7 @@ export class Store_Item extends Component {
             play_Sound(SoundName.shop_purchase);
             Root.getInstance().player.set_gold(Root.getInstance().player.get_gold() - parseInt(this.data.Gold_num));
             Root.getInstance().ui_update_event.emit(Root.getInstance().ui_update_event.key.UpdateGold);
+            UIManager.getInstance().pushUI(UIName.Congratulation, true);
             Root.getInstance().player.add_item(this.type, 1);
         } else {
             UIManager.getInstance().PushNotify("金币不足");
@@ -116,7 +117,7 @@ export class Store_Item extends Component {
             const tweenObj = { t: 0, scale: 1 };
 
             // 启动飞行动画
-            this.flyToPos(tweenObj, newNode, startPos, targetPos, 0.8, 1.0, 0, 0.44, 0.55, 1.15 + delay);
+            this.flyToPos(tweenObj, newNode, startPos, targetPos, 0.8, 1.1, 0, 0.44, 0.55, 1.15 + delay);
         }
     }
 

+ 2 - 1
Flowers/assets/module_game/ui/UI_TimeOver/UI_TimeOver.ts

@@ -41,8 +41,9 @@ export class UI_TimeOver extends ui_base {
         this.offButtonEvent(layout.Purchase_Btn, this.clickPurchase, this);
         this.offButtonEvent(layout.Ad_Btn, this.clickAd, this);
         // Root.getInstance().costLife();
+        Root.getInstance().Mode = 0;
         UIManager.getInstance().DestoryAllUI();
-        UIManager.getInstance().pushUI(UIName.HALL);
+        UIManager.getInstance().pushUI(UIName.Loading);
     }
 
     private clickPurchase() {

BIN
Flowers/assets/res/ui/main/game_bg014.png


+ 134 - 0
Flowers/assets/res/ui/main/game_bg014.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f@6c48a",
+      "displayName": "game_bg014",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f@f9941",
+      "displayName": "game_bg014",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 110,
+        "height": 110,
+        "rawWidth": 110,
+        "rawHeight": 110,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -55,
+            -55,
+            0,
+            55,
+            -55,
+            0,
+            -55,
+            55,
+            0,
+            55,
+            55,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            110,
+            110,
+            110,
+            0,
+            0,
+            110,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -55,
+            -55,
+            0
+          ],
+          "maxPos": [
+            55,
+            55,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "dfbe9417-9925-449c-bcc3-2a99a72cbe9f@6c48a"
+  }
+}

+ 3 - 1
Flowers/assets/start/Start.ts

@@ -11,9 +11,11 @@ const _preloadBundles = [ModuleDef.EXTRA, ModuleDef.BASIC, ModuleDef.GAME];
 //预加载资源
 const _preloadRes = [
     // { bundle: ModuleDef.GAME, url: 'prefab/FP' },
+    { bundle: ModuleDef.BASIC, url: 'UI_Notify/UI_Notify' },
     { bundle: ModuleDef.GAME, url: 'ui/UI_Hall/Hall' },
     { bundle: ModuleDef.GAME, url: 'ui/UI_Hall_Up/Hall_Up' },
     { bundle: ModuleDef.GAME, url: 'ui/UI_HomePage/HomePage' },
+    { bundle: ModuleDef.GAME, url: 'ui/UI_Game/Game' },
     // { bundle: ModuleDef.GAME, url: 'ui/UI_Task/Task' },
     // { bundle: ModuleDef.GAME, url: 'ui/UI_Rank/Rank' },
     // { bundle: ModuleDef.GAME, url: 'ui/UI_Store/Store' },
@@ -73,7 +75,7 @@ export class Start extends ch_start {
         //     this.preloadBundle(0);
         // }
         await this.try_init(3);
-        this.preloadScene();
+        // this.preloadScene();
         this.preloadBundle(0);
     }
     onResLoaded() {

+ 4 - 4
Flowers/assets/start/start.scene

@@ -1297,8 +1297,8 @@
   },
   {
     "__type__": "PackConf",
-    "gname": "插花",
-    "gid": "chahua",
+    "gname": "这个好解压_插花",
+    "gid": "zghjy_ch",
     "report": 1,
     "log": 5,
     "tt_conf": {
@@ -1308,7 +1308,7 @@
       "__id__": 37
     },
     "is_local": false,
-    "server": 2,
+    "server": 3,
     "serverIP": "http://192.168.1.120:8787/v1",
     "serverIP1": "",
     "serverIP2": ""
@@ -1322,7 +1322,7 @@
   },
   {
     "__type__": "PfConf",
-    "r_adUnitId": "",
+    "r_adUnitId": "adunit-764dbec7d6f60fcd",
     "i_adUnitId": "",
     "banners": [],
     "subscriptionIds": []

+ 0 - 61
Flowers/build/web-desktop/application.4aa9a.js

@@ -1,61 +0,0 @@
-System.register([], function (_export, _context) {
-  "use strict";
-
-  var cc, Application;
-  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-  return {
-    setters: [],
-    execute: function () {
-      _export("Application", Application = /*#__PURE__*/function () {
-        function Application() {
-          _classCallCheck(this, Application);
-          this.settingsPath = 'src/settings.9b30f.json';
-          this.showFPS = false;
-        }
-        _createClass(Application, [{
-          key: "init",
-          value: function init(engine) {
-            cc = engine;
-            cc.game.onPostBaseInitDelegate.add(this.onPostInitBase.bind(this));
-            cc.game.onPostSubsystemInitDelegate.add(this.onPostSystemInit.bind(this));
-          }
-        }, {
-          key: "onPostInitBase",
-          value: function onPostInitBase() {
-            // cc.settings.overrideSettings('assets', 'server', '');
-            // do custom logic
-          }
-        }, {
-          key: "onPostSystemInit",
-          value: function onPostSystemInit() {
-            // do custom logic
-          }
-        }, {
-          key: "start",
-          value: function start() {
-            return cc.game.init({
-              debugMode: false ? cc.DebugMode.INFO : cc.DebugMode.ERROR,
-              settingsPath: this.settingsPath,
-              overrideSettings: {
-                // assets: {
-                //      preloadBundles: [{ bundle: 'main', version: 'xxx' }],
-                // }
-                profiling: {
-                  showFPS: this.showFPS
-                }
-              }
-            }).then(function () {
-              return cc.game.run();
-            });
-          }
-        }]);
-        return Application;
-      }());
-    }
-  };
-});

+ 61 - 0
Flowers/build/web-desktop/application.7b4ce.js

@@ -0,0 +1,61 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var cc, Application;
+  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+  return {
+    setters: [],
+    execute: function () {
+      _export("Application", Application = /*#__PURE__*/function () {
+        function Application() {
+          _classCallCheck(this, Application);
+          this.settingsPath = 'src/settings.88d3f.json';
+          this.showFPS = false;
+        }
+        _createClass(Application, [{
+          key: "init",
+          value: function init(engine) {
+            cc = engine;
+            cc.game.onPostBaseInitDelegate.add(this.onPostInitBase.bind(this));
+            cc.game.onPostSubsystemInitDelegate.add(this.onPostSystemInit.bind(this));
+          }
+        }, {
+          key: "onPostInitBase",
+          value: function onPostInitBase() {
+            // cc.settings.overrideSettings('assets', 'server', '');
+            // do custom logic
+          }
+        }, {
+          key: "onPostSystemInit",
+          value: function onPostSystemInit() {
+            // do custom logic
+          }
+        }, {
+          key: "start",
+          value: function start() {
+            return cc.game.init({
+              debugMode: false ? cc.DebugMode.INFO : cc.DebugMode.ERROR,
+              settingsPath: this.settingsPath,
+              overrideSettings: {
+                // assets: {
+                //      preloadBundles: [{ bundle: 'main', version: 'xxx' }],
+                // }
+                profiling: {
+                  showFPS: this.showFPS
+                }
+              }
+            }).then(function () {
+              return cc.game.run();
+            });
+          }
+        }]);
+        return Application;
+      }());
+    }
+  };
+});

+ 0 - 1
Flowers/build/web-desktop/assets/main/config.1e45c.json

@@ -1 +0,0 @@
-{"importBase":"import","nativeBase":"native","name":"main","deps":[],"uuids":["ca4/Mx6wdIf4P18MSUVn7V","1fr8P9lPZLObNL/Mb5BRA/","266NFDZo5AWIyD3aB6KZEk","47B/FWublGCo8Ramgi4OUD","88CDKMs0JOa5j7QU6hCTS7","baIUdvKGZPgZxNbjWTFuRI","f705zmn1NOCYaMie20bBOP","fc/y3+gq9H9rLRHTZ2OXb7","fdjsU2o1RKF5x0TziDw3jI","084e55ec7","0bfd41034","1fr8P9lPZLObNL/Mb5BRA/@6c48a","1fr8P9lPZLObNL/Mb5BRA/@f9941","24IlcItihCd6gzMgMxp05y","266NFDZo5AWIyD3aB6KZEk@6c48a","266NFDZo5AWIyD3aB6KZEk@f9941","47B/FWublGCo8Ramgi4OUD@6c48a","47B/FWublGCo8Ramgi4OUD@f9941","88CDKMs0JOa5j7QU6hCTS7@6c48a","88CDKMs0JOa5j7QU6hCTS7@f9941","f705zmn1NOCYaMie20bBOP@6c48a","f705zmn1NOCYaMie20bBOP@f9941","fc/y3+gq9H9rLRHTZ2OXb7@6c48a","fc/y3+gq9H9rLRHTZ2OXb7@f9941"],"paths":{"0":["db:/assets/start/start",0,1],"5":["db:/internal/physics/default-physics-material",2,1],"8":["db:/internal/default_renderpipeline/builtin-forward",1,1]},"scenes":{"db://assets/start/start.scene":0},"packs":{"084e55ec7":[11,14,16,18,20,22],"0bfd41034":[12,13,15,17,19,0,21,23]},"versions":{"import":[9,"638b6",10,"72b1e",1,"a2533",2,"a2533",3,"a2533",4,"a2533",5,"8bce7",6,"a2533",7,"a2533",8,"731f4"],"native":[1,"99178",2,"4c76c",3,"1a300",4,"d2181",6,"ce2ed",7,"e812d"]},"redirect":[],"debug":false,"extensionMap":{},"hasPreloadScript":true,"dependencyRelationships":{},"types":["cc.SceneAsset","cc.RenderPipeline","cc.PhysicsMaterial"]}

+ 1 - 0
Flowers/build/web-desktop/assets/main/config.4c13f.json

@@ -0,0 +1 @@
+{"importBase":"import","nativeBase":"native","name":"main","deps":[],"uuids":["ca4/Mx6wdIf4P18MSUVn7V","1fr8P9lPZLObNL/Mb5BRA/","266NFDZo5AWIyD3aB6KZEk","47B/FWublGCo8Ramgi4OUD","88CDKMs0JOa5j7QU6hCTS7","baIUdvKGZPgZxNbjWTFuRI","f705zmn1NOCYaMie20bBOP","fc/y3+gq9H9rLRHTZ2OXb7","fdjsU2o1RKF5x0TziDw3jI","084e55ec7","0bfd41034","1fr8P9lPZLObNL/Mb5BRA/@6c48a","1fr8P9lPZLObNL/Mb5BRA/@f9941","24IlcItihCd6gzMgMxp05y","266NFDZo5AWIyD3aB6KZEk@6c48a","266NFDZo5AWIyD3aB6KZEk@f9941","47B/FWublGCo8Ramgi4OUD@6c48a","47B/FWublGCo8Ramgi4OUD@f9941","88CDKMs0JOa5j7QU6hCTS7@6c48a","88CDKMs0JOa5j7QU6hCTS7@f9941","f705zmn1NOCYaMie20bBOP@6c48a","f705zmn1NOCYaMie20bBOP@f9941","fc/y3+gq9H9rLRHTZ2OXb7@6c48a","fc/y3+gq9H9rLRHTZ2OXb7@f9941"],"paths":{"0":["db:/assets/start/start",0,1],"5":["db:/internal/physics/default-physics-material",2,1],"8":["db:/internal/default_renderpipeline/builtin-forward",1,1]},"scenes":{"db://assets/start/start.scene":0},"packs":{"084e55ec7":[11,14,16,18,20,22],"0bfd41034":[12,13,15,17,19,0,21,23]},"versions":{"import":[9,"638b6",10,"bac6a",1,"a2533",2,"a2533",3,"a2533",4,"a2533",5,"8bce7",6,"a2533",7,"a2533",8,"731f4"],"native":[1,"18521",2,"8c7d4",3,"6443b",4,"83778",6,"ce2ed",7,"e812d"]},"redirect":[],"debug":false,"extensionMap":{},"hasPreloadScript":true,"dependencyRelationships":{},"types":["cc.SceneAsset","cc.RenderPipeline","cc.PhysicsMaterial"]}

File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/main/import/0b/0bfd41034.72b1e.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/main/import/0b/0bfd41034.bac6a.json


File diff suppressed because it is too large
+ 0 - 2
Flowers/build/web-desktop/assets/main/index.1e45c.js


File diff suppressed because it is too large
+ 2 - 0
Flowers/build/web-desktop/assets/main/index.4c13f.js


BIN
Flowers/build/web-desktop/assets/main/native/1f/1fafc3fd-94f6-4b39-b34b-fcc6f905103f.18521.png


BIN
Flowers/build/web-desktop/assets/main/native/1f/1fafc3fd-94f6-4b39-b34b-fcc6f905103f.99178.png


BIN
Flowers/build/web-desktop/assets/main/native/26/26e8d143-668e-4058-8c83-dda07a299124.4c76c.png


BIN
Flowers/build/web-desktop/assets/main/native/26/26e8d143-668e-4058-8c83-dda07a299124.8c7d4.png


BIN
Flowers/build/web-desktop/assets/main/native/47/4707f156-b9b9-460a-8f11-6a6822e0e503.1a300.png


BIN
Flowers/build/web-desktop/assets/main/native/47/4707f156-b9b9-460a-8f11-6a6822e0e503.6443b.png


BIN
Flowers/build/web-desktop/assets/main/native/88/8808328c-b342-4e6b-98fb-414ea10934bb.83778.png


BIN
Flowers/build/web-desktop/assets/main/native/88/8808328c-b342-4e6b-98fb-414ea10934bb.d2181.png


+ 0 - 0
Flowers/build/web-desktop/assets/module_basic/config.2bce5.json → Flowers/build/web-desktop/assets/module_basic/config.a34b4.json


File diff suppressed because it is too large
+ 0 - 10
Flowers/build/web-desktop/assets/module_basic/index.2bce5.js


File diff suppressed because it is too large
+ 10 - 0
Flowers/build/web-desktop/assets/module_basic/index.a34b4.js


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/config.0b6d0.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/config.f7d75.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/import/5d/5d1e4515-6c6b-43b0-b110-986566793c45.19033.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/import/5d/5d1e4515-6c6b-43b0-b110-986566793c45.bb63f.json


+ 1 - 0
Flowers/build/web-desktop/assets/module_extra/import/d5/d59a69fd-7878-4fbd-9fe8-aca182d5feb0.77ce1.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"flowerSort",[{"id":"1","name":"玫瑰","have_flowers":"3#4#17#20#49#63#71#78#79#83#138#151#155","award":"3:2:3:10000"},{"id":"2","name":"百合","have_flowers":"19#32#56#162#163#164#193#194#195#144","award":"1:1:200:10000"},{"id":"3","name":"郁金香","have_flowers":"1#130#140#160#161#200#201#202#203#204#205","award":"4:2:3:10000"},{"id":"4","name":"海棠花","have_flowers":"10#36#42#44#47#74#75#109#110#113#114#115#123#124","award":"1:1:300:10000"},{"id":"5","name":"菊花","have_flowers":"9#13#21#28#29#41#43#67#73#89#91#92#93#94#95#102#103#112#186","award":"5:2:3:10000"},{"id":"6","name":"康乃馨","have_flowers":"2#7#16#18#38#40#52#54#55#80#81#82#90#107#108#118#119#166#173","award":"1:1:300:10000"},{"id":"7","name":"荷花","have_flowers":"34#148#149#153#176#196#197#198#199#48","award":"6:2:2:10000"},{"id":"8","name":"牵牛花","have_flowers":"11#26#37#39#57#65#66#76#86#87#104#105#106#136#137#146#147#165","award":"1:1:200:10000"},{"id":"9","name":"梧桐花","have_flowers":"5#14#25#27#33#59#60#61#72#88#128#133#134#135#172#174","award":"3:2:3:10000"},{"id":"10","name":"红掌","have_flowers":"12#15#35#45#69#70#99#100#101#145#180","award":"1:1:300:10000"},{"id":"11","name":"蝴蝶兰","have_flowers":"22#23#24#31#46#50#51#64#84#98#116#117#120#121#122#168#191","award":"4:2:3:10000"},{"id":"12","name":"静谧公主","have_flowers":"6#30#58#77#85#96#125#126#127#152#171#177#178#179#182#184#97","award":"1:1:200:10000"},{"id":"13","name":"雪莲花","have_flowers":"68#129#131#132#139#141#150#154#169#188#53","award":"5:2:3:10000"},{"id":"14","name":"薰衣草","have_flowers":"156#157#158#159#167#170#175#183#187#189#190#192","award":"1:1:300:10000"}]]],0,0,[],[],[]]

+ 0 - 1
Flowers/build/web-desktop/assets/module_extra/import/d5/d59a69fd-7878-4fbd-9fe8-aca182d5feb0.c68c3.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"flowerSort",[{"id":"1","name":"玫瑰","have_flowers":"3#4#17#20#49#63#71#78#79#83#138#151#155","award":"1:1:100:10000"},{"id":"2","name":"百合","have_flowers":"19#32#56#162#163#164#193#194#195#144","award":"1:1:100:10000"},{"id":"3","name":"郁金香","have_flowers":"1#130#140#160#161#200#201#202#203#204#205","award":"1:1:100:10000"},{"id":"4","name":"海棠花","have_flowers":"10#36#42#44#47#74#75#109#110#113#114#115#123#124","award":"1:1:100:10000"},{"id":"5","name":"菊花","have_flowers":"9#13#21#28#29#41#43#67#73#89#91#92#93#94#95#102#103#112#186","award":"1:1:100:10000"},{"id":"6","name":"康乃馨","have_flowers":"2#7#16#18#38#40#52#54#55#80#81#82#90#107#108#118#119#166#173","award":"1:1:100:10000"},{"id":"7","name":"荷花","have_flowers":"34#148#149#153#176#196#197#198#199#48","award":"1:1:100:10000"},{"id":"8","name":"牵牛花","have_flowers":"11#26#37#39#57#65#66#76#86#87#104#105#106#136#137#146#147#165","award":"1:1:100:10000"},{"id":"9","name":"梧桐花","have_flowers":"5#14#25#27#33#59#60#61#72#88#128#133#134#135#172#174","award":"1:1:100:10000"},{"id":"10","name":"红掌","have_flowers":"12#15#35#45#69#70#99#100#101#145#180","award":"1:1:100:10000"},{"id":"11","name":"蝴蝶兰","have_flowers":"22#23#24#31#46#50#51#64#84#98#116#117#120#121#122#168#191","award":"1:1:100:10000"},{"id":"12","name":"静谧公主","have_flowers":"6#30#58#77#85#96#125#126#127#152#171#177#178#179#182#184#97","award":"1:1:100:10000"},{"id":"13","name":"雪莲花","have_flowers":"68#129#131#132#139#141#150#154#169#188","award":"1:1:100:10000"},{"id":"14","name":"薰衣草","have_flowers":"156#157#158#159#167#170#175#183#187#189#190#192","award":"1:1:100:10000"}]]],0,0,[],[],[]]

+ 0 - 1
Flowers/build/web-desktop/assets/module_extra/import/ea/ea02bbbe-2c83-4c2d-9d56-97f1dc66ab08.0cd57.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"flower_color",[{"id":"1","colour_name":"红色","colour_id":"bd0f11"},{"id":"2","colour_name":"梅红","colour_id":"ec5d96"},{"id":"3","colour_name":"黄色","colour_id":"fddd37"},{"id":"4","colour_name":"橘色","colour_id":"ff8901"},{"id":"5","colour_name":"浅紫","colour_id":"e995ec"},{"id":"6","colour_name":"深紫","colour_id":"8e5ff5"},{"id":"7","colour_name":"白色","colour_id":"ffffff"},{"id":"8","colour_name":"肉橘","colour_id":"ff7a60"},{"id":"9","colour_name":"深蓝","colour_id":"0d83e6"},{"id":"10","colour_name":"浅蓝","colour_id":"a5c2f1"},{"id":"11","colour_name":"粉色","colour_id":"ffafb7"},{"id":"12","colour_name":"绿色","colour_id":"aecb4d"},{"id":"","colour_name":"","colour_id":""},{"id":"","colour_name":"","colour_id":""},{"id":"","colour_name":"","colour_id":""},{"id":"","colour_name":"","colour_id":""},{"id":"","colour_name":"","colour_id":""}]]],0,0,[],[],[]]

+ 1 - 0
Flowers/build/web-desktop/assets/module_extra/import/ea/ea02bbbe-2c83-4c2d-9d56-97f1dc66ab08.72a1e.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"flower_color",[{"id":"1","colour_name":"红色","colour_id":"bd0f11"},{"id":"2","colour_name":"梅红","colour_id":"ec5d96"},{"id":"3","colour_name":"黄色","colour_id":"fddd37"},{"id":"4","colour_name":"橘色","colour_id":"ff8901"},{"id":"5","colour_name":"浅紫","colour_id":"e995ec"},{"id":"6","colour_name":"深紫","colour_id":"8e5ff5"},{"id":"7","colour_name":"白色","colour_id":"ffffff"},{"id":"8","colour_name":"肉橘","colour_id":"ff7a60"},{"id":"9","colour_name":"深蓝","colour_id":"0d83e6"},{"id":"10","colour_name":"浅蓝","colour_id":"a5c2f1"},{"id":"11","colour_name":"粉色","colour_id":"ffafb7"},{"id":"12","colour_name":"绿色","colour_id":"aecb4d"}]]],0,0,[],[],[]]

File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/index.0b6d0.js


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_extra/index.f7d75.js


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/config.3bf4c.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/config.b18d9.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/02/028e1ee78.bb396.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/02/029adb2aa.742e8.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/02/029adb2aa.b11fd.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/03/0347b7de9.2e3e5.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/03/036e7fbf4.f378a.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/03/036e7fbf4.fed2d.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/03/0378122e6.72d56.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/03/0378122e6.bb629.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/04/040f8e62a.2b947.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/04/044da1086.d92bf.json


+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/f0/f0ce6ba2-73b5-430b-b333-304feceeac2b.a2533.json → Flowers/build/web-desktop/assets/module_game/import/04/04c857f7-7f29-47a9-96f8-34f6d40539ac.a2533.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/05/05cbd7402.785ce.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/06/06049bf2c.61d8d.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/06/06049bf2c.e7ca7.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/08/0860c6160.c86f4.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/08/08acdf9bb.7476f.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/08/08acdf9bb.c063a.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/08/08fcf7d04.ac8e8.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/09/0970df281.16d73.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0a/0a5a2f57a.46b18.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0a/0a5a2f57a.b742e.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0a/0a750e086.aeddb.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0a/0abd41c04.a0252.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0c/0c4e47c5c.2b586.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0e/0e95fa791.3d808.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0f/0fce9d352.5f455.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/import/0f/0fd53d036.9e6bb.json


+ 0 - 0
Flowers/build/web-mobile/assets/main/import/07/076a9575-175c-4691-ae44-89969a92c744.a2533.json → Flowers/build/web-desktop/assets/module_game/import/13/13e9e7ec-1a86-4757-bd28-986ecc52c2e3.a2533.json


+ 0 - 0
Flowers/build/web-mobile/assets/main/import/2a/2a612619-46e9-4c03-a4d6-97837fbdc399.a2533.json → Flowers/build/web-desktop/assets/module_game/import/4b/4bb38379-69e2-4132-b14f-d9051d88b8f5.a2533.json


+ 0 - 0
Flowers/build/web-mobile/assets/main/import/a5/a562efe1-ef24-4287-b556-6eda049687b5.a2533.json → Flowers/build/web-desktop/assets/module_game/import/df/dfbe9417-9925-449c-bcc3-2a99a72cbe9f.a2533.json


+ 0 - 0
Flowers/build/web-mobile/assets/main/import/af/af8025bd-86da-4e48-88ac-053a38fc3b6d.a2533.json → Flowers/build/web-desktop/assets/module_game/import/fa/fa16a973-a752-4d81-86cc-0c1e71897626.a2533.json


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/index.3bf4c.js


File diff suppressed because it is too large
+ 0 - 0
Flowers/build/web-desktop/assets/module_game/index.b18d9.js


BIN
Flowers/build/web-desktop/assets/module_game/native/00/00c42157-a87b-4f5b-8b1a-79b5c181bb48.1a8f8.png


BIN
Flowers/build/web-desktop/assets/module_game/native/00/00c42157-a87b-4f5b-8b1a-79b5c181bb48.4faef.png


BIN
Flowers/build/web-desktop/assets/module_game/native/04/04c857f7-7f29-47a9-96f8-34f6d40539ac.db0d7.png


BIN
Flowers/build/web-desktop/assets/module_game/native/05/05092450-80bd-4610-bd14-2c5a587d092e.61fa4.png


BIN
Flowers/build/web-desktop/assets/module_game/native/05/05092450-80bd-4610-bd14-2c5a587d092e.8f354.png


BIN
Flowers/build/web-desktop/assets/module_game/native/05/0597ef0c-3402-41ce-92d8-2d27510d8c4a.1d2be.png


BIN
Flowers/build/web-desktop/assets/module_game/native/05/0597ef0c-3402-41ce-92d8-2d27510d8c4a.68fdf.png


BIN
Flowers/build/web-desktop/assets/module_game/native/0f/0fe5c408-6b79-4ac6-8134-d5f20645e185.0f4b3.png


BIN
Flowers/build/web-desktop/assets/module_game/native/0f/0fe5c408-6b79-4ac6-8134-d5f20645e185.bdd16.png


BIN
Flowers/build/web-desktop/assets/module_game/native/13/13e9e7ec-1a86-4757-bd28-986ecc52c2e3.926a0.png


BIN
Flowers/build/web-desktop/assets/module_game/native/14/140483f0-271c-42f0-aba2-55b9657e1f35.2311a.png


BIN
Flowers/build/web-desktop/assets/module_game/native/14/140483f0-271c-42f0-aba2-55b9657e1f35.f57ed.png


BIN
Flowers/build/web-desktop/assets/module_game/native/15/15731c86-5857-4340-af9f-220bb8e571f2.1a30e.png


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