future 1 tahun lalu
induk
melakukan
f318f8413f

TEMPAT SAMPAH
assets/run/img_game_health_advise.png


+ 7 - 7
assets/scene/game.scene

@@ -14690,7 +14690,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 960,
+      "y": 959.9999999999999,
       "z": 0
     },
     "_lrot": {
@@ -14741,7 +14741,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -960,
+      "y": -959.9999999999999,
       "z": 0
     },
     "_lrot": {
@@ -14780,7 +14780,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14925,7 +14925,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1000,
-      "height": 1520
+      "height": 1519.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15207,7 +15207,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_alignFlags": 1,
+    "_alignFlags": 0,
     "_target": null,
     "_left": 0,
     "_right": 0,
@@ -15252,7 +15252,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -11.224,
-      "y": -1782.2,
+      "y": -1782.1999999999998,
       "z": 0
     },
     "_lrot": {
@@ -15382,7 +15382,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1919.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 6 - 1
assets/script/config.ts

@@ -3,7 +3,7 @@ import { scene_item_data, widget_item_data } from '../data/data';
 const { ccclass, property } = _decorator;
 
 export class config {
-    static debug = true;
+    static debug = false;
     static is_zb = false; //是否是主播模式
     static gameName = "神秘的笔记";
     static select_res_and_control_type = {
@@ -317,6 +317,11 @@ export class config {
     static MSG_CODE = {
         SUCCESS: 10000,
     }
+    static PLATFORM_IDENTIFY = { //平台标识
+        DOU_YIN:'douyin',
+        WX:'wx',
+        KS:'ks',
+    }
     static BACK_GAME_STATUS = {
         NORMAL: 1,
         WIN: 2,

+ 8 - 0
assets/script/run/game_list_view/game_list.ts

@@ -24,6 +24,14 @@ export class game_list extends Component {
     private onTouchActive:boolean = true;
     private start_pos:Vec2 = Vec2.ZERO;
     private page_limit_count:number = 6
+    
+    protected start(): void {
+        if(SdkUtil.KS_GAME) {
+            let p = this.btn_back.getPosition()
+            this.btn_back.setPosition(p.x,p.y-120,p.z)
+        }
+    }
+
     public initView(finish_call,call_back){
         this.m_back_call = call_back;
         this.m_loading_finish_call = finish_call;

+ 12 - 16
assets/script/run/loading_view/loading_view.ts

@@ -90,13 +90,13 @@ export class loading_view extends Component {
                     }
                     
                     if(user_data.user_id==null){
-                        let third_login_success = (url,r_data,platform)=>{
+                        let third_login_success = (url,r_data)=>{
                             http.run_post(url,r_data, (err,data)=> {
                                 let _data:getOpenidMessage = JSON.parse(data)
                                 if(_data.code===config.MSG_CODE.SUCCESS){
                                     user_data.user_id = _data.content.openid;
                                     formData.openid = _data.content.openid;
-                                    formData.platform = platform
+                                    formData.platform = SdkUtil.getPlatformIdentify()
                                     // console.log("_data",data)
                                     login_call_back();
                                 }
@@ -109,31 +109,27 @@ export class loading_view extends Component {
                                     let code = res.code;
                                     let anonymousCode = res.anonymousCode;
                                     console.log("tt_code",code,anonymousCode)
-                                    third_login_success(http.get_dyopen_id(),{"code": code,"anonymous_code":anonymousCode}, 'douyin')
+                                    third_login_success(http.get_dyopen_id(),{"code": code,"anonymous_code":anonymousCode})
                                 },
                                 fail(res) { console.log(`tt_login 调用失败:`,res); }
                             });
                         }
                         else if(sys.platform==sys.Platform.WECHAT_GAME){
                             if(SdkUtil.KS_GAME) {
-                                user_data.user_id = "ks_test";
-                                formData.openid = user_data.user_id;
-                                formData.platform = 'ks'
-                                login_call_back();
-                                // ks.login({
-                                //     success(res) {
-                                //         let code = res.code;
-                                //         console.log("ks_code",code)
-                                //         // third_login_success(http.get_ksopen_id(),{"code": code}, 'ks')
-                                //     },
-                                //     fali(err) {  console.log('ks_login 调用失败:',err) }
-                                // })
+                                ks.login({
+                                    success(res) {
+                                        let code = res.code;
+                                        console.log("ks_code",code)
+                                        third_login_success(http.get_ksopen_id(),{"code": code})
+                                    },
+                                    fali(err) {  console.log('ks_login 调用失败:',err) }
+                                })
                             } else {
                                 wx.login({
                                     success(res) {
                                         let code = res.code;
                                         console.log("wx_code",code)
-                                        third_login_success(http.get_wxopen_id(),{"code": code}, 'wx')
+                                        third_login_success(http.get_wxopen_id(),{"code": code})
                                     },
                                     fali(err) { console.log('wx_login 调用失败:',err) }
                                 })

+ 1 - 1
assets/script/run/top_layer.ts

@@ -111,8 +111,8 @@ export class top_layer extends Component {
     }
 
     onWin(){
-        this.win.getComponent(win).show(this.onClickShare.bind(this),this.onClickNext.bind(this))
         if(this.mIsShowWin==false) {
+            this.win.getComponent(win).show(this.onClickShare.bind(this),this.onClickNext.bind(this))
             this.mIsShowWin = true
             let level_data = gameManager.Singleton.getLevelData()
             ClientEvent.dispatchEvent(config.EventRun.WIN_LATER_AUTO_UNLOCK_NEXT_LEVEL,level_data)

+ 4 - 7
assets/script/run/ui/back_title.ts

@@ -8,10 +8,12 @@ export class back_title extends Component {
     @property(Node) btn_back:Node = null;
     @property(Node) img_title_bg:Node = null;
     @property(Node) img_title:Node = null;
-    private img_title_bg_original_point:Vec3 = new Vec3(0,0,0)
     private mCallBack = null;
     protected start(): void {
-        this.img_title_bg_original_point = this.img_title_bg.getPosition()
+        if(SdkUtil.iPhoneIsLingdongdao()&&SdkUtil.KS_GAME==false) {
+            let p = this.img_title_bg.getPosition()
+            this.img_title_bg.setPosition(p.x,p.y-60,p.z)
+        }
     }
     public initView(title:string,call_back){
         this.mCallBack = call_back;
@@ -32,11 +34,6 @@ export class back_title extends Component {
             this.img_title.parent.active = true;
         }
         this.img_title.getComponent(Label).string = title;
-
-        if(SdkUtil.iPhoneIsLingdongdao()) {
-            let p = new Vec3(this.img_title_bg_original_point.x, this.img_title_bg_original_point.y - 60, this.img_title_bg_original_point.z)
-            this.img_title_bg.setPosition(p)
-        }
     }
 }
 

+ 6 - 0
assets/script/run/ui_layer.ts

@@ -41,6 +41,12 @@ export class ui_layer extends Component {
     private mCountDownLlist:Map<number,widget_item_data> = new Map;
     private mData:widget_item_data[] = null;
     private mAttCountDown:count_down = null;
+    protected start(): void {
+        if(SdkUtil.KS_GAME) {
+            let p = this.back_title_node.getPosition()
+            this.back_title_node.setPosition(p.x,p.y-120,p.z)
+        }
+    }
     public initUi(ui_widge_list:widget_item_data[]){
         this.mData = ui_widge_list;
         this.loadAllUi()

+ 16 - 1
assets/script/sdkUtil.ts

@@ -44,6 +44,21 @@ export class SdkUtil {
         })
     }
 
+    // 获取平台标识
+    public static getPlatformIdentify():string {
+        let identify = 'browser'
+        if(sys.platform==sys.Platform.BYTEDANCE_MINI_GAME) {
+            identify = config.PLATFORM_IDENTIFY.DOU_YIN
+        } else if(sys.platform==sys.Platform.WECHAT_GAME) {
+            if(SdkUtil.KS_GAME) {
+                identify = config.PLATFORM_IDENTIFY.KS
+            } else {
+                identify = config.PLATFORM_IDENTIFY.WX
+            }
+        }
+        return identify
+    } 
+
     // 苹果手机是否有灵动岛
     public static iPhoneIsLingdongdao():boolean {
         if(sys.platform==sys.Platform.BYTEDANCE_MINI_GAME) {
@@ -186,7 +201,7 @@ export class SdkUtil {
         if(SdkUtil.videoAd==null){ 
             gameManager.Singleton.hideLoadingLevel()
             return
-         }
+        }
 
         SdkUtil.videoAd.onLoad(() => {
             SdkUtil.isLookAd = true

+ 2 - 1
assets/script/statisticsManager.ts

@@ -3,6 +3,7 @@ import { statistics_collect_rewardVideo_data } from '../data/data';
 import { gameManager } from './run/gameManager';
 import { http } from './http';
 import { config } from './config';
+import { SdkUtil } from './sdkUtil';
 const { ccclass, property } = _decorator;
 
 @ccclass('statisticsManager')
@@ -74,7 +75,7 @@ export class statisticsManager extends Component {
 
         let data_string = JSON.stringify(data_item)
         // console.log(data_string)
-        let request_data = { 'adsdata': data_string }
+        let request_data = { 'adsdata': data_string , 'platform': SdkUtil.getPlatformIdentify() }
         http.statistics_post(http.statistics_ads(),request_data,(_err,c_data)=> {
             console.log('广告统计: _err=', _err, 'c_dat=', c_data)
             if (call_back != null) {