zc пре 2 година
родитељ
комит
00a446936e
4 измењених фајлова са 137 додато и 125 уклоњено
  1. 41 41
      assets/scence/game.scene
  2. 35 31
      assets/scripts/OptionsCtr.ts
  3. 1 1
      assets/scripts/StoryPannelCtr.ts
  4. 60 52
      assets/scripts/gameCtr.ts

+ 41 - 41
assets/scence/game.scene

@@ -209,7 +209,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 540,
+    "_orthoHeight": 649.0802348336595,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -18727,7 +18727,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "a5ZIf7t/NMHqt8BCCCkOor"
+    "_id": "08cehVpAFCYblpkdjSEP34"
   },
   {
     "__type__": "cc.Node",
@@ -18782,7 +18782,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "88+VxUeU5F7ql4pCofwofd"
+    "_id": "51D6igXTNM2I9Thzpyu5NK"
   },
   {
     "__type__": "cc.Node",
@@ -18830,7 +18830,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "5c7vgUzGNHtaVoF5ZDg5+4"
+    "_id": "daa1H8nc1GNb0HnYT9q8A1"
   },
   {
     "__type__": "cc.UITransform",
@@ -18852,7 +18852,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "58qczpwolMY5zX2ZNs58e+"
+    "_id": "7dtQsNZw9L+rBtmBezaiXD"
   },
   {
     "__type__": "cc.ParticleSystem2D",
@@ -18960,7 +18960,7 @@
       "a": 0
     },
     "_positionType": 0,
-    "_id": "ccmgYE5yFMbo3JuJNIsrdL"
+    "_id": "975OvrwhNLvJPtzWT6CPTJ"
   },
   {
     "__type__": "cc.UITransform",
@@ -18982,7 +18982,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "5fmQXt1MpOEIHINE3xt1qG"
+    "_id": "8cVT5Z7hFCwpEkVlnVqrYn"
   },
   {
     "__type__": "cc.Sprite",
@@ -19021,7 +19021,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "ffYui0ORVFRYPFmAFkGD3F"
+    "_id": "32BgHY7PtH/qaxsyBsgzy0"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -19034,7 +19034,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 120,
-    "_id": "c2iv3wN5ND476Yv5tV8BpH"
+    "_id": "d1RvP5dJlFr6aVY+t4vZ3A"
   },
   {
     "__type__": "cc.UITransform",
@@ -19056,7 +19056,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "d03ah8lNxO6IvW0rFBQO7p"
+    "_id": "19teS9a3pCN6yjKQlUac9T"
   },
   {
     "__type__": "cc.Graphics",
@@ -19096,7 +19096,7 @@
       "a": 0
     },
     "_miterLimit": 10,
-    "_id": "71BHQn9AhFkobdYkqgNwdk"
+    "_id": "f8zspr7ktJ8LjtsDFmrS5X"
   },
   {
     "__type__": "8604fJqRXNI5qtxiCUEZHFo",
@@ -19111,7 +19111,7 @@
     "width": 886,
     "height": 76,
     "cornerRadius": 38,
-    "_id": "b8QpjvyzlPWrzenVyJGO1I"
+    "_id": "0cCXQFMNNB0aGmg2GBzbFO"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -19124,7 +19124,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 180,
-    "_id": "0bxZUIaLBGpLfhOg0iUmS1"
+    "_id": "9feQp4m19B86sOjOt7nehc"
   },
   {
     "__type__": "cc.Mask",
@@ -19140,7 +19140,7 @@
     "_inverted": false,
     "_segments": 64,
     "_alphaThreshold": 0.1,
-    "_id": "abcgfii0pNTLER8Ks9JoNA"
+    "_id": "77a7i4WXFB06pQCiMYnKuf"
   },
   {
     "__type__": "cc.Node",
@@ -19445,7 +19445,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "450f5Vv/pLXIqpYuq4VOik"
+    "_id": "3e4jM0HKVO1ICNNdUjSMTf"
   },
   {
     "__type__": "cc.Node",
@@ -19500,7 +19500,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "36PVP9i5JGFbyxvLpYAi24"
+    "_id": "4aN/8ZfuZHL5wsCAo5Zv5W"
   },
   {
     "__type__": "cc.Node",
@@ -19548,7 +19548,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "bbpBifkFNFVIFrL2NGmBFu"
+    "_id": "06bVQavjlETrYRDZYYJv3h"
   },
   {
     "__type__": "cc.UITransform",
@@ -19570,7 +19570,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "51q9mgMIVEUYXrhmLDCxTw"
+    "_id": "14Pp7vSSNOtahjvWaQAV+N"
   },
   {
     "__type__": "cc.ParticleSystem2D",
@@ -19678,7 +19678,7 @@
       "a": 0
     },
     "_positionType": 0,
