增加武将统帅值对统帅技能加成

tower_sanguo/assets/resources/data/db_data.json

@@ -11,34 +11,25 @@
     },
     "generals": [
         {
-            "id": 114016,
+            "id": 113014,
             "pos": 0,
             "exp": 0,
             "lv": 1,
-            "star": 1,
+            "star": 7,
             "fragment": 1000,
             "status": 3
         },
         {
-            "id": 123007,
-            "pos": -1,
-            "exp": 0,
-            "lv": 1,
-            "star": 3,
-            "fragment": 10,
-            "status": 3
-        },
-        {
-            "id": 113014,
+            "id": 113015,
             "pos": 1,
             "exp": 0,
             "lv": 1,
-            "star": 7,
+            "star": 3,
             "fragment": 10,
             "status": 3
         },
         {
-            "id": 122005,
+            "id": 113012,
             "pos": 2,
             "exp": 0,
             "lv": 1,
@@ -47,7 +38,7 @@
             "status": 3
         },
         {
-            "id": 113012,
+            "id": 113013,
             "pos": 3,
             "exp": 0,
             "lv": 1,
@@ -56,22 +47,13 @@
             "status": 3
         },
         {
-            "id": 113013,
+            "id": 114016,
             "pos": 4,
             "exp": 0,
             "lv": 1,
-            "star": 1,
-            "fragment": 1000,
-            "status": 2
-        },
-        {
-            "id": 133008,
-            "pos": -1,
-            "exp": 0,
-            "lv": 1,
-            "star": 3,
-            "fragment": 6,
-            "status": 2
+            "star": 7,
+            "fragment": 10,
+            "status": 3
         }
     ]
 }

tower_sanguo/assets/resources/data/resList.json

