future 1 жил өмнө
parent
commit
5cafa47ad1

+ 6 - 3
assets/scene/game.scene

@@ -9033,6 +9033,9 @@
     "btn_addtime": {
       "__id__": 216
     },
+    "list_node": {
+      "__id__": 178
+    },
     "content": {
       "__id__": 181
     },
@@ -15972,7 +15975,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 1.1368683772161603e-13,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -18783,7 +18786,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -19381,7 +19384,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 9 - 1
assets/script/run/bag/dai_dao_ju_bag.ts

@@ -1,16 +1,18 @@
-import { _decorator, Component, instantiate, Node, Prefab, Rect, ScrollView } from 'cc';
+import { _decorator, Component, instantiate, Node, Prefab, Rect, ScrollView, UITransform, Vec3, Widget } from 'cc';
 import { widget_info } from './widget_info';
 import { bag_drag_item } from './bag_drag_item';
 import { dai_dao_ju_item, event_item, guo_ju_qing_dai_dao_ju, widget_item_data } from '../../../data/data';
 import { ClientEvent } from '../../clientEvent';
 import { config } from '../../config';
 import { gameManager } from '../gameManager';
+import { SdkUtil } from '../../sdkUtil';
 const { ccclass, property } = _decorator;
 
 @ccclass('dai_dao_ju_bag')
 export class dai_dao_ju_bag extends Component {
     @property(Node) btn_tip:Node;
     @property(Node) btn_addtime:Node;
+    @property(Node) list_node:Node;
     @property(Node) content:Node;
     @property(Node) btn_info:Node;
     @property(Prefab) item_prefab:Prefab = null;
@@ -95,6 +97,12 @@ export class dai_dao_ju_bag extends Component {
         this.mScrollView = gameManager.Singleton.getCurSceneLayerPage().getBG()
     }
 
+    protected start(): void {
+        if(SdkUtil.tt_systemInfo.brand=='Apple') {
+            this.list_node.getComponent(Widget).bottom +=40
+        }
+    }
+
     protected update(dt: number): void {
         if(this.mScrollView!=null){
             this.action_node.position =  this.mScrollView.position;

+ 25 - 6
assets/script/run/game_list_view/game_list.ts

@@ -301,12 +301,31 @@ export class game_list extends Component {
             return value.getComponent(level_list_item).getData().id == current_id
         })
         if(current_index > -1) {
-            let next_index = current_index + 1
-            if(next_index < this.content.children.length) {
-                let next_item = this.content.children[next_index].getComponent(level_list_item)
-                if(next_item.getIsUnLock()==false) {
-                    // console.log("解锁了=",next_item.getData().id,'-',next_item.getData().name)
-                    next_item.UnLock()
+            if(current_index+1==this.page_limit_count) {
+                if(gameManager.getStaticUserData().select_page<this.getAllPage()) {
+                    let page = gameManager.getStaticUserData().select_page + 1
+                    let url = http.getGameList(page, this.page_limit_count)
+                    http.run_get_static(url,(err,data)=>{
+                        if(!err){
+                            let msg:LevelMessage  = JSON.parse(data)
+                            if(msg.content.list.length>0) {
+                                let one_data = msg.content.list[0]
+                                let isUnLock = gameManager.Singleton.levleIsUnLock(one_data.id)
+                                if(isUnLock==false) {
+                                    gameManager.Singleton.unLockLevel(one_data.id)
+                                }
+                            }
+                        }
+                    })
+                }
+            } else {
+                let next_index = current_index + 1
+                if(next_index < this.content.children.length) {
+                    let next_item = this.content.children[next_index].getComponent(level_list_item)
+                    if(next_item.getIsUnLock()==false) {
+                        // console.log("解锁了=",next_item.getData().id,'-',next_item.getData().name)
+                        next_item.UnLock()
+                    }
                 }
             }
         }