Merge branch 'main' into rainbow

# Conflicts: # assets/GameplayIntro/script.meta # assets/Scene/GameScene.fire # assets/resources/texture.meta # assets/seven_day_gift/docs.meta # assets/seven_day_gift/test.meta # settings/project.json
2026-09-18 17:13:36 +08:00
parent c125db45c2 e2802389a7
commit feebcb935e
182 changed files with 29250 additions and 2703 deletions
@@ -736,7 +736,7 @@ export class GameConfig {
            vibrateOpen: true,           //震动
            coinnum: 0,               //每局的金币数
            paid_user: false,           //是否是付费用户
-            version: "1.0.58",               //版本号
+            version: "1.0.60",               //版本号
            shushu_DistinctId: "",      //数数访客ID
            shushu_AccountId: "",       //数数账号ID
            uid: "",                    //用户和后端唯一id