zouyong 5 роки тому
батько
коміт
a9b2d09d3d

+ 120 - 108
tower_sanguo/assets/resources/data/resList.json

@@ -8,35 +8,55 @@
 		"type": "font"
 		"type": "font"
 	},
 	},
 	{
 	{
-		"url": "font/font_skill",
+		"url": "font/font3",
 		"type": "font"
 		"type": "font"
 	},
 	},
 	{
 	{
-		"url": "font/font3",
+		"url": "font/font_skill",
 		"type": "font"
 		"type": "font"
 	},
 	},
 	{
 	{
+		"url": "music/Button_click",
+		"type": "mp3"
+	},
+	{
+		"url": "music/Get_gold",
+		"type": "mp3"
+	},
+	{
+		"url": "music/turntable1",
+		"type": "mp3"
+	},
+	{
+		"url": "music/victory",
+		"type": "mp3"
+	},
+	{
 		"url": "data/barrack_data",
 		"url": "data/barrack_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
+		"url": "data/1",
+		"type": "bin"
+	},
+	{
 		"url": "data/commanderskill_data",
 		"url": "data/commanderskill_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/1",
-		"type": "bin"
+		"url": "music/turntable_2",
+		"type": "mp3"
 	},
 	},
 	{
 	{
-		"url": "data/db_data",
+		"url": "data/buff_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/general_data",
+		"url": "data/dailyTaskCfg_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/buff_data",
+		"url": "data/db_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
@@ -48,94 +68,86 @@
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/help_data",
+		"url": "data/invest_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/invest_data",
+		"url": "data/help_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/item_data",
+		"url": "data/general_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/monster_data",
+		"url": "data/item_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/mission_data",
-		"type": "json"
+		"url": "music/Sutra_PickUP",
+		"type": "wav"
 	},
 	},
 	{
 	{
 		"url": "data/openfun_data",
 		"url": "data/openfun_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/serverConfig_data",
-		"type": "json"
+		"url": "music/Background_music1",
+		"type": "mp3"
 	},
 	},
 	{
 	{
 		"url": "data/resList",
 		"url": "data/resList",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/skill_data",
+		"url": "data/savingpot_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/task_active_data",
+		"url": "data/serverConfig_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/star_data",
+		"url": "data/taskActive_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/task_data",
+		"url": "data/monster_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "data/turntable_data",
+		"url": "data/task_active_data",
 		"type": "json"
 		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "music/Button_click",
-		"type": "mp3"
-	},
-	{
-		"url": "music/Sutra_PickUP",
-		"type": "wav"
+		"url": "data/skill_data",
+		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "music/Get_gold",
-		"type": "mp3"
+		"url": "data/star_data",
+		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "music/turntable1",
-		"type": "mp3"
+		"url": "data/task_data",
+		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "music/turntable_2",
-		"type": "mp3"
+		"url": "data/mission_data",
+		"type": "json"
 	},
 	},
 	{
 	{
-		"url": "music/Background_music1",
-		"type": "mp3"
+		"url": "module/loading/loading",
+		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "music/victory",
-		"type": "mp3"
+		"url": "data/turntable_data",
+		"type": "json"
 	},
 	},
 	{
 	{
 		"url": "module/main/main",
 		"url": "module/main/main",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/loading/loading",
-		"type": "prefab"
-	},
-	{
 		"url": "module/fight/fight",
 		"url": "module/fight/fight",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
@@ -152,39 +164,35 @@
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/main/texture/guan4",
-		"type": "texture"
-	},
-	{
 		"url": "module/main/texture/guan3",
 		"url": "module/main/texture/guan3",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/attack_light",
+		"url": "module/fight/prefab/attack_flash",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/attack_flash",
-		"type": "prefab"
+		"url": "module/main/texture/guan4",
+		"type": "texture"
 	},
 	},
 	{
 	{
 		"url": "module/fight/prefab/attack_normal",
 		"url": "module/fight/prefab/attack_normal",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/attack_skill",
+		"url": "module/fight/prefab/attack_light",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/attack_skill_wall",
+		"url": "module/fight/prefab/attack_skill",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/attack_skill_wjqf",
+		"url": "module/fight/prefab/attack_skill_wall",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/bar_boss",
+		"url": "module/fight/prefab/attack_skill_wjqf",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
@@ -208,11 +216,11 @@
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/mission_over",
+		"url": "module/fight/prefab/bar_boss",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
-		"url": "module/fight/prefab/mission_start",
+		"url": "module/fight/prefab/mission_over",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
@@ -220,6 +228,10 @@
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
+		"url": "module/fight/prefab/mission_start",
+		"type": "prefab"
+	},
+	{
 		"url": "module/fight/prefab/monster",
 		"url": "module/fight/prefab/monster",
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
@@ -228,6 +240,42 @@
 		"type": "prefab"
 		"type": "prefab"
 	},
 	},
 	{
 	{
+		"url": "module/fight/texture/fight_1",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/fight_2",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/fight_3",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/fight_5",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/fight_4",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/qi_3",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/qi_2",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/qi_4",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/texture/qi_1",
+		"type": "texture"
+	},
+	{
 		"url": "module/fight/spine/bing_die",
 		"url": "module/fight/spine/bing_die",
 		"type": "spine"
 		"type": "spine"
 	},
 	},