@@ -1,14 +1,10 @@
 [
 	{
-		"url": "font/font1",
-		"type": "font"
-	},
-	{
 		"url": "font/font2",
 		"type": "font"
 	},
 	{
-		"url": "font/font_skill",
+		"url": "font/font1",
 		"type": "font"
 	},
 	{
@@ -20,6 +16,14 @@
 		"type": "json"
 	},
 	{
+		"url": "data/buff_data",
+		"type": "json"
+	},
+	{
+		"url": "font/font_skill",
+		"type": "font"
+	},
+	{
 		"url": "data/commanderskill_data",
 		"type": "json"
 	},
@@ -32,15 +36,15 @@
 		"type": "json"
 	},
 	{
-		"url": "data/general_data",
+		"url": "data/dailyTaskCfg_data",
 		"type": "json"
 	},
 	{
-		"url": "data/buff_data",
+		"url": "data/item_data",
 		"type": "json"
 	},
 	{
-		"url": "data/fetter_data",
+		"url": "data/help_data",
 		"type": "json"
 	},
 	{
@@ -48,27 +52,27 @@
 		"type": "json"
 	},
 	{
-		"url": "data/help_data",
+		"url": "data/heroReward_data",
 		"type": "json"
 	},
 	{
-		"url": "data/invest_data",
+		"url": "data/general_data",
 		"type": "json"
 	},
 	{
-		"url": "data/item_data",
+		"url": "data/fetter_data",
 		"type": "json"
 	},
 	{
-		"url": "data/monster_data",
+		"url": "data/openfun_data",
 		"type": "json"
 	},
 	{
-		"url": "data/mission_data",
+		"url": "data/monster_data",
 		"type": "json"
 	},
 	{
-		"url": "data/openfun_data",
+		"url": "data/resList",
 		"type": "json"
 	},
 	{
@@ -76,7 +80,11 @@
 		"type": "json"
 	},
 	{
-		"url": "data/resList",
+		"url": "data/stageReward_data",
+		"type": "json"
+	},
+	{
+		"url": "data/savingpot_data",
 		"type": "json"
 	},
 	{
@@ -84,7 +92,7 @@
 		"type": "json"
 	},
 	{
-		"url": "data/task_active_data",
+		"url": "data/invest_data",
 		"type": "json"
 	},
 	{
@@ -100,19 +108,27 @@
 		"type": "json"
 	},
 	{
-		"url": "music/Button_click",
-		"type": "mp3"
+		"url": "data/taskActive_data",
+		"type": "json"
 	},
 	{
-		"url": "music/Sutra_PickUP",
-		"type": "wav"
+		"url": "data/mission_data",
+		"type": "json"
+	},
+	{
+		"url": "module/loading/loading",
+		"type": "prefab"
+	},
+	{
+		"url": "music/Button_click",
+		"type": "mp3"
 	},
 	{
 		"url": "music/Get_gold",
 		"type": "mp3"
 	},
 	{
-		"url": "music/turntable1",
+		"url": "music/victory",
 		"type": "mp3"
 	},
 	{
@@ -120,11 +136,11 @@
 		"type": "mp3"
 	},
 	{
-		"url": "music/Background_music1",
+		"url": "music/turntable1",
 		"type": "mp3"
 	},
 	{
-		"url": "music/victory",
+		"url": "music/Background_music1",
 		"type": "mp3"
 	},
 	{
@@ -132,12 +148,16 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/loading/loading",
+		"url": "module/fight/fight",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/fight",
-		"type": "prefab"
+		"url": "music/Sutra_PickUP",
+		"type": "wav"
+	},
+	{
+		"url": "data/task_active_data",
+		"type": "json"
 	},
 	{
 		"url": "module/main/prefab/headinfo",
@@ -160,15 +180,11 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/prefab/attack_light",
-		"type": "prefab"
-	},
-	{
 		"url": "module/fight/prefab/attack_flash",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_normal",
+		"url": "module/fight/prefab/attack_light",
 		"type": "prefab"
 	},
 	{
@@ -176,11 +192,11 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill_wall",
+		"url": "module/fight/prefab/attack_normal",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill_wjqf",
+		"url": "module/fight/prefab/attack_skill_wall",
 		"type": "prefab"
 	},
 	{
@@ -188,19 +204,19 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_jingyan_circle",
+		"url": "module/fight/prefab/bar_lv",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_lv",
+		"url": "module/fight/prefab/attack_skill_wjqf",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/hp_tips",
+		"url": "module/fight/prefab/bar_monster",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_monster",
+		"url": "module/fight/prefab/bar_jingyan_circle",
 		"type": "prefab"
 	},
 	{
@@ -212,15 +228,19 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/mission_start",
+		"url": "module/fight/prefab/hp_tips",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/node_skill",
+		"url": "module/fight/prefab/monster",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/monster",
+		"url": "module/fight/prefab/mission_start",
+		"type": "prefab"
+	},
+	{
+		"url": "module/fight/prefab/node_skill",
 		"type": "prefab"
 	},
 	{
@@ -256,11 +276,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/fight_buff",
+		"url": "module/fight/spine/fight_skill_dian_2",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/fight_skill_dian_2",
+		"url": "module/fight/spine/fight_buff",
 		"type": "spine"
 	},
 	{
@@ -272,35 +292,35 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_2",
+		"url": "module/fight/texture/fight_3",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_3",
+		"url": "module/fight/texture/fight_4",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_4",
+		"url": "module/fight/texture/fight_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_5",
+		"url": "module/fight/texture/qi_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_1",
+		"url": "module/fight/texture/qi_3",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_4",
+		"url": "module/fight/texture/fight_5",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_2",
+		"url": "module/fight/texture/qi_1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_3",
+		"url": "module/fight/texture/qi_4",
 		"type": "texture"
 	},
 	{
@@ -332,11 +352,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/shifang",
+		"url": "module/fight/spine/attack_full/xuneng",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/xuneng",
+		"url": "module/fight/spine/attack_full/shifang",
 		"type": "spine"
 	},
 	{
@@ -344,7 +364,7 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff1",
+		"url": "module/fight/texture/skill/buff4",
 		"type": "texture"
 	},
 	{
@@ -352,7 +372,7 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff4",
+		"url": "module/fight/texture/skill/buff1",
 		"type": "texture"
 	},
 	{
@@ -376,15 +396,15 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill04",
+		"url": "module/fight/texture/skill/skill05",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill06",
+		"url": "module/fight/texture/skill/skill04",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill05",
+		"url": "module/fight/texture/skill/skill06",
 		"type": "texture"
 	}
 ]