-    "_id": "20rKcaNgtPRJvlerTKCsGe"
+    "_id": "52WN0IPJRB2InEHcEt54Jn"
   },
   {
     "__type__": "cc.UITransform",
@@ -19700,7 +19700,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "3cVm8t915Ch5gU7/5t/emu"
+    "_id": "88vg0YCLJAwIz0NBNlU617"
   },
   {
     "__type__": "cc.Sprite",
@@ -19739,7 +19739,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "e0ZNF9bQpG8KyYnTiaI8Kc"
+    "_id": "d2J8w0gwlLb4txyW97d0Y0"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -19752,7 +19752,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 120,
-    "_id": "64FIA1Fs1GKKRyd4a48XLn"
+    "_id": "45RuE7GVZOAa7MD3tp5Nsw"
   },
   {
     "__type__": "cc.UITransform",
@@ -19774,7 +19774,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "f2j5FWDBBITLiH/CI9VCbC"
+    "_id": "717fSjoLJE04oj3ULx3Xy1"
   },
   {
     "__type__": "cc.Graphics",
@@ -19814,7 +19814,7 @@
       "a": 0
     },
     "_miterLimit": 10,
-    "_id": "f9NnJH8QNMNYmIFZPkaYRB"
+    "_id": "6e8XSl1cpOS4ZXrvcjYCa7"
   },
   {
     "__type__": "8604fJqRXNI5qtxiCUEZHFo",
@@ -19829,7 +19829,7 @@
     "width": 886,
     "height": 76,
     "cornerRadius": 38,
-    "_id": "94UgF7tw1MU7DqeOaMgabz"
+    "_id": "05C8YAk+lHHbQJ8wEJvOht"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -19842,7 +19842,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 180,
-    "_id": "d76+D6ZR1IF4KJttwMeEZc"
+    "_id": "c4exoeiAFAhb15fzdNdTfZ"
   },
   {
     "__type__": "cc.Mask",
@@ -19858,7 +19858,7 @@
     "_inverted": false,
     "_segments": 64,
     "_alphaThreshold": 0.1,
-    "_id": "3cbCKFD4RE0aCkd89HSpT1"
+    "_id": "9epOFsc69N+ao5/JnhAUTE"
   },
   {
     "__type__": "cc.Node",
@@ -20139,7 +20139,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -4,
-      "y": 4.199999999999989,
+      "y": 7.2,
       "z": 0
     },
     "_lrot": {
@@ -20163,7 +20163,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "e6fIFLNb5EariTmqsUkTS9"
+    "_id": "48+Tnu2TJClKKQezs59lgW"
   },
   {
     "__type__": "cc.Node",
@@ -20218,7 +20218,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "6e+YIMY9pL9Z1W5fHG04pv"
+    "_id": "2aRYQL+/RNUbarxVhg8N1k"
   },
   {
     "__type__": "cc.Node",
@@ -20266,7 +20266,7 @@
       "y": 0,
       "z": 0
     },
-    "_id": "64fMgs6iBIO75EpAz0Jb4k"
+    "_id": "c0QPrAXqRB9qL7Jcjb49Wm"
   },
   {
     "__type__": "cc.UITransform",
@@ -20288,7 +20288,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "6fjAfcAEZBVYEDSl+4nSoX"
+    "_id": "72tAPwNcZBbL/HONPp6YeH"
   },
   {
     "__type__": "cc.ParticleSystem2D",
@@ -20396,7 +20396,7 @@
       "a": 0
     },
     "_positionType": 0,
