future 1 年之前
父節點
當前提交
7304c57f3a

+ 2 - 2
assets/data/data.ts

@@ -335,8 +335,8 @@ export class zhao_xi_jie_item_data{
     public res_name:string = "";
     public tips_res:string = "";
     public tips_res_name:string = "";
-    public is_look_video_ads:boolean = false; //是否看过视频广告
-    public is_find_answer:boolean = false;    //是否找到答案
+    public is_look_video_ads:boolean = false; //是否看过视频广告(无服务器返回,自主添加属性)
+    public is_find_answer:boolean = false;    //是否找到答案(无服务器返回,自主添加属性)
 }
 export class zhao_xi_jie_data{
     public tip_type:number = config.zhao_xi_jie_tip_type.select_tips;

+ 8 - 8
assets/scene/game.scene

@@ -11228,7 +11228,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 960.0000000000001,
+      "y": 960,
       "z": 0
     },
     "_lrot": {
@@ -11276,7 +11276,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -450,
       "z": 0
     },
     "_lrot": {
@@ -11288,8 +11288,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 4,
+      "y": 4,
       "z": 1
     },
     "_mobility": 0,
@@ -11718,7 +11718,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -11.224,
-      "y": -1782.2000000000003,
+      "y": -1782.2,
       "z": 0
     },
     "_lrot": {
@@ -11848,7 +11848,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -14749,7 +14749,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -15473,7 +15473,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920.0000000000002
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 2 - 2
assets/scene/test.scene

@@ -179,7 +179,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 959.9999999999999,
+    "_orthoHeight": 960,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -622,7 +622,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 4 - 2
assets/script/http.ts

@@ -4,7 +4,7 @@ const { ccclass, property } = _decorator;
 @ccclass('http')
 export class http {
     public static domain = config.debug ? "https://zcapi.xwrun.com" : "https://zcapi.hainanmlwl.com";
-    public static static_domain = config.debug ? "https://zcapi.xwrun.com" : "https://zaoca.oss-cn-beijing.aliyuncs.com"
+    public static static_domain = config.debug ? "https://zcapi.xwrun.com" : "https://static.hainanmlwl.com"
     public static statistics_domain = config.debug ? "http://logads.xwrun.com" : "https://logads.hainanmlwl.com";
 
     static post(url, data, call_back) {
@@ -136,7 +136,9 @@ export class http {
 
     public static run_get_static(url, call_back) {
         var xml = new XMLHttpRequest()
-        xml.open('GET', http.static_domain + url)
+        // let request_url = http.static_domain + url + "?" + Date.now()
+        let request_url = http.static_domain + url
+        xml.open('GET', request_url)
         xml.setRequestHeader('Content-Type', 'application/json');
         xml.send();
 

+ 1 - 0
assets/script/run/loading_view/loading_view.ts

@@ -135,6 +135,7 @@ export class loading_view extends Component {
                 case 0.7:
                     this.m_pause_status = true;
                     http.run_get_static(http.get_test_user_list(),(err,data)=>{
+                        console.log('testUser=',data)
                         if(!err){
                             let _data:getTestUserListMessage = JSON.parse(data)
                             for (let index = 0; index < _data.content.length; index++) {

+ 1 - 0
assets/script/run/login_view/login_view.ts

@@ -62,6 +62,7 @@ export class login_view extends Component {
         this.btn_sidebar_box.getComponent(Animation).play()
         this.btn_sidebar_box.off(Node.EventType.TOUCH_END)
         this.btn_sidebar_box.on(Node.EventType.TOUCH_END, ()=> {
+            gameManager.Singleton.sys_click_button_music()
             resources.load("prefab/run/sidebar_page", Prefab, (err, prefab)=> {
                 if(!err) {
                     let node = instantiate(prefab)

+ 3 - 0
assets/script/run/sidebar/sidebar_page.ts

@@ -1,5 +1,6 @@
 import { _decorator, Component, Node } from 'cc';
 import { SdkUtil } from '../../sdkUtil';
+import { gameManager } from '../gameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('sidebar_page')
@@ -13,9 +14,11 @@ export class sidebar_page extends Component {
     protected start(): void {
         let self = this
         this.btn_close.on(Node.EventType.TOUCH_END, ()=> {
+            gameManager.Singleton.sys_click_button_music()
             self.close()
         },this)
         this.btn_lqjl.on(Node.EventType.TOUCH_END, ()=> {
+            gameManager.Singleton.sys_click_button_music()
             if(self.m_lqjl_callback!=null) {
                 self.m_lqjl_callback(self)
             }

+ 1 - 0
assets/script/run/tips/shouji_item.ts

@@ -12,6 +12,7 @@ export class shouji_item extends Component {
     public initSingleTipView(data:zhao_xi_jie_item_data,call){
         this.mData = data;
         this.mCallBack = call;
+        this.node.off(Node.EventType.TOUCH_START)
         this.node.on(Node.EventType.TOUCH_START,()=>{
             if(this.mCallBack!=null){
                 this.mCallBack(this)

+ 2 - 0
assets/script/run/tips/tip_type_all.ts

@@ -21,6 +21,8 @@ export class tip_type_all extends Component {
             item.parent = this.content;
             item.getComponent(shouji_item).initAllTipView(widget)
         }
+        
+        this.btn_tip.off(Node.EventType.TOUCH_END)
         this.btn_tip.on(Node.EventType.TOUCH_END,()=>{
             if(this.mCallBack!=null){
                 this.mCallBack()

+ 4 - 0
assets/script/run/tips/tip_type_single.ts

@@ -23,10 +23,14 @@ export class tip_type_single extends Component {
         this.content.removeAllChildren()
         for (let index = 0; index < this.mData.widget_id_list.length; index++) {
             const widget:zhao_xi_jie_item_data = this.mData.widget_id_list[index];
+            widget.is_look_video_ads = false
+            widget.is_find_answer = false
             let item = instantiate(this.itemPrefab)
             item.parent = this.content;
             item.getComponent(shouji_item).initSingleTipView(widget,this.onItemClick.bind(this))
         }
+
+        this.btn_tip.off(Node.EventType.TOUCH_END)
         this.btn_tip.on(Node.EventType.TOUCH_END,()=>{
             if(this.mCallBack!=null){
                 this.mCallBack(this.curSelectItem.getData())

+ 1 - 0
assets/script/run/tips/ui_manifestations.ts

@@ -18,6 +18,7 @@ export class ui_manifestations extends Component {
     private tipsMap:Map<string,boolean> = new Map;
     private mData:zhao_xi_jie_data = null;
     public initView(data:zhao_xi_jie_data){
+        this.tipsMap.clear()
         this.mData = data;
         if(this.mData.tip_type===config.zhao_xi_jie_tip_type.select_tips){
             this.tip_type_single.active = true;