tower_sanguo/assets/resources/module/gm/gm.prefab

@@ -4315,7 +4315,7 @@
   {
     "__type__": "cc.Node",
     "_name": "Label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "_parent": {
       "__id__": 108
     },
@@ -4390,8 +4390,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "button",
-    "_N$string": "button",
+    "_string": "看地图坐标",
+    "_N$string": "看地图坐标",
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": false,

tower_sanguo/assets/scripts/GameController.ts

@@ -39,7 +39,7 @@ class GameController {
     private loadui: LoadingUI;
     mainui: MainUI;
 
-    useLocalServer: boolean = false;
+    useLocalServer: boolean = true;
     //是否测试服
     testServer: boolean = true;
 

tower_sanguo/assets/scripts/data/GameData.ts

@@ -73,7 +73,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源，不使用oss资源 */
-    private useLocal: boolean = false;
+    private useLocal: boolean = true;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -332,6 +332,9 @@ export default class FightUI extends BaseUI {
                 let lv = GameController.gameData.player.skill_lv_data.get(GameController.gameData.player.skill_default_id);
                 if (lv > 0) {
                     let rate = vo.skillValue[lv - 1] / 10000;
+                    let commander = GameController.gameData.player.generals[4].commander;
+                    let m = Math.pow(commander / 100, 1.9);
+                    rate = (1 + m) * rate;
                     for (let i = 0; i < this.monster_arr.length; i++) {
                         let m: Monster = this.monster_arr[i];
                         this.createAttackSkill(vo, m.vo.type == 2 ? m.vo.maxhp * rate : 99999999, this.monster_arr[i]);
@@ -660,25 +663,25 @@ export default class FightUI extends BaseUI {
         m.clear();
     }
 
-    addGeneralExp(msg: GeneralExpUpResponse,params:any) {
+    addGeneralExp(msg: GeneralExpUpResponse, params: any) {
         if (msg.errorcode != 0) {
             return;
         }
-        if(!params || !params.generalExpUps || params.generalExpUps.length == 0){
+        if (!params || !params.generalExpUps || params.generalExpUps.length == 0) {
             return;
         }
         let data = params.generalExpUps[0];
         GameController.gameData.updateProp(PLAYERPROP.FOOD, -GameController.gameData.player.getProp(PLAYERPROP.FOODCONSUME), true);
 
-        let g:General;
-        for(let i=0;i<this.general_arr.length;i++){
+        let g: General;
+        for (let i = 0; i < this.general_arr.length; i++) {
             let general = this.general_arr[i];
-            if(general && general.vo && data.gui == general.vo.id){
+            if (general && general.vo && data.gui == general.vo.id) {
                 g = general;
                 break;
             }
         }
-        
+
         if (!g) {
             return;
         }

tower_sanguo/assets/scripts/module/fight/model/attack/AttackWall.ts

@@ -30,6 +30,9 @@ export default class AttackWall extends FightModel implements IPool {
     init(vo: SkillVO, target: Monster) {
         let lv = GameController.gameData.player.skill_lv_data.get(GameController.gameData.player.skill_default_id);
         this.cd = vo.skillValue[lv - 1];
+        let commander = GameController.gameData.player.generals[4].commander;
+        let m = Math.pow(commander / 100, 1.9);
+        this.cd = Math.ceil((1 + m) * this.cd * 10) / 10;
         let [x, y, x1, y1, src, type] = [0, 0, 0, 0, '', 1];
         if (target.moveStep < 3) {//左侧
             x = target.node.x;

tower_sanguo/assets/scripts/net/servertest/ServerManager.ts

@@ -265,15 +265,16 @@ export default class ServerManager {
         let pass = Math.random() < 0.5;
 
         let msg = new MissionUpdateResponse();
+        msg.data = {};
         if (pass && id > this.player.mission_arrive) {
             this.player.mission_arrive = id;
             this.player.mission_passed = id;
             if (vo.type == 2) {
-                msg.data = {};
                 msg.data.sward = "1:100;2:200,3:300;4:114016;5:123008:66";
             }
         }
         msg.errorcode = pass ? 0 : 1;
+        msg.data.code = pass ? 1 : 0;
 
         this.respone(url, msg, callback);
     }