@@ -268,39 +316,39 @@
 		"type": "spine"
 		"type": "spine"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/fight_1",
+		"url": "module/fight/texture/skill/buff1",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/fight_2",
+		"url": "module/fight/texture/skill/buff2",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/fight_3",
+		"url": "module/fight/texture/skill/buff3",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/fight_4",
+		"url": "module/fight/texture/skill/buff5",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/fight_5",
+		"url": "module/fight/texture/skill/buff6",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/qi_1",
+		"url": "module/fight/texture/skill/skill01",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/qi_4",
+		"url": "module/fight/texture/skill/skill04",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/qi_2",
+		"url": "module/fight/texture/skill/skill03",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/qi_3",
+		"url": "module/fight/texture/skill/skill05",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
@@ -308,6 +356,10 @@
 		"type": "spine"
 		"type": "spine"
 	},
 	},
 	{
 	{
+		"url": "module/fight/texture/skill/skill02",
+		"type": "texture"
+	},
+	{
 		"url": "module/fight/spine/attack_full/fight_skill_bing_2",
 		"url": "module/fight/spine/attack_full/fight_skill_bing_2",
 		"type": "spine"
 		"type": "spine"
 	},
 	},
@@ -324,6 +376,10 @@
 		"type": "spine"
 		"type": "spine"
 	},
 	},
 	{
 	{
+		"url": "module/fight/texture/skill/skill06",
+		"type": "texture"
+	},
+	{
 		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
 		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
 		"type": "spine"
 		"type": "spine"
 	},
 	},
@@ -336,55 +392,11 @@
 		"type": "spine"
 		"type": "spine"
 	},
 	},
 	{
 	{
-		"url": "module/fight/spine/attack_full/xuneng",
-		"type": "spine"
-	},
-	{
-		"url": "module/fight/texture/skill/buff2",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/buff1",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/buff3",
-		"type": "texture"
-	},
-	{
 		"url": "module/fight/texture/skill/buff4",
 		"url": "module/fight/texture/skill/buff4",
 		"type": "texture"
 		"type": "texture"
 	},
 	},
 	{
 	{
-		"url": "module/fight/texture/skill/buff5",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill01",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/buff6",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill02",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill03",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill04",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill06",
-		"type": "texture"
-	},
-	{
-		"url": "module/fight/texture/skill/skill05",
-		"type": "texture"
+		"url": "module/fight/spine/attack_full/xuneng",
+		"type": "spine"
 	}
 	}
 ]
 ]

+ 3 - 1
tower_sanguo/assets/scripts/data/GameData.ts

@@ -72,7 +72,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
 
     /** 是否使用本地资源,不使用oss资源 */
     /** 是否使用本地资源,不使用oss资源 */
-    private useLocal: boolean = false;
+    private useLocal: boolean = true;
 
 
     async initLocalConfigs() {
     async initLocalConfigs() {
         console.log('initLocalConfigs');
         console.log('initLocalConfigs');
@@ -85,6 +85,8 @@ export default class GameData {
                 let url = 'https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/' + data_name + '.json?v=' + new Date().getTime();
                 let url = 'https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/' + data_name + '.json?v=' + new Date().getTime();
                 this[data_name] = await GameController.resM.loadRemoteJson(url);
                 this[data_name] = await GameController.resM.loadRemoteJson(url);
                 if (this.useLocal) {
                 if (this.useLocal) {
+                    console.log(data_name);
+                    
                     this[data_name] = cc.loader.getRes('data/' + data_name, cc.JsonAsset).json;
                     this[data_name] = cc.loader.getRes('data/' + data_name, cc.JsonAsset).json;
                 }
                 }
             }
             }