-    "_id": "59cZjhQGVMnqZXHdu6A98w"
+    "_id": "94dVFN7jVO07w/Y5E68a9V"
   },
   {
     "__type__": "cc.UITransform",
@@ -20418,7 +20418,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "fdxacYindIe6zLLI+t/X5+"
+    "_id": "07Tu2x3uFNgaGBK//TxwBu"
   },
   {
     "__type__": "cc.Sprite",
@@ -20457,7 +20457,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "d6g+UdHxNOEqpgV7da8Imk"
+    "_id": "b6nHi/ojNL5YwYNEzQpyWy"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -20470,7 +20470,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 120,
-    "_id": "3bNUCDkC5E/KCLYtO9lR3V"
+    "_id": "f5y9IJsjpOIqBTgn5IGpFL"
   },
   {
     "__type__": "cc.UITransform",
@@ -20492,7 +20492,7 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_id": "e7c91GDnRNIbwre1S3ySmJ"
+    "_id": "2alCfNM+pIa68UloLw+wwh"
   },
   {
     "__type__": "cc.Graphics",
@@ -20532,7 +20532,7 @@
       "a": 0
     },
     "_miterLimit": 10,
-    "_id": "28rw6FA9FP+KKOfxv5oyq6"
+    "_id": "23uszIch9NG4PsGtiaSFQa"
   },
   {
     "__type__": "8604fJqRXNI5qtxiCUEZHFo",
@@ -20547,7 +20547,7 @@
     "width": 886,
     "height": 76,
     "cornerRadius": 38,
-    "_id": "14u2WrQ5JIxoExiJYnLKC+"
+    "_id": "5cu1IeOxlGSqwBiCqaWtfJ"
   },
   {
     "__type__": "cc.UIOpacity",
@@ -20560,7 +20560,7 @@
     "_enabled": true,
     "__prefab": null,
     "_opacity": 180,
-    "_id": "93jFkY8GlO2YjyVD+IAMmK"
+    "_id": "86ru3qYeNDs4bmUxiv0+JK"
   },
   {
     "__type__": "cc.Mask",
@@ -20576,7 +20576,7 @@
     "_inverted": false,
     "_segments": 64,
     "_alphaThreshold": 0.1,
-    "_id": "87RjO3mshBS7uYYTIaG7m/"
+    "_id": "7aiCYjWoZAr5SxfklM59i5"
   },
   {
     "__type__": "cc.Node",

+ 35 - 31
assets/scripts/OptionsCtr.ts

@@ -1,5 +1,6 @@
 import { _decorator, color, Color, Component, Label, Node, Sprite, tween, UIOpacity, Vec3 } from "cc"
 import { processCtr } from "./socket/processCtr"
+import { GameCtr } from "./gameCtr"
 const { ccclass, property } = _decorator
 
 @ccclass("OptionsCtr")
@@ -22,13 +23,16 @@ export class OptionsCtr extends Component {
     resetVotes() {
         for (let i = 0; i < 4; i++) {
             const vote: Node = this.optionNodes[i].getChildByName("votes").getChildByName("toupiaojindu")
+            vote.setPosition(this.votesOrgPos_x, 0, 0)
             vote.active = false
             vote.getChildByName("votePannel_particle").active = false
-            vote.setPosition(this.votesOrgPos_x, 0, 0)
         }
     }
 
-    showVotes(num: number[], processCtr: processCtr) {
+    showVotes(num: number[],lastVot:number[], processCtr: processCtr) {
+
+        console.log("this!!!!!"+this+" processCtr!!!!!"+processCtr)
+
         let index = 0
 
         //获取投票范围,修改合适步长
@@ -47,15 +51,16 @@ export class OptionsCtr extends Component {
                 vote.active = true
                 vote.getChildByName("votePannel_particle").active = true
             }
+            console.log(index+"   "+processCtr)
+
             tween(vote)
-                .to(1, {
+                .to(0.5, {
                     position: new Vec3(this.votesOrgPos_x + (this.votesWidth / scope) * num[i], 0, 0)
                 })
                 .call(() => {
+                    console.log(index+"   "+processCtr)
                     if (index === 3) {
-
                         console.log("展示投票处理完成,处理下一个")
-
                         processCtr.doneProcessing()
                     }
                     index++
@@ -64,7 +69,7 @@ export class OptionsCtr extends Component {
         }
     }
 
-    setOptions(options: string[]) {
+    setOptions(options: string[],gameCtr: GameCtr) {
         if (options.length !== 4) {
             console.warn("Expected 4 options!")
             return
@@ -80,9 +85,17 @@ export class OptionsCtr extends Component {
         tween(this.node.getComponent(UIOpacity))
             .to(1, { opacity: 255 })
             .call(() => {
+                
                 for (let i = 0; i < 4; i++) {
                     this.setOptionText(this.optionNodes[i], options[i])
+                    if( i===3)
+                    {
+                        console.log("展示选项处理完成,处理下一个")
+                        gameCtr.storyActionStatus = 1
+                        gameCtr.processCtr.doneProcessing()
+                    }
                 }
+
             })
             .start()
     }
@@ -99,7 +112,7 @@ export class OptionsCtr extends Component {
             .start()
     }
 
-    selectOption(index: number) {
+    selectOption(index: number,gameCtr:GameCtr) {
         if (index < 1 || index > 4) {
             console.warn("Invalid option index!")
             return
@@ -120,32 +133,23 @@ export class OptionsCtr extends Component {
                     spriteComponent.spriteFrame = this.selectedSprite.spriteFrame
                 }
 
-                this.selectedAction(optionNode)
-            } else {
-                // 这是未被选中的选项
-                labelComponent.color = Color.WHITE // 假设默认颜色为白色,你可以根据需要更改
-
-                // 移除选中背景图
-                const spriteComponent = optionNode.getComponent(Sprite)
-                if (spriteComponent) {
-                    spriteComponent.spriteFrame = this.notSelectedSprite.spriteFrame
-                }
-            }
+                tween(optionNode)
+                .to(0.1, { scale: new Vec3(1.1, 1.1, 1.1) }) // 放大到原始大小的110%
+                .by(0.1, { position: new Vec3(5, 0, 0) }) // 向右移动5个单位
+                .by(0.1, { position: new Vec3(-10, 0, 0) }) // 向左移动10个单位
+                .by(0.1, { position: new Vec3(10, 0, 0) }) // 向右移动10个单位
+                .by(0.1, { position: new Vec3(-10, 0, 0) }) // 向左移动10个单位
+                .by(0.1, { position: new Vec3(5, 0, 0) }) // 向右移动5个单位回到原位置
+                .to(0.1, { scale: new Vec3(1, 1, 1) }) // 缩小回原始大小
+                .call(()=>{
+                    console.log("选中选项处理完成,处理下一个")
+                    gameCtr.storyActionStatus = 2
+                    gameCtr.processCtr.doneProcessing()
+                })
+                .start()
+            } 
         }
     }
-
-    selectedAction(optionNode: Node) {
-        tween(optionNode)
-            .to(0.1, { scale: new Vec3(1.1, 1.1, 1.1) }) // 放大到原始大小的110%
-            .by(0.1, { position: new Vec3(5, 0, 0) }) // 向右移动5个单位
-            .by(0.1, { position: new Vec3(-10, 0, 0) }) // 向左移动10个单位
-            .by(0.1, { position: new Vec3(10, 0, 0) }) // 向右移动10个单位
-            .by(0.1, { position: new Vec3(-10, 0, 0) }) // 向左移动10个单位
-            .by(0.1, { position: new Vec3(5, 0, 0) }) // 向右移动5个单位回到原位置
-            .to(0.1, { scale: new Vec3(1, 1, 1) }) // 缩小回原始大小
-            .start()
-    }
-
     private scaleUp(node: Node) {
         return tween(node).to(0.1, { scale: new Vec3(1.1, 1.1, 1.1) }) // 放大到原始大小的110%
     }

+ 1 - 1
assets/scripts/StoryPannelCtr.ts

@@ -94,7 +94,7 @@ export class StoryPannelCtr extends Component {
                 console.log("展示剧情处理完成,处理下一个")
 
                 this.processCtr.doneProcessing()
-                this.isOnProcess = false;
+
             }
 
         }

+ 60 - 52
assets/scripts/gameCtr.ts

@@ -77,7 +77,7 @@ export class GameCtr extends Component {
     private initOptionsPosition: Vec3 = null
 
     //剧情布局变化状态:0:展示剧情 ,1:出现选项框  2:已选选项下方展示剧情,3:已选移除剧情上移出现选项框
-    private storyActionStatus: number = 0
+    public storyActionStatus: number = 0
 
     //重启动画
     @property({ type: Label })
@@ -127,26 +127,27 @@ export class GameCtr extends Component {
     public bg2AudioSource: AudioSource = null!
     private isPlayBgm1 = true
 
-    public originUrl:string = null
-    public hostName:string = null
+    public originUrl: string = null
+    public hostName: string = null
 
-    private globalUrl:string = 'https://airpg1.izouma.com'
-    private globalHostname:string = 'airpg1.izouma.com'
+    private globalUrl: string = 'https://airpg1.izouma.com'
+    private globalHostname: string = 'airpg1.izouma.com'
 
-    private moveNum:number = 1
+    private moveNum: number = 1
+
+    private lastVote:number[] = [0,0,0,0]
 
     init() {
         //播放第一个背景音乐
         this.bg1AudioSource.play()
-        
+
         console.log(location.href)
-        
-        if(location.hostname === 'localhost')
-        {
+
+        if (location.hostname === 'localhost') {
             this.originUrl = this.globalUrl
             this.hostName = this.globalHostname
         }
-        else{
+        else {
             this.originUrl = location.origin
             this.hostName = location.hostname
         }
@@ -159,7 +160,7 @@ export class GameCtr extends Component {
             console.log("use defult roomId")
         }
 
-        
+
         const roomUrl = `${this.originUrl}/api/room/${this.roomId}`
         console.log(roomUrl)
         fetch(roomUrl)
@@ -290,7 +291,7 @@ export class GameCtr extends Component {
             })
     }
 
-    update(deltaTime: number) {}
+    update(deltaTime: number) { }
 
     onButtonClick() {
         //director.loadScene(director.getScene().name);
@@ -404,13 +405,37 @@ export class GameCtr extends Component {
 
             if (this.storyActionStatus === 0 || this.storyActionStatus === 3) {
                 this.optionsAppearAction()
+
+                //重置记票
+                this.lastVote = [0,0,0,0]
+            }else
+            {
+                console.log('handleOptions处理失败'+'   storyActionStatus'+this.storyActionStatus)
+                this.processCtr.doneProcessing()
             }
+
         } else {
             console.log('handleOptions处理完成处理下一个')
             this.processCtr.doneProcessing()
         }
     }
 
+     //处理投票进度
+     handleVotes(data: any) {
+        let vote:number[] = data.data
+        if (this.realStart  && Math.max(...vote) > 0 && JSON.stringify(this.lastVote) !== JSON.stringify(vote)) {
+
+                // console.log("this22222"+this+" processCtr!!!!!"+this.processCtr)
+                this.optionsCtr.showVotes(vote,this.lastVote, this.processCtr)
+                this.lastVote = vote
+        }
+        else {
+            console.log('handle votes do nothing:' + this.realStart + "    " + this.storyActionStatus + "    " + Math.max(...(data.data as number[])))
+            this.processCtr.doneProcessing()
+        }
+    }
+
+
     //处理收到被选项事件
     handleVoteResul(data: any) {
         if (this.realStart) {
@@ -424,9 +449,12 @@ export class GameCtr extends Component {
             if (this.storyActionStatus === 1) {
                 this.optionsAppearAction()
             }
+            else
+            {
+                console.log('handleVoteResul处理失败'+'   storyActionStatus'+this.storyActionStatus)
+            }
         } else {
-            console.log('handleVoteResul处理完成处理下一个')
-
+            console.log('handleVoteResul未处理')
             this.processCtr.doneProcessing()
         }
     }
@@ -449,7 +477,6 @@ export class GameCtr extends Component {
         this.roleNodes[data.data.name] = role
 
         console.log('handleNewPlayer处理完成处理下一个')
-
         this.processCtr.doneProcessing()
     }
 
@@ -466,13 +493,12 @@ export class GameCtr extends Component {
             console.log("处理开始前的status")
             this.historyInfo.push(data.data)
             this.updateGame(this.gameInfo, this.historyInfo)
-
             console.log('handleStateResul处理完成处理下一个')
 
             this.processCtr.doneProcessing()
 
         }
-        else{
+        else {
             console.log("处理开始后的status完成,处理下一个")
             this.processCtr.doneProcessing()
         }
@@ -482,24 +508,13 @@ export class GameCtr extends Component {
     //处理重置
     handleReset(data: any) {
         //director.reset()
+        console.log("处理重置消息")
+
         director.loadScene("game")
         this.processCtr.doneProcessing()
     }
 
-    //处理投票进度
-    handleVotes(data: any) {
-        if(this.realStart && this.storyActionStatus == 1 && Math.max(...(data.data as number[]))>0)
-        {
-            let votes:number[] = data.data
-            this.optionsCtr.showVotes(votes,this.processCtr)
-        }
-        else
-        {
-            console.log('handle votes do nothing:'+this.realStart+"    "+this.storyActionStatus+"    "+Math.max(...(data.data as number[])))
-            this.processCtr.doneProcessing()
-        }
-    }
-
+   
     //处理所有剧情、选项的移动逻辑
     optionsAppearAction() {
         console.log("storyActionStatus:" + this.storyActionStatus)
@@ -513,33 +528,27 @@ export class GameCtr extends Component {
                 tween(this.storyPannelCtr.node)
                     .by(0.5, { position: new Vec3(0, storyUI.height - this.storyHeight, 0) })
                     .call(() => {
-                        this.optionsCtr.setOptions(this.optionsLabel)
+                        this.optionsCtr.setOptions(this.optionsLabel,this)
 
-                        //此处需要额外处理死亡,因为前一步有演示播放攻击动画,不排除死亡名单中有攻击后自然死亡角色
+                        //此处需要额外处理死亡,因为前一步有演示播放攻击动画,不排除死亡名单中有攻击后自然死亡角色,最后一个死亡的没啥用,暂没处理
                         this.roleCtr.dealDeath(this.roleNodes)
                     })
                     .start()
             } else {
-                this.optionsCtr.setOptions(this.optionsLabel)
+                this.optionsCtr.setOptions(this.optionsLabel,this)
             }
 
 
             this.playShowOptionsOneShot()
-            console.log("展示选项处理完成,处理下一个")
-            this.processCtr.doneProcessing()
-            this.storyActionStatus = 1
+
         } else if (this.storyActionStatus === 1) {
             //选中备选项
             this.optionsCtr.resetVotes()
 
             console.log("selectedOptionNum:" + this.selectedOptionNum)
-            this.optionsCtr.selectOption(this.selectedOptionNum + 1)
             this.playSelectedOneShot()
-
-            console.log("选中选项处理完成,处理下一个")
-
-            this.processCtr.doneProcessing()
-            this.storyActionStatus = 2
+            this.optionsCtr.selectOption(this.selectedOptionNum + 1,this)
+            
         } else if (this.storyActionStatus === 2) {
             this.scheduleOnce(() => {
                 // 隐藏未被选中选项
@@ -604,12 +613,11 @@ export class GameCtr extends Component {
 
             //顶部备选项消失
             tween(selectedOption.getComponent(UIOpacity))
-                .to(0.5, { opacity: 0 })
+                .to(0.5, { opacity: 1 })
                 .call(() => {
                     //重置选项位置与透明度
                     this.optionsCtr.node.position = this.initOptionsPosition
-                    // this.optionsCtr.node.getComponent(UIOpacity).opacity = 0
-                    // this.optionsCtr.node.getChildByName()
+                    
 
                     // 这是被选中的选项
                     selectedOption.getChildByName("text_option").getComponent(Label).color = Color.WHITE
@@ -619,7 +627,7 @@ export class GameCtr extends Component {
                     if (spriteComponent) {
                         spriteComponent.spriteFrame = this.optionsCtr.notSelectedSprite.spriteFrame
                     }
-                   
+
                     //剧情上移开始展示
                     tween(this.storyPannelCtr.node)
                         .to(0.2, { position: new Vec3(0, 0, 0) })
@@ -627,8 +635,8 @@ export class GameCtr extends Component {
                             this.storyActionStatus = 0
                             this.optionsAppearAction()
 
-                            console.log("剧情上移处理完成,处理下一个")
-                            this.processCtr.doneProcessing()
+                            // console.log("剧情上移处理完成,处理下一个")
+                            // this.processCtr.doneProcessing()
                         })
                         .start()
                 })
@@ -647,7 +655,7 @@ export class GameCtr extends Component {
             //初始化剧情!!!
             //触发剧情框文字
             if (this.storyPannelCtr) {
-               // this.storyPannelCtr.updateStory(lastHistory.plot)
+                // this.storyPannelCtr.updateStory(lastHistory.plot)
             } else {
                 console.log("plot error")
             }
@@ -682,7 +690,7 @@ export class GameCtr extends Component {
                 this.roleNodes[this.player[i].name] = role
             }
 
-            
+
         } else {
             throw new Error("gameInfo or historyInfo is null")
         }