1.0.6线上版本 修改BUG

.laya/wxgame.json

@@ -64,5 +64,5 @@
     "forceCompile": false,
     "onlyIndexJS": true,
     "projectType": "ts",
-    "pubTime": 1584549010700
+    "pubTime": 1584605697201
 }

bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Grass.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.UnlitMaterial",
+		"type":"Laya.BlinnPhongMaterial",
 		"name":"grass",
 		"renderStates":[
 			{
@@ -17,7 +17,9 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":1.65,
+		"albedoIntensity":2,
+		"enableLighting":true,
+		"shininess":0.078125,
 		"textures":[
 			{
 				"name":"albedoTexture",
@@ -47,6 +49,15 @@
 				]
 			},
 			{
+				"name":"specularColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			},
+			{
 				"name":"albedoColor",
 				"value":[
 					0.8,

bin/js/bundle.js

@@ -1347,6 +1347,7 @@ var laya = (function (exports) {
           this.BossHp = Number(config[this.Id - 1].boss_HP);
           this.Goal = Number(config[this.Id - 1].goal);
           this.Modulus = Number(config[this.Id - 1].modulus);
+          this.isboss = Number(config[this.Id - 1].boss);
           let GradeArray = [];
           let num = 0;
           let stage = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
@@ -1425,6 +1426,7 @@ var laya = (function (exports) {
           GameManager.Instance.fencerightpos = 0;
           GameManager.Instance.treeleftpos = 0;
           GameManager.Instance.treerightpos = 0;
+          GameManager.Instance.GuideKill = 0;
           if (this.curstage)
               this.ClearStageResources();
           var level = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
@@ -1567,7 +1569,8 @@ var laya = (function (exports) {
               treepos += 3;
           }
           let STAGE = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
-          if (STAGE > 2) {
+          let boss = _stage.isboss == 1 ? true : false;
+          if (boss) {
               let EndZ = _stage.curgrades[_stage.curgrades.length - 1].endpointpoint.z * 1.2;
               let EndX = GameTools.RandomANumber(-2, 2);
               GameManager.Instance.CreatBoss(new Vector3$3(EndX, 0, EndZ));
@@ -1653,9 +1656,11 @@ var laya = (function (exports) {
           }
       }
       Show() {
+          WXSDK.AldEvent("进入游戏内界面");
           let stage = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
           if (stage == 1) {
-              this.Guide1.visible = false;
+              this.Guide1.visible = true;
+              this.ani1.play(0, true);
               this.Guide2.visible = false;
               this.Guide3.visible = false;
               this.Guide4.visible = false;
@@ -2050,7 +2055,6 @@ var laya = (function (exports) {
           else
               this.instance = ShopView.Instance;
           this._data = (this.selfobj.dataSource);
-          ShopView.Instance._data = this._data;
           var _id = this._data.id;
           var usingId = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"];
           var usingId2 = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"];
@@ -2060,30 +2064,45 @@ var laya = (function (exports) {
           this._skin.rotation = 0;
           if (usingId == _id || usingId2 == _id) {
               this.skinGetForType = SkinGetForType.Using;
-              this.ShowUi();
+              this.showui();
               return;
           }
           if (hasequip) {
               this.skinGetForType = SkinGetForType.Geted;
-              this.ShowUi();
+              this.showui();
               return;
           }
           if (require_type == 2) {
               this.skinGetForType = SkinGetForType.Bycoin;
-              this.ShowUi();
+              this.showui();
               return;
           }
           if (require_type == 4) {
               this.skinGetForType = SkinGetForType.GetByActivity;
-              this.ShowUi();
+              this.showui();
               return;
           }
           if (require_type == 3) {
               this.skinGetForType = SkinGetForType.GetByVideo;
-              this.ShowUi();
+              this.showui();
               return;
           }
       }
+      showui() {
+          var type = this.skinGetForType;
+          if (this._data.id == 1 || this._data.id == 50) {
+              this._select.visible = true;
+          }
+          else {
+              this._select.visible = false;
+          }
+          if (this.skinGetForType == SkinGetForType.Using) {
+              this.using.visible = true;
+          }
+          else {
+              this.using.visible = false;
+          }
+      }
       ShowUi() {
           var type = this.skinGetForType;
           this._select.visible = type == SkinGetForType.Using;
@@ -2123,6 +2142,7 @@ var laya = (function (exports) {
   class ShopView extends ui.SkinViewUI {
       constructor() {
           super();
+          this.firstopen = true;
           this.showroleId = 0;
           this.uiArr = [];
           this.CapArray = [];
@@ -2137,6 +2157,7 @@ var laya = (function (exports) {
           return ShopView.ins;
       }
       Show() {
+          WXSDK.AldEvent("打开皮肤商店界面");
           let data = AccountManager.Instance.curplayerData.GainCollocation("theme");
           for (let i = 0; i < data.length; i++) {
               if (i < 5) {
@@ -2167,7 +2188,7 @@ var laya = (function (exports) {
           this.uiArr.push(this.GetByActive);
           this.equip_Horse = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"];
           this.equip_Cap = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"];
-          this.showroleId = this.equip_Horse;
+          this.showroleId = 1;
           this.ItemList.selectEnable = false;
           this.ItemList.vScrollBarSkin = "";
           this.ItemList.renderHandler = Laya.Handler.create(this, this.UpdateItem, null, false);
@@ -2180,6 +2201,7 @@ var laya = (function (exports) {
           });
       }
       Close() {
+          WXSDK.AldEvent("关闭皮肤商城界面");
       }
       ClickClose() {
           var equiphorseid = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"]);
@@ -2202,6 +2224,13 @@ var laya = (function (exports) {
           this.ItemList.refresh();
       }
       ClickCap() {
+          this.firstopen = true;
+          if (this.equip_Cap) {
+              this.showroleId = this.equip_Cap;
+          }
+          else {
+              this.showroleId = 1;
+          }
           this.ShowButton(1);
           this.CharacterLightImage.visible = true;
           this.HorseLightImage.visible = false;
@@ -2210,6 +2239,8 @@ var laya = (function (exports) {
           this.ItemList.renderHandler = Laya.Handler.create(this, this.UpdateItem, null, false);
       }
       ClickHorse() {
+          this.firstopen = true;
+          this.showroleId = this.equip_Horse;
           this.ShowButton(2);
           this.CharacterLightImage.visible = false;
           this.HorseLightImage.visible = true;
@@ -2224,27 +2255,71 @@ var laya = (function (exports) {
       ShowButton(type) {
           if (type == 1) {
               var equipcap = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"]);
-              if (equipcap) {
-                  this.GetByCoin.visible = false;
-                  this.GetByVideo.visible = false;
-                  this.GetByActive.visible = false;
-                  this.Geted.visible = false;
-                  this.Using.visible = true;
+              var usingId = equipcap;
+              let item = this.CapArray[0].require_type;
+              this._data = this.CapArray[0];
+              var _id = this._data.id;
+              var hasequip = AccountManager.Instance.curplayerData.HasEquip(_id);
+              var require_type = item;
+              if (usingId == _id) {
+                  this.skinGetForType = SkinGetForType.Using;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
               }
-              else {
-                  this.GetByCoin.visible = false;
-                  this.GetByVideo.visible = false;
-                  this.GetByActive.visible = false;
-                  this.Geted.visible = false;
-                  this.Using.visible = false;
+              if (hasequip) {
+                  this.skinGetForType = SkinGetForType.Geted;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 2) {
+                  this.skinGetForType = SkinGetForType.Bycoin;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 4) {
+                  this.skinGetForType = SkinGetForType.GetByActivity;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 3) {
+                  this.skinGetForType = SkinGetForType.GetByVideo;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
               }
           }
           else {
-              this.GetByCoin.visible = false;
-              this.GetByVideo.visible = false;
-              this.GetByActive.visible = false;
-              this.Geted.visible = false;
-              this.Using.visible = true;
+              var equiphorse = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"]);
+              var usingId = equiphorse;
+              let item = this.HorseArray[0].require_type;
+              this._data = this.HorseArray[0];
+              var _id = this._data.id;
+              var hasequip = AccountManager.Instance.curplayerData.HasEquip(_id);
+              var require_type = item;
+              if (usingId == _id) {
+                  this.skinGetForType = SkinGetForType.Using;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (hasequip) {
+                  this.skinGetForType = SkinGetForType.Geted;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 2) {
+                  this.skinGetForType = SkinGetForType.Bycoin;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 4) {
+                  this.skinGetForType = SkinGetForType.GetByActivity;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
+              if (require_type == 3) {
+                  this.skinGetForType = SkinGetForType.GetByVideo;
+                  this.RefreshButton(this.skinGetForType);
+                  return;
+              }
           }
       }
       ClickGet() {
@@ -2354,6 +2429,7 @@ var laya = (function (exports) {
       BuySuccess(data) {
           WXSDK.AldEvent("购买" + this._data.name + "成功");
           this.RefreshItem();
+          this.RefreshButton(SkinGetForType.Using);
           console.log("购买suc:" + JSON.stringify(data));
       }
       BuyFail(data) {
@@ -2464,6 +2540,7 @@ var laya = (function (exports) {
           });
       }
       Close() {
+          WXSDK.AldEvent("关闭皮肤试用界面");
       }
       ClickClose() {
           var agrs = [{ "t": AccountManager.Instance.ServerTime.toString() }];
@@ -2504,7 +2581,6 @@ var laya = (function (exports) {
           });
       }
       Complete(_data) {
-          WXSDK.AldEvent("关闭皮肤试用界面");
           ShopScene.Instance.CloseShop();
           ViewManager.Instance.ShowView(ViewType.IngameView);
           let stage = AccountManager.Instance.curplayerData.GainAccount("stage");
@@ -2577,6 +2653,7 @@ var laya = (function (exports) {
       Init(_data) {
           switch (_data) {
               case 1:
+                  WXSDK.AldEvent("打开胜利界面");
                   this.loseimage.visible = false;
                   this.reviveimage.visible = false;
                   this.NoBtn.visible = false;
@@ -2585,6 +2662,7 @@ var laya = (function (exports) {
                   this.NextLevelBtn.clickHandler = Laya.Handler.create(this, this.NextLevel, [true]);
                   break;
               case 2:
+                  WXSDK.AldEvent("打开失败界面");
                   this.winimage.visible = false;
                   this.reviveimage.visible = false;
                   this.NoBtn.visible = false;
@@ -2593,6 +2671,7 @@ var laya = (function (exports) {
                   this.TryAgainBtn.clickHandler = Laya.Handler.create(this, this.TryAgain, [false]);
                   break;
               case 3:
+                  WXSDK.AldEvent("打开结算界面");
                   this.winimage.visible = false;
                   this.loseimage.visible = false;
                   this.NextLevelBtn.visible = false;
@@ -2689,6 +2768,7 @@ var laya = (function (exports) {
 
   class ExportView extends ui.ExportViewUI {
       OnOpen(data) {
+          WXSDK.AldEvent("打开全屏幕导出界面");
           this.CloseExportBtn.clickHandler = Laya.Handler.create(this, this.ClickClose, [data]);
           this.SetData();
           this.height = Laya.stage.height;
@@ -2698,6 +2778,7 @@ var laya = (function (exports) {
       }
       OnHide() {
           Laya.timer.clearAll(this);
+          WXSDK.AldEvent("关闭全屏导出界面");
       }
       ClickClose(data) {
           ViewManager.Instance.ClosePopView(ViewType.ExportView);
@@ -3485,8 +3566,6 @@ var laya = (function (exports) {
               this.m_npcanimator.play("dierear");
           }
           this.canmove = false;
-          GameManager.Instance.KillNum++;
-          InGameView.Instance.InitUI();
       }
       PiaoZi() {
           let headshoot = new Laya.Image();
@@ -3923,8 +4002,6 @@ var laya = (function (exports) {
           this.die = true;
           AudioManager.playMusic(MusicType.die);
           this.PiaoZi();
-          GameManager.Instance.KillNum++;
-          InGameView.Instance.InitUI();
           this.isdead = true;
           EventManager.StageOff(StageState.Start, this, this.Begin);
           if (this.frontdie) {
@@ -3980,6 +4057,58 @@ var laya = (function (exports) {
       }
   }
 
+  class Dictionary {
+      constructor() {
+          this.keys = new Array();
+          this.values = new Array();
+      }
+      get count() {
+          return this.keys.length;
+      }
+      add(key, value) {
+          let index = this.keys.indexOf(key);
+          if (index == -1) {
+              this.keys.push(key);
+              this.values.push(value);
+          }
+          else {
+              this.values[index] = value;
+          }
+      }
+      remove(key) {
+          let index = this.keys.indexOf(key);
+          if (index != -1) {
+              this.keys.splice(index, 1);
+              this.values.splice(index, 1);
+          }
+      }
+      getValue(key) {
+          let index = this.keys.indexOf(key);
+          if (index != -1) {
+              return this.values[index];
+          }
+          return null;
+      }
+      containKey(key) {
+          let index = this.keys.indexOf(key);
+          if (index != -1) {
+              return true;
+          }
+          return false;
+      }
+      containValue(value) {
+          let index = this.values.indexOf(value);
+          if (index != -1) {
+              return true;
+          }
+          return false;
+      }
+      clear() {
+          this.keys.length = 0;
+          this.values.length = 0;
+      }
+  }
+
   var Vector3$7 = Laya.Vector3;
   var BossState;
   (function (BossState) {
@@ -4000,6 +4129,7 @@ var laya = (function (exports) {
           this.BossSpeed = 1;
           this.CreatGround = false;
           this.randomdir = false;
+          this.ArrowList = new Dictionary();
           this.currotV = new Vector3$7();
           this.currot = new Laya.Quaternion;
           this.NormalizeSpeed = new Vector3$7();
@@ -4080,6 +4210,16 @@ var laya = (function (exports) {
               Laya.timer.once(2000, this, this.RandomDir);
           }
           this.RayCheck();
+          if (this.ArrowList != null) {
+              var keys = this.ArrowList.keys;
+              for (var i = 0; i < keys.length; i++) {
+                  var key = keys[i];
+                  if (keys[i] != null) {
+                      var value = this.ArrowList.getValue(keys[i]);
+                      this.ArrowMove(key, (this.ArrowList.getValue(key))[0], (this.ArrowList.getValue(key))[1]);
+                  }
+              }
+          }
       }
       TurnDir(_dir) {
           if (_dir.x != 0) {
@@ -4173,6 +4313,8 @@ var laya = (function (exports) {
       }
       Shoot() {
           this.CreatArrow();
+          var currect = this.m_arrow;
+          this.m_arrow = null;
           let ray = this.owner.getChildByName("raypos").getChildAt(0);
           let forw = Transform3DHelper.getForward(ray.transform);
           let raypos = this.owner.getChildByName("raypos");
@@ -4182,15 +4324,15 @@ var laya = (function (exports) {
           this.m_bossanimator.play("shoot");
           if (AssetManager.Instance.mainscene.physicsSimulation.rayCast(testRay, hitRes)) {
               let target = hitRes.collider.owner.parent;
-              Laya.timer.frameLoop(1, this, this.ArrowMove, [this.m_arrow, forw, target]);
+              this.ArrowList.add(currect, [forw, target]);
           }
           else {
-              Laya.timer.frameLoop(1, this, this.ArrowMove, [this.m_arrow, forw]);
+              this.ArrowList.add(currect, [forw, null]);
           }
       }
       ArrowMove(arrow, _dir, target) {
           if (target) {
-              if (this.m_arrow.destroyed)
+              if (arrow.destroyed)
                   return;
               if (arrow.transform.position.z <= target.transform.position.z) {
                   if (target.name == "player") {
@@ -4198,7 +4340,9 @@ var laya = (function (exports) {
                       _runner.isdead = true;
                       this.BossProgress.visible = false;
                   }
-                  Laya.timer.clear(this, this.ArrowMove);
+                  if (this.ArrowList.containKey(arrow)) {
+                      this.ArrowList.remove(arrow);
+                  }
                   GamePool.Instance.RecoveryModel(arrow);
               }
               else {
@@ -4220,7 +4364,9 @@ var laya = (function (exports) {
               if (!this.recover) {
                   this.recover = true;
                   Laya.timer.once(1000, this, () => {
-                      Laya.timer.clear(this, this.ArrowMove);
+                      if (this.ArrowList.containKey(arrow)) {
+                          this.ArrowList.remove(arrow);
+                      }
                       GamePool.Instance.RecoveryModel(arrow);
                       this.recover = false;
                   });
@@ -4367,58 +4513,6 @@ var laya = (function (exports) {
       }
   }
 
-  class Dictionary {
-      constructor() {
-          this.keys = new Array();
-          this.values = new Array();
-      }
-      get count() {
-          return this.keys.length;
-      }
-      add(key, value) {
-          let index = this.keys.indexOf(key);
-          if (index == -1) {
-              this.keys.push(key);
-              this.values.push(value);
-          }
-          else {
-              this.values[index] = value;
-          }
-      }
-      remove(key) {
-          let index = this.keys.indexOf(key);
-          if (index != -1) {
-              this.keys.splice(index, 1);
-              this.values.splice(index, 1);
-          }
-      }
-      getValue(key) {
-          let index = this.keys.indexOf(key);
-          if (index != -1) {
-              return this.values[index];
-          }
-          return null;
-      }
-      containKey(key) {
-          let index = this.keys.indexOf(key);
-          if (index != -1) {
-              return true;
-          }
-          return false;
-      }
-      containValue(value) {
-          let index = this.values.indexOf(value);
-          if (index != -1) {
-              return true;
-          }
-          return false;
-      }
-      clear() {
-          this.keys.length = 0;
-          this.values.length = 0;
-      }
-  }
-
   var Vector3$8 = Laya.Vector3;
   var CharacterState;
   (function (CharacterState) {
@@ -4734,10 +4828,12 @@ var laya = (function (exports) {
                                   else if (target.name == "npcrearcollider") {
                                       _npcrunner.reardie = true;
                                   }
+                                  GameManager.Instance.KillNum++;
+                                  InGameView.Instance.InitUI();
                               }
                           }
                           else if (stage == 2) {
-                              if (InGameView.Instance.Guide2.visible || GameManager.Instance.GuideKill >= 2) {
+                              if (InGameView.Instance.Guide2.visible || GameManager.Instance.GuideKill == 1) {
                                   if (target.name == "npcfrontcollider") {
                                       _npcrunner.frontdie = true;
                                   }
@@ -4745,6 +4841,8 @@ var laya = (function (exports) {
                                       _npcrunner.reardie = true;
                                   }
                               }
+                              GameManager.Instance.KillNum++;
+                              InGameView.Instance.InitUI();
                           }
                           else if (stage > 2) {
                               if (target.name == "npcfrontcollider") {
@@ -4753,13 +4851,15 @@ var laya = (function (exports) {
                               else if (target.name == "npcrearcollider") {
                                   _npcrunner.reardie = true;
                               }
+                              GameManager.Instance.KillNum++;
+                              InGameView.Instance.InitUI();
                           }
                           WXSDK.Shake(true);
                           WXSDK.stageShake();
                       }
                       else if (_chaseNpc) {
                           if (this.stage == 2) {
-                              if (InGameView.Instance.Guide4.visible && GameManager.Instance.GuideKill >= 2) {
+                              if (InGameView.Instance.Guide4.visible && GameManager.Instance.GuideKill >= 1) {
                                   InGameView.Instance.Guide4.visible = false;
                                   WXSDK.AldEvent("完成第四阶段引导");
                                   this.started = true;
@@ -4772,6 +4872,8 @@ var laya = (function (exports) {
                                   else if (target.name == "npcrearcollider") {
                                       _chaseNpc.reardie = true;
                                   }
+                                  GameManager.Instance.KillNum++;
+                                  InGameView.Instance.InitUI();
                               }
                           }
                           else {
@@ -4781,6 +4883,8 @@ var laya = (function (exports) {
                               else if (target.name == "npcrearcollider") {
                                   _chaseNpc.reardie = true;
                               }
+                              GameManager.Instance.KillNum++;
+                              InGameView.Instance.InitUI();
                           }
                           WXSDK.Shake(true);
                           WXSDK.stageShake();
@@ -4941,6 +5045,7 @@ var laya = (function (exports) {
           }
       }
       Init(_player) {
+          this.win = false;
           this.Player = _player;
           this.arrowpos = _player.getChildByName("arrowpos");
           let runner = this.Player.getComponent(Runner);
@@ -4966,6 +5071,13 @@ var laya = (function (exports) {
                   Laya.timer.clear(this, this.CheckWin);
               }
           }
+          else if (this.stage > 2 && StageControl.Instance.curstage.isboss == 0) {
+              if (this.Player.transform.position.z >= StageControl.Instance.curstage.endposition.z * 1.2 && !this.win) {
+                  this.win = true;
+                  EventManager.StageTrigger(StageState.Win);
+                  Laya.timer.clear(this, this.CheckWin);
+              }
+          }
       }
       onMouseDown(e) {
           if (!this._runner.canmove)

release/wxgame/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/grass.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.UnlitMaterial",
+		"type":"Laya.BlinnPhongMaterial",
 		"name":"grass",
 		"renderStates":[
 			{
@@ -17,7 +17,9 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":1.65,
+		"albedoIntensity":2,
+		"enableLighting":true,
+		"shininess":0.078125,
 		"textures":[
 			{
 				"name":"albedoTexture",
@@ -47,6 +49,15 @@
 				]
 			},
 			{
+				"name":"specularColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			},
+			{
 				"name":"albedoColor",
 				"value":[
 					0.8,

release/wxgame/game.json

@@ -1,18 +1,18 @@
 {"deviceOrientation":"portrait","showStatusBar":false,"networkTimeout":{"request":10000,"connectSocket":10000,"uploadFile":10000,"downloadFile":10000},"navigateToMiniProgramAppIdList": [
-    "wxcc0126aec244ce23",
-    "wxd5161145dd3797f2",
-    "wx5e71fcc7fb186ec0",
-    "wxada61237808de0af",
-    "wx03a244e459c87a73",
-    "wx3e23486cb9075bbc",
-    "wx904eeeea084d32c2",
-    "wxc7a7412730d42ece",
-    "wx529203a9f43b2f2a",
-    "wx6711b91a46e7ee0b"
-  ],
-  "subpackages": [
-    {
-      "name": "Game",
-      "root": "Game/res"
-    }
-  ]}
+  "wxcc0126aec244ce23",
+  "wxd5161145dd3797f2",
+  "wx5e71fcc7fb186ec0",
+  "wxada61237808de0af",
+  "wx03a244e459c87a73",
+  "wx3e23486cb9075bbc",
+  "wx904eeeea084d32c2",
+  "wxc7a7412730d42ece",
+  "wx529203a9f43b2f2a",
+  "wx6711b91a46e7ee0b"
+],
+"subpackages": [
+  {
+    "name": "Game",
+    "root": "Game/res"
+  }
+]}

src/Game/Boss.ts

@@ -11,6 +11,7 @@ import { EventManager, StageState } from "../Tools/EventManager";
 import { GameManager } from "./GameManager";
 import InGameView from "../View/InGameView";
 import { WXSDK } from "../Net/WXSDK";
+import Dictionary from "../Tools/Dictionary";
 export enum BossState{Idle,Run,Die,Walk};
 export class Boss extends Laya.Script{
     private static ins:Boss;
@@ -75,6 +76,8 @@ export class Boss extends Laya.Script{
     //随机方向
     private randomdir:boolean = false;
 
+    private ArrowList:Dictionary<Sprite3D,any[]>=new Dictionary();
+
     onAwake(){
         this.m_bossmodel = this.owner as Laya.Sprite3D;
         this.m_horsemodel = this.m_bossmodel.parent as Laya.Sprite3D;
@@ -133,6 +136,21 @@ export class Boss extends Laya.Script{
             Laya.timer.once(2000,this,this.RandomDir);
         }
         this.RayCheck();
+
+        if(this.ArrowList!=null)
+        {
+            var keys=this.ArrowList.keys;
+
+            for(var i=0;i<keys.length;i++)
+            {
+                var key=keys[i];
+                if(keys[i]!=null)
+                {
+                    var value=this.ArrowList.getValue(keys[i]);
+                    this.ArrowMove(key,(this.ArrowList.getValue(key))[0],(this.ArrowList.getValue(key))[1]);
+                }
+            }
+        }
     }
 
     currotV = new Vector3();
@@ -258,6 +276,8 @@ export class Boss extends Laya.Script{
     /**boss射击 */
     Shoot(){
         this.CreatArrow();
+        var currect=this.m_arrow;
+        this.m_arrow=null;
         let ray = this.owner.getChildByName("raypos").getChildAt(0) as Laya.Sprite3D;
         let forw = Transform3DHelper.getForward(ray.transform);
         let raypos = this.owner.getChildByName("raypos") as Laya.Sprite3D;
@@ -267,10 +287,13 @@ export class Boss extends Laya.Script{
         this.m_bossanimator.play("shoot");
         if(AssetManager.Instance.mainscene.physicsSimulation.rayCast(testRay,hitRes)){
             let target = hitRes.collider.owner.parent as Laya.Sprite3D;
-            Laya.timer.frameLoop(1,this,this.ArrowMove,[this.m_arrow,forw,target]);
+            // Laya.timer.frameLoop(1,this,this.ArrowMove,[this.m_arrow,forw,target]);
+            this.ArrowList.add(currect,[forw,target]);
+            
         }
         else{
-            Laya.timer.frameLoop(1,this,this.ArrowMove,[this.m_arrow,forw])
+            // Laya.timer.frameLoop(1,this,this.ArrowMove,[this.m_arrow,forw])
+            this.ArrowList.add(currect,[forw,null]);
         }
     }
     recover = false;
@@ -280,15 +303,19 @@ export class Boss extends Laya.Script{
      //箭的移动
      ArrowMove(arrow:Laya.Sprite3D,_dir:Vector3,target?){
         if (target) {
-            if (this.m_arrow.destroyed) return;
+            if (arrow.destroyed) return;
             if (arrow.transform.position.z <= target.transform.position.z) {
                 if(target.name == "player"){
                     let _runner = target.getComponent(Runner) as Runner;
                     _runner.isdead = true;
                     this.BossProgress.visible = false;
                 }
-                Laya.timer.clear(this, this.ArrowMove);
+                if(this.ArrowList.containKey(arrow))
+                    {
+                        this.ArrowList.remove(arrow);
+                    }
                 GamePool.Instance.RecoveryModel(arrow);
+
             }
             else {
                 var sp = GameTools.Instance.lerp(this.speed, this.m_arrowspeed, 0.1);
@@ -309,7 +336,10 @@ export class Boss extends Laya.Script{
             if(!this.recover){
                 this.recover = true;
                 Laya.timer.once(1000, this, () => {
-                    Laya.timer.clear(this, this.ArrowMove);
+                    if(this.ArrowList.containKey(arrow))
+                    {
+                        this.ArrowList.remove(arrow);
+                    }
                     GamePool.Instance.RecoveryModel(arrow);
                     this.recover = false;
                 })

src/Game/ChaseNpc.ts

@@ -204,8 +204,8 @@ export class ChaseNpc extends Laya.Script{
         this.die = true;
         AudioManager.playMusic(MusicType.die);
         this.PiaoZi();
-        GameManager.Instance.KillNum++;
-        InGameView.Instance.InitUI();
+        // GameManager.Instance.KillNum++;
+        // InGameView.Instance.InitUI();
         this.isdead = true;
         EventManager.StageOff(StageState.Start,this,this.Begin);
         // Laya.timer.clearAll(this);

src/Game/NpcRunner.ts

@@ -220,8 +220,8 @@ export class NpcRunner extends Laya.Script{
             this.m_npcanimator.play("dierear");
         }
         this.canmove = false;
-        GameManager.Instance.KillNum++;
-        InGameView.Instance.InitUI();
+        // GameManager.Instance.KillNum++;
+        // InGameView.Instance.InitUI();
     }
     PiaoZi(){
         let headshoot = new Laya.Image();

src/Game/PlayerControl.ts

@@ -42,6 +42,7 @@ export class PlayerControl{
         }
     }
     Init(_player:Laya.Sprite3D){
+        this.win = false;
         this.Player = _player;
         this.arrowpos = _player.getChildByName("arrowpos") as Laya.Sprite3D;
         let runner = this.Player.getComponent(Runner) as Runner;
@@ -78,8 +79,14 @@ export class PlayerControl{
                 Laya.timer.clear(this,this.CheckWin);
             }
         }
+        else if(this.stage>2 && StageControl.Instance.curstage.isboss == 0){
+            if(this.Player.transform.position.z>= StageControl.Instance.curstage.endposition.z*1.2 && !this.win){
+                this.win = true;
+                EventManager.StageTrigger(StageState.Win);
+                Laya.timer.clear(this,this.CheckWin);
+            }
+        }
     }
-
     first = false;
     onMouseDown(e: Laya.Event) {
         if(!this._runner.canmove)return;

src/Game/Runner.ts

@@ -16,6 +16,7 @@ import { AudioManager, MusicType } from "../Tools/AudioManager";
 import ResDic from "../Tools/ResDic";
 import Dictionary from "../Tools/Dictionary";
 import { WXSDK } from "../Net/WXSDK";
+import MainGameView from "../View/MainGameView";
 //人物状态
 export enum CharacterState{Run,Idle,Die,Win,Shoot,Walk,Revive}
 export class Runner extends Laya.Script3D{
@@ -414,11 +415,13 @@ export class Runner extends Laya.Script3D{
                                 else if (target.name == "npcrearcollider") {
                                     _npcrunner.reardie = true;
                                 }
+                                GameManager.Instance.KillNum ++ ;
+                                InGameView.Instance.InitUI();
                             }
                         }
                         //指引提示出现之前 保证敌人不被击中
                         else if(stage == 2){
-                            if(InGameView.Instance.Guide2.visible || GameManager.Instance.GuideKill>=2){
+                            if(InGameView.Instance.Guide2.visible || GameManager.Instance.GuideKill==1){
                                 if (target.name == "npcfrontcollider") {
                                     _npcrunner.frontdie = true;
                                 }
@@ -426,6 +429,8 @@ export class Runner extends Laya.Script3D{
                                     _npcrunner.reardie = true;
                                 }
                             }
+                            GameManager.Instance.KillNum ++ ;
+                            InGameView.Instance.InitUI();
                         }
                         else if(stage >2){
                             if (target.name == "npcfrontcollider") {
@@ -434,13 +439,15 @@ export class Runner extends Laya.Script3D{
                             else if (target.name == "npcrearcollider") {
                                 _npcrunner.reardie = true;
                             }
+                            GameManager.Instance.KillNum ++ ;
+                            InGameView.Instance.InitUI();
                         }
                         WXSDK.Shake(true);
                         WXSDK.stageShake();
                     }
                     else if (_chaseNpc) {
                         if(this.stage == 2){
-                            if(InGameView.Instance.Guide4.visible && GameManager.Instance.GuideKill >= 2){
+                            if(InGameView.Instance.Guide4.visible && GameManager.Instance.GuideKill >= 1){
                                 InGameView.Instance.Guide4.visible = false;
                                 WXSDK.AldEvent("完成第四阶段引导");
                                 this.started = true;
@@ -453,6 +460,8 @@ export class Runner extends Laya.Script3D{
                                 else if (target.name == "npcrearcollider") {
                                     _chaseNpc.reardie = true;
                                 }
+                                GameManager.Instance.KillNum ++ ;
+                                InGameView.Instance.InitUI();
                             }
                         }
                         else{
@@ -462,6 +471,8 @@ export class Runner extends Laya.Script3D{
                             else if (target.name == "npcrearcollider") {
                                 _chaseNpc.reardie = true;
                             }
+                            GameManager.Instance.KillNum ++ ;
+                            InGameView.Instance.InitUI();
                         }
                         WXSDK.Shake(true);
                         WXSDK.stageShake();

src/Game/StageControl.ts

@@ -54,6 +54,7 @@ export class StageControl{
         GameManager.Instance.fencerightpos = 0;
         GameManager.Instance.treeleftpos = 0;
         GameManager.Instance.treerightpos = 0;
+        GameManager.Instance.GuideKill = 0;
 
         if(this.curstage)this.ClearStageResources();
         var level = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
@@ -218,10 +219,11 @@ export class StageControl{
 
             treepos += 3;
         }
-
+  
         let STAGE = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
+        let boss = _stage.isboss == 1?true:false;
         //创建boss
-        if(STAGE>2){
+        if(boss){
             let EndZ =_stage.curgrades[_stage.curgrades.length-1].endpointpoint.z*1.2;
             let EndX = GameTools.RandomANumber(-2,2);
             GameManager.Instance.CreatBoss(new Vector3(EndX,0,EndZ));

src/Game/StageCreat.ts

@@ -408,7 +408,7 @@ export class GK
     spr:Sprite3D;
     scenery:number;
     endposition:Vector3;
-
+    isboss:number;
     ChooseGrade:number[] = [];
     GetGrade()
     {
@@ -422,6 +422,7 @@ export class GK
         this.BossHp = Number(config[this.Id-1].boss_HP);
         this.Goal = Number(config[this.Id-1].goal);
         this.Modulus = Number(config[this.Id-1].modulus);
+        this.isboss = Number(config[this.Id-1].boss);
         let GradeArray = [];
         let num = 0;
         let stage = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));

src/Tools/ShopItem.ts

@@ -57,47 +57,60 @@ export default class  ShopItem extends Laya.Script{
         if(any)this.instance=any;
         else this.instance=ShopView.Instance;
         this._data = (this.selfobj.dataSource);
-        ShopView.Instance._data = this._data;
+        // ShopView.Instance._data = this._data;
         var _id = this._data.id;
+        
         var usingId = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"];
         var usingId2 = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"];
         var hasequip = AccountManager.Instance.curplayerData.HasEquip(_id);
         var require_type = this._data.require_type;
         this._skin.skin = "Game/res/Skin/" + this._data.icon + ".png";
         this._skin.rotation = 0;
-        // if (usingId == _id || usingId2 == _id) {
-        //     this.skinGetForType = SkinGetForType.Using;
-        //     this.ShowUi();
-        //     return;
-        // }
         if (usingId == _id || usingId2 == _id) {
             this.skinGetForType = SkinGetForType.Using;
-            this.ShowUi();
+            this.showui();
             return;
         }
         if (hasequip) {
             this.skinGetForType = SkinGetForType.Geted;
-            this.ShowUi();
+            this.showui();
             return;
         }
         if (require_type == 2) {
             this.skinGetForType = SkinGetForType.Bycoin;
-            this.ShowUi();
+            this.showui();
             return;
         }
         if (require_type == 4 ) {
             this.skinGetForType = SkinGetForType.GetByActivity;
-            this.ShowUi();
+            this.showui();
             return;
         }
         if (require_type == 3) {
             this.skinGetForType = SkinGetForType.GetByVideo;
-            // this.videoNum.text = AccountManager.Instance.curplayerData.GetProgress(_id) + "/" + this._data.require_num;
-            this.ShowUi();
+            this.showui();
             return;
         }
     }
 
+    
+    showui(){
+        var type = this.skinGetForType;
+        if(this._data.id == 1 || this._data.id == 50){
+            this._select.visible = true;
+        }
+        else{
+            this._select.visible = false;
+        }
+        // this._select.visible = type == SkinGetForType.Using;
+        if(this.skinGetForType == SkinGetForType.Using){
+            this.using.visible = true;
+        }
+        else{
+            this.using.visible = false;
+        }
+    }
+
     ShowUi() {
         var type = this.skinGetForType;
         this._select.visible = type == SkinGetForType.Using;

src/View/CompleteView.ts

@@ -44,6 +44,7 @@ export default class CompleteView extends ui.CompleteViewUI{
     Init(_data){
         switch (_data) {
             case 1:
+                WXSDK.AldEvent("打开胜利界面");
                 this.loseimage.visible = false;
                 this.reviveimage.visible = false;
                 this.NoBtn.visible = false;
@@ -52,6 +53,7 @@ export default class CompleteView extends ui.CompleteViewUI{
                 this.NextLevelBtn.clickHandler = Laya.Handler.create(this, this.NextLevel,[true]);
                 break;
             case 2:
+                WXSDK.AldEvent("打开失败界面");
                 this.winimage.visible = false;
                 this.reviveimage.visible = false;
                 this.NoBtn.visible = false;
@@ -60,6 +62,7 @@ export default class CompleteView extends ui.CompleteViewUI{
                 this.TryAgainBtn.clickHandler = Laya.Handler.create(this,this.TryAgain,[false]);
                 break;
             case 3:
+                WXSDK.AldEvent("打开结算界面");
                 this.winimage.visible = false;
                 this.loseimage.visible = false;
                 this.NextLevelBtn.visible = false;

src/View/ExportView.ts

@@ -2,9 +2,11 @@ import { ui } from "../ui/layaMaxUI";
 // import { ZSSdk } from "../Net/ZSSdk";
 import { ViewManager, ViewType } from "./ViewManager";
 import { SDKZS } from "../Net/SDKZS";
+import { WXSDK } from "../Net/WXSDK";
 
 export default class ExportView extends ui.ExportViewUI{
     OnOpen(data?){
+        WXSDK.AldEvent("打开全屏幕导出界面");
         this.CloseExportBtn.clickHandler = Laya.Handler.create(this,this.ClickClose,[data]);
         this.SetData();
         this.height = Laya.stage.height;
@@ -15,6 +17,7 @@ export default class ExportView extends ui.ExportViewUI{
     }
     OnHide(){
         Laya.timer.clearAll(this);
+        WXSDK.AldEvent("关闭全屏导出界面");
     }
     ClickClose(data?){
         ViewManager.Instance.ClosePopView(ViewType.ExportView);

src/View/InGameView.ts

@@ -4,6 +4,7 @@ import { AccountManager } from "../Net/AccountManager";
 import { StageControl } from "../Game/StageControl";
 import { GameManager } from "../Game/GameManager";
 import { SDKZS } from "../Net/SDKZS";
+import { WXSDK } from "../Net/WXSDK";
 export default class InGameView extends ui.InGameViewUI implements SC{
     private static ins:InGameView;
     public goaltext:Laya.Text;
@@ -20,10 +21,11 @@ export default class InGameView extends ui.InGameViewUI implements SC{
         }
     }
     Show(){
+        WXSDK.AldEvent("进入游戏内界面");
         let stage = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
         if(stage == 1){
-            this.Guide1.visible = false;
-            // this.ani1.play(0,true);
+            this.Guide1.visible = true;
+            this.ani1.play(0,true);
             this.Guide2.visible = false;
             this.Guide3.visible = false;
             this.Guide4.visible = false;

src/View/ShopView.ts

@@ -30,7 +30,8 @@ export default class ShopView extends ui.SkinViewUI{
         }
         return ShopView.ins
     }
-
+    //首次打开皮肤界面
+    firstopen:boolean = true;
     equip_Cap:number;
     equip_Horse:number;
     showroleId:number = 0;
@@ -53,6 +54,7 @@ export default class ShopView extends ui.SkinViewUI{
     //马数据源
     private HorseArray = [];
     Show(){
+        WXSDK.AldEvent("打开皮肤商店界面")
         let data = AccountManager.Instance.curplayerData.GainCollocation("theme");
         for (let i = 0; i < data.length; i++) {
             if(i<5){
@@ -86,7 +88,7 @@ export default class ShopView extends ui.SkinViewUI{
 
         this.equip_Horse = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"];
         this.equip_Cap = AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"];
-        this.showroleId = this.equip_Horse;
+        this.showroleId = 1;
 
         this.ItemList.selectEnable = false;
         this.ItemList.vScrollBarSkin = "";
@@ -102,7 +104,7 @@ export default class ShopView extends ui.SkinViewUI{
         })
     }
     Close(){
-
+        WXSDK.AldEvent("关闭皮肤商城界面");
     }
     ClickClose(){
         var equiphorseid = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"]);
@@ -126,6 +128,13 @@ export default class ShopView extends ui.SkinViewUI{
     }
     //点击帽子选项
     ClickCap(){
+        this.firstopen = true;
+        if(this.equip_Cap){
+            this.showroleId = this.equip_Cap;
+        }
+        else{
+            this.showroleId = 1;
+        }
         this.ShowButton(1);
         this.CharacterLightImage.visible = true;
         this.HorseLightImage.visible = false;
@@ -135,6 +144,8 @@ export default class ShopView extends ui.SkinViewUI{
     }
     //点击马选项
     ClickHorse(){
+        this.firstopen = true;
+        this.showroleId = this.equip_Horse;
         this.ShowButton(2);
         this.CharacterLightImage.visible = false;
         this.HorseLightImage.visible = true;
@@ -149,29 +160,102 @@ export default class ShopView extends ui.SkinViewUI{
     ShowButton(type:number){//1帽子 2.马
         if(type == 1){
             var equipcap = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["1"]);
-            if(equipcap){
-                this.GetByCoin.visible = false;
-                this.GetByVideo.visible = false;
-                this.GetByActive.visible = false;
-                this.Geted.visible = false;
-                this.Using.visible = true;
+            var usingId = equipcap;
+            
+            let item = this.CapArray[0].require_type;
+            this._data = this.CapArray[0];
+            var _id = this._data.id;
+            var hasequip = AccountManager.Instance.curplayerData.HasEquip(_id);
+            var require_type = item;
+
+            if (usingId == _id ) {
+                this.skinGetForType = SkinGetForType.Using;
+                this.RefreshButton(this.skinGetForType);
+                return;
             }
-            else{
-                this.GetByCoin.visible = false;
-                this.GetByVideo.visible = false;
-                this.GetByActive.visible = false;
-                this.Geted.visible = false;
-                this.Using.visible = false;
-            } 
+            if (hasequip) {
+                this.skinGetForType = SkinGetForType.Geted;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 2) {
+                this.skinGetForType = SkinGetForType.Bycoin;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 4 ) {
+                this.skinGetForType = SkinGetForType.GetByActivity;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 3) {
+                this.skinGetForType = SkinGetForType.GetByVideo;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            // if(equipcap){
+            //     this.GetByCoin.visible = false;
+            //     this.GetByVideo.visible = false;
+            //     this.GetByActive.visible = false;
+            //     this.Geted.visible = false;
+            //     this.Using.visible = true;
+            // }
+            // else{
+                // switch (item) {
+                //     case 2:
+                //         this.skinGetForType = SkinGetForType.Bycoin;
+                //         this.RefreshButton(this.skinGetForType);
+                //         break;
+                //     case 3:
+                //         this.skinGetForType = SkinGetForType.GetByVideo;
+                //         this.RefreshButton(this.skinGetForType);
+                //         break;
+                // }
+                // this.GetByCoin.visible = false;
+                // this.GetByVideo.visible = false;
+                // this.GetByActive.visible = false;
+                // this.Geted.visible = false;
+                // this.Using.visible = false;
+            // } 
         }
         else{
-            this.GetByCoin.visible = false;
-            this.GetByVideo.visible = false;
-            this.GetByActive.visible = false;
-            this.Geted.visible = false;
-            this.Using.visible = true;
-        }
+            var equiphorse = Number(AccountManager.Instance.curplayerData.GetUser(AccountUser.equip_themes)["2"]);
+            var usingId = equiphorse;
+            
+
+            let item = this.HorseArray[0].require_type;
+            this._data = this.HorseArray[0];
+            var _id = this._data.id;
+            var hasequip = AccountManager.Instance.curplayerData.HasEquip(_id);
+            var require_type = item;
+
+            if (usingId == _id ) {
+                this.skinGetForType = SkinGetForType.Using;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (hasequip) {
+                this.skinGetForType = SkinGetForType.Geted;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 2) {
+                this.skinGetForType = SkinGetForType.Bycoin;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 4 ) {
+                this.skinGetForType = SkinGetForType.GetByActivity;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
+            if (require_type == 3) {
+                this.skinGetForType = SkinGetForType.GetByVideo;
+                this.RefreshButton(this.skinGetForType);
+                return;
+            }
     }
+}
     //点击获得按钮
     ClickGet() {
         switch (this.skinGetForType) {
@@ -294,7 +378,7 @@ export default class ShopView extends ui.SkinViewUI{
     BuySuccess(data) {
         WXSDK.AldEvent("购买"+this._data.name+"成功");
         this.RefreshItem();
-        // this.RefreshButton(SkinGetForType.Using);
+        this.RefreshButton(SkinGetForType.Using);
         // this.ShowUI(SkinGetForType.Geted);
         console.log("购买suc:" + JSON.stringify(data));
     }

src/View/TrialView.ts

@@ -44,7 +44,7 @@ export default class TrialView extends ui.TrialViewUI{
         })
     }
     Close(){
-
+        WXSDK.AldEvent("关闭皮肤试用界面");
     }
     ClickClose(){
         var agrs = [{ "t": AccountManager.Instance.ServerTime.toString() }];
@@ -85,7 +85,7 @@ export default class TrialView extends ui.TrialViewUI{
         })
     }
     Complete(_data){
-        WXSDK.AldEvent("关闭皮肤试用界面");
+        
         ShopScene.Instance.CloseShop();
         ViewManager.Instance.ShowView(ViewType.IngameView);