Explorar o código

1,更新消息
2,新增TimerUtil

zouyong %!s(int64=5) %!d(string=hai) anos
pai
achega
fdcdc8a1b3

+ 0 - 2
tools/messages.md

@@ -109,10 +109,8 @@
             "name": "updateMission",
             "method": "POST",
             "data": {
-                mid:number,//关卡id
                 max:[gid],//最大战力武将id
                 last:[gid]//通关时武将id
-                useskill:number, //是否使用技能 0未使用 1使用
             },
             "response": {
                 "data": {

+ 8 - 9
tower_sanguo/assets/MOKA/manager/SDKManager.ts

@@ -17,22 +17,21 @@ export default class SDKManager {
     //是否在登录之后上报邀请人id,用于上报裂变拉入的统计
     static sendReport: boolean = false
 
-    init() {        
-        if (cc.sys.os == cc.sys.OS_WINDOWS) {
+    init() {
+        console.log("sdkManager.init", cc.sys.os, cc.sys.platform, cc.sys.isNative);
+
+        if (cc.sys.isNative) {
+            this.sdk = new AndroidSDK();
+        }
+        else if (cc.sys.os == cc.sys.OS_WINDOWS) {
             this.sdk = new WindowTest();
         }
         else if (cc.sys.platform == cc.sys.WECHAT_GAME) {
             this.sdk = new MokaWxSDK();
         }
-        else if(cc.sys.isNative) {
-            this.sdk = new AndroidSDK();
-        }
-        if(this.sdk){
+        if (this.sdk) {
             this.sdk.init();
         }
-        else{
-            console.log(cc.sys.os,cc.sys.platform);
-        }
     }
 
     /**

+ 92 - 68
tower_sanguo/assets/resources/data/resList.json

@@ -1,5 +1,9 @@
 [
 	{
+		"url": "font/font3",
+		"type": "font"
+	},
+	{
 		"url": "font/font1",
 		"type": "font"
 	},
@@ -12,83 +16,79 @@
 		"type": "font"
 	},
 	{
-		"url": "module/loading/loading",
-		"type": "prefab"
-	},
-	{
-		"url": "module/main/main",
-		"type": "prefab"
+		"url": "data/barrack_data",
+		"type": "json"
 	},
 	{
-		"url": "music/Button_click",
-		"type": "mp3"
+		"url": "data/buff_data",
+		"type": "json"
 	},
 	{
-		"url": "music/turntable1",
-		"type": "mp3"
+		"url": "data/commanderskill_data",
+		"type": "json"
 	},
 	{
-		"url": "music/victory",
-		"type": "mp3"
+		"url": "data/db_data",
+		"type": "json"
 	},
 	{
-		"url": "data/1",
-		"type": "bin"
+		"url": "data/fundes_data",
+		"type": "json"
 	},
 	{
-		"url": "data/barrack_data",
+		"url": "data/fetter_data",
 		"type": "json"
 	},
 	{
-		"url": "data/buff_data",
+		"url": "data/item_data",
 		"type": "json"
 	},
 	{
-		"url": "data/commanderskill_data",
+		"url": "data/general_data",
 		"type": "json"
 	},
 	{
-		"url": "data/db_data",
-		"type": "json"
+		"url": "data/1",
+		"type": "bin"
 	},
 	{
-		"url": "data/fetter_data",
+		"url": "data/openfun_data",
 		"type": "json"
 	},
 	{
-		"url": "data/general_data",
+		"url": "data/invest_data",
 		"type": "json"
 	},
 	{
-		"url": "data/item_data",
+		"url": "data/help_data",
 		"type": "json"
 	},
 	{
-		"url": "data/help_data",
+		"url": "data/skill_data",
 		"type": "json"
 	},
 	{
-		"url": "data/mission_data",
+		"url": "data/resList",
 		"type": "json"
 	},
 	{
-		"url": "data/monster_data",
+		"url": "data/serverConfig_data",
 		"type": "json"
 	},
 	{
-		"url": "data/resList",
+		"url": "data/star_data",
 		"type": "json"
 	},
 	{
-		"url": "data/serverConfig_data",
+		"url": "data/mission_data",
 		"type": "json"
 	},
 	{
-		"url": "data/skill_data",
+		"url": "data/task_data",
 		"type": "json"
 	},
 	{
-		"url": "data/star_data",
+		"url": "data/monster_data",
 		"type": "json"
 	},
 	{
@@ -96,35 +96,47 @@
 		"type": "json"
 	},
 	{
+		"url": "music/Button_click",
+		"type": "mp3"
+	},
+	{
+		"url": "music/Get_gold",
+		"type": "mp3"
+	},
+	{
+		"url": "music/turntable_2",
+		"type": "mp3"
+	},
+	{
 		"url": "music/Sutra_PickUP",
 		"type": "wav"
 	},
 	{
-		"url": "music/turntable_2",
+		"url": "music/turntable1",
 		"type": "mp3"
 	},
 	{
-		"url": "music/Background_music1",
+		"url": "music/victory",
 		"type": "mp3"
 	},
 	{
-		"url": "module/fight/fight",
+		"url": "module/main/main",
 		"type": "prefab"
 	},
 	{
-		"url": "module/main/prefab/headinfo",
+		"url": "module/loading/loading",
 		"type": "prefab"
 	},
 	{
-		"url": "module/main/texture/guan2",
-		"type": "texture"
+		"url": "music/Background_music1",
+		"type": "mp3"
 	},
 	{
-		"url": "module/main/texture/guan3",
-		"type": "texture"
+		"url": "module/fight/fight",
+		"type": "prefab"
 	},
 	{
-		"url": "module/main/texture/guan4",
+		"url": "module/main/texture/guan2",
 		"type": "texture"
 	},
 	{
@@ -132,10 +144,18 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/prefab/attack_light",
+		"url": "module/main/texture/guan3",
+		"type": "texture"
+	},
+	{
+		"url": "module/main/prefab/headinfo",
 		"type": "prefab"
 	},
 	{
+		"url": "module/main/texture/guan4",
+		"type": "texture"
+	},
+	{
 		"url": "module/fight/prefab/attack_flash",
 		"type": "prefab"
 	},
@@ -144,7 +164,11 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_normal",
+		"url": "module/fight/prefab/attack_skill_wall",
+		"type": "prefab"
+	},
+	{
+		"url": "module/fight/prefab/attack_light",
 		"type": "prefab"
 	},
 	{
@@ -152,7 +176,7 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill_wall",
+		"url": "module/fight/prefab/attack_normal",
 		"type": "prefab"
 	},
 	{
@@ -168,39 +192,39 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_monster",
+		"url": "module/fight/prefab/general_game",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/hp_tips",
+		"url": "module/fight/prefab/mission_over",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/mission_start",
+		"url": "module/fight/prefab/bar_monster",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/node_skill",
+		"url": "module/fight/prefab/monster",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/general_game",
+		"url": "module/fight/prefab/hp_tips",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/star_general",
+		"url": "module/fight/prefab/mission_start",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/spine/bing_die",
-		"type": "spine"
+		"url": "module/fight/prefab/node_skill",
+		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/monster",
-		"type": "prefab"
+		"url": "module/fight/spine/bing_die",
+		"type": "spine"
 	},
 	{
-		"url": "module/fight/prefab/mission_over",
+		"url": "module/fight/prefab/star_general",
 		"type": "prefab"
 	},
 	{
@@ -240,19 +264,19 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/texture/fight_1",
+		"url": "module/fight/texture/fight_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_2",
+		"url": "module/fight/texture/fight_1",
 		"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_3",
 		"type": "texture"
 	},
 	{
@@ -284,11 +308,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_dun_1",
+		"url": "module/fight/spine/attack_full/fight_skill_dun_2",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_dun_2",
+		"url": "module/fight/spine/attack_full/fight_skill_dun_1",
 		"type": "spine"
 	},
 	{
@@ -296,11 +320,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
+		"url": "module/fight/spine/attack_full/fight_skill_shitou_2",
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/spine/attack_full/fight_skill_shitou_2",
+		"url": "module/fight/spine/attack_full/fight_skill_shitou_1",
 		"type": "spine"
 	},
 	{
@@ -312,11 +336,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/texture/skill/buff2",
+		"url": "module/fight/texture/skill/buff1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff1",
+		"url": "module/fight/texture/skill/buff2",
 		"type": "texture"
 	},
 	{
@@ -332,11 +356,11 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff6",
+		"url": "module/fight/texture/skill/skill01",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill01",
+		"url": "module/fight/texture/skill/buff6",
 		"type": "texture"
 	},
 	{
@@ -344,19 +368,19 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill02",
+		"url": "module/fight/texture/skill/skill04",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill04",
+		"url": "module/fight/texture/skill/skill02",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill05",
+		"url": "module/fight/texture/skill/skill06",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill06",
+		"url": "module/fight/texture/skill/skill05",
 		"type": "texture"
 	}
 ]