隐私授权

assets/resources/module/login/login.prefab

@@ -808,7 +808,7 @@
     "sync": false
   },
   {
-    "__type__": "5a51eUDpWFKcLnswFCd1nVI",
+    "__type__": "1e65dZ40OtGzJi5szN4XMZR",
     "_name": "",
     "_objFlags": 0,
     "node": {

assets/resources/module/login/progressbar.prefab

@@ -396,7 +396,7 @@
     "sync": false
   },
   {
-    "__type__": "5a51eUDpWFKcLnswFCd1nVI",
+    "__type__": "1e65dZ40OtGzJi5szN4XMZR",
     "_name": "",
     "_objFlags": 0,
     "node": {

assets/script/game/component/ProgressBar.ts → assets/script/game/component/LoadingBar.ts

@@ -1,9 +1,9 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class ProgressBar extends cc.Component {
+export default class LoadingBar extends cc.Component {
     @property({ type: cc.Sprite, displayName: '进度条' })
-    bar: cc.Sprite = null;
+    private bar: cc.Sprite = null;
 
     private len: number;
 

assets/script/game/component/ProgressBar.ts.meta → assets/script/game/component/LoadingBar.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "5a51e503-a561-4a70-b9ec-c0509dd67548",
+  "uuid": "1e65d678-d0eb-46cc-98b9-b333785cc651",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

assets/script/game/data/AppData.ts

@@ -52,7 +52,7 @@ export class AppData {
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];
         this.machineInfo.imei = arr[2];
-        this.machineInfo.mac = this.mac = arr[3];
+        // this.machineInfo.mac = this.mac = arr[3];
         this.machineInfo.oaid = arr[4];
         this.machineInfo.umid = arr[5];
         this.tfChannel = arr[6];

assets/script/game/data/LoginData.ts

@@ -29,28 +29,20 @@ export class LoginData {
     public isAuth: boolean;
 
     /** 服务协议 */
-    public ruleStr:string;
+    public rule_data: string[];
 
     /** 隐私协议 */
-    public privacyStr:string;
+    public privacy_data: string[];
 
     /**
      * 初始化本地配置
      * @returns 
      */
     public async loadLocalRes() {
-        let result = await mk.loader.load("data/rule_data",cc.JsonAsset);
-        if(result && result.json){
-            this.ruleStr = '';
-            this.privacyStr = '';
-            let arr = result.json.server;
-            for(let i=0;i<arr.length;i++){
-                this.ruleStr += arr[i] + '\n';
-            }
-            arr = result.json.privacy;
-            for(let i=0;i<arr.length;i++){
-                this.privacyStr += arr[i] + '\n';
-            }
+        let result = await mk.loader.load("data/rule_data", cc.JsonAsset);
+        if (result && result.json) {
+            this.rule_data = result.json.server;
+            this.privacy_data = result.json.privacy;
             this.loadResCompelete = true;
         }
     }

assets/script/game/module/login/Login.ts

@@ -1,12 +1,12 @@
-import ProgressBar from "../../component/ProgressBar";
+import LoadingBar from "../../component/LoadingBar";
 
 const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class Login extends cc.Component {
 
-    @property(ProgressBar)
-    private bar: ProgressBar;
+    @property(LoadingBar)
+    private bar: LoadingBar = null;
     @property({ displayName: '加载文字', type: cc.Label })
     private lbl_progress: cc.Label = null;
     @property({ displayName: '服务协议', type: cc.Label })
@@ -26,10 +26,11 @@ export default class Login extends cc.Component {
         this.lbl_progress.string = "加载不消耗流量 " + current + "%";
     }
 
-    private c: number = 0;
+    private process: number = 0;
     update() {
-        if (this.c < 100) {
-            this.setProgress(++this.c);
+        if (this.process < 100) {
+            this.process += 2;
+            this.setProgress(this.process);
         }
         if (!gData.loginData.loadResCompelete) {
             gData.loginData.loadLocalRes();

assets/script/game/module/setting/Rule.ts

@@ -22,7 +22,12 @@ export default class Rule extends cc.Component {
      * @param type 0服务协议  1隐私协议
      */
     public setContent(type: string = "0") {
-        this.lbl_content.string = type == "0" ? gData.loginData.ruleStr : gData.loginData.privacyStr;
+        let arr = type == "0" ? gData.loginData.rule_data : gData.loginData.privacy_data;
+        let str = "";
+        for (let i = 0; i < arr.length; i++) {
+            str += arr[i] + "\n";
+        }
+        this.lbl_content.string = str;
         this.scrollView.scrollToTop();
     }