qiushiyong 1 month ago
parent
commit
9a47d18d4e

+ 32 - 32
pingan_h5_qianduan/assets/src/Main.ts

@@ -92,7 +92,7 @@ export default class Main extends cc.Component {
             this.setupCustomImage()
             this.initUI()
             // this.reset() //没有答题的情况下要注释掉
-            // this.reset() //有答题的情况下开放出来
+            this.reset() //有答题的情况下开放出来
 
             this.playBGM(true)
 
@@ -124,40 +124,12 @@ export default class Main extends cc.Component {
     }
 
     /* 没有答题的情况下抽奖start */
-    initUI() {
-        this.questionPanel.active = false;
-        this.lotteryPanel.active = true;
-        this.labelTitle.string = NetManager.getInst().activityName
-
-        /*
-        const questionData = NetManager.getInst().questions
-        this.MAX_QUESTION_NUM = questionData.length
-        for (let i = 0; i < questionData.length; ++i) {
-            let itemData = questionData[i]
-
-            let itemNode = cc.instantiate((itemData.type == 3) ? this.inputQuestionItem : this.optQuestionItem)
-            this.questionNode.addChild(itemNode)
-
-            let comp = itemNode.getComponent((itemData.type == 3) ? 'InputQuestionItem' : 'OptQuestionItem')
-            comp.loadData(i + 1, itemData)
-            this.questionCompArr.push(comp)
-        }
-        */
-
-        const rewardTypes = NetManager.getInst().lotteryItems;
-        let index = 0
-        for (let idx in rewardTypes) {
-            this.rewardType[index++].string = rewardTypes[idx]
-        }
-    }
-    /* 没有答题的情况下抽奖end */
-
-    /* 有答题的情况下抽奖start */
     // initUI() {
-    //     this.questionPanel.active = true;
-    //     this.lotteryPanel.active = false;
+    //     this.questionPanel.active = false;
+    //     this.lotteryPanel.active = true;
     //     this.labelTitle.string = NetManager.getInst().activityName
     //
+    //     /*
     //     const questionData = NetManager.getInst().questions
     //     this.MAX_QUESTION_NUM = questionData.length
     //     for (let i = 0; i < questionData.length; ++i) {
@@ -170,6 +142,7 @@ export default class Main extends cc.Component {
     //         comp.loadData(i + 1, itemData)
     //         this.questionCompArr.push(comp)
     //     }
+    //     */
     //
     //     const rewardTypes = NetManager.getInst().lotteryItems;
     //     let index = 0
@@ -177,6 +150,33 @@ export default class Main extends cc.Component {
     //         this.rewardType[index++].string = rewardTypes[idx]
     //     }
     // }
+    /* 没有答题的情况下抽奖end */
+
+    /* 有答题的情况下抽奖start */
+    initUI() {
+        this.questionPanel.active = true;
+        this.lotteryPanel.active = false;
+        this.labelTitle.string = NetManager.getInst().activityName
+
+        const questionData = NetManager.getInst().questions
+        this.MAX_QUESTION_NUM = questionData.length
+        for (let i = 0; i < questionData.length; ++i) {
+            let itemData = questionData[i]
+
+            let itemNode = cc.instantiate((itemData.type == 3) ? this.inputQuestionItem : this.optQuestionItem)
+            this.questionNode.addChild(itemNode)
+
+            let comp = itemNode.getComponent((itemData.type == 3) ? 'InputQuestionItem' : 'OptQuestionItem')
+            comp.loadData(i + 1, itemData)
+            this.questionCompArr.push(comp)
+        }
+
+        const rewardTypes = NetManager.getInst().lotteryItems;
+        let index = 0
+        for (let idx in rewardTypes) {
+            this.rewardType[index++].string = rewardTypes[idx]
+        }
+    }
     /* 有答题的情况下抽奖end */
 
     reset() {

File diff suppressed because it is too large
+ 1 - 1
pingan_h5_qianduan/build/web-mobile/assets/main/config.adcb5.json


File diff suppressed because it is too large
+ 1 - 0
pingan_h5_qianduan/build/web-mobile/assets/main/index.2d9f3.js


File diff suppressed because it is too large
+ 0 - 1
pingan_h5_qianduan/build/web-mobile/assets/main/index.adcb5.js


File diff suppressed because it is too large
+ 0 - 1
pingan_h5_qianduan/build/web-mobile/assets/resources/config.7cd7c.json


File diff suppressed because it is too large
+ 1 - 0
pingan_h5_qianduan/build/web-mobile/assets/resources/config.f7a81.json


pingan_h5_qianduan/build/web-mobile/assets/resources/index.7cd7c.js → pingan_h5_qianduan/build/web-mobile/assets/resources/index.f7a81.js


+ 2 - 2
pingan_h5_qianduan/build/web-mobile/index.html

@@ -48,9 +48,9 @@
     </div>
   </div>
 
-<script src="src/settings.9d64d.js" charset="utf-8"></script>
+<script src="src/settings.e4e9c.js" charset="utf-8"></script>
 
-<script src="main.f5c39.js" charset="utf-8"></script>
+<script src="main.fb412.js" charset="utf-8"></script>
 
 <script type="text/javascript">
 //自定义后端API地址

+ 2 - 2
pingan_h5_qianduan/build/web-mobile/main.f5c39.js

@@ -125,7 +125,7 @@ window.boot = function () {
 if (window.jsb) {
     var isRuntime = (typeof loadRuntime === 'function');
     if (isRuntime) {
-        require('src/settings.9d64d.js');
+        require('src/settings.e4e9c.js');
         require('src/cocos2d-runtime.js');
         if (CC_PHYSICS_BUILTIN || CC_PHYSICS_CANNON) {
             require('src/physics.js');
@@ -133,7 +133,7 @@ if (window.jsb) {
         require('jsb-adapter/engine/index.js');
     }
     else {
-        require('src/settings.9d64d.js');
+        require('src/settings.e4e9c.js');
         require('src/cocos2d-jsb.js');
         if (CC_PHYSICS_BUILTIN || CC_PHYSICS_CANNON) {
             require('src/physics.js');

+ 1 - 1
pingan_h5_qianduan/build/web-mobile/src/settings.9d64d.js

@@ -1 +1 @@
-window._CCSettings={platform:"web-mobile",groupList:["default"],collisionMatrix:[[true]],hasResourcesBundle:true,hasStartSceneBundle:false,remoteBundles:[],subpackages:[],launchScene:"db://assets/Main.fire",orientation:"portrait",jsList:["assets/src/aladdin.d2841.js"],bundleVers:{internal:"468ae",resources:"7cd7c",main:"adcb5"}};
+window._CCSettings={platform:"web-mobile",groupList:["default"],collisionMatrix:[[true]],hasResourcesBundle:true,hasStartSceneBundle:false,remoteBundles:[],subpackages:[],launchScene:"db://assets/Main.fire",orientation:"portrait",jsList:["assets/src/aladdin.d2841.js"],bundleVers:{internal:"468ae",resources:"f7a81",main:"2d9f3"}};

+ 1 - 1
pingan_h5_qianduan/settings/project.json

@@ -1,5 +1,5 @@
 {
-  "last-module-event-record-time": 1714358415982,
+  "last-module-event-record-time": 1723775813614,
   "group-list": [
     "default"
   ],