From 9054a1dbb91941f052eaf140af6eb8c366ae953d Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 25 May 2023 17:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_drop.json        | 224 ++-------------------------------
 bin/json/game_mail.json        |   2 +-
 bin/json/game_rdtaskcondi.json |   2 +-
 modules/combat/module.go       |   6 +-
 4 files changed, 10 insertions(+), 224 deletions(-)

diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json
index 4c6093803..5fdee905f 100644
--- a/bin/json/game_drop.json
+++ b/bin/json/game_drop.json
@@ -1,158 +1,4 @@
 [
-  {
-    "id": 1,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 2,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 3,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 4,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 5,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 6,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 7,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 8,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 9,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 10,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 11,
-    "dropid": 1001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "30001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
   {
     "id": 12,
     "dropid": 1001,
@@ -160,40 +6,12 @@
     "prize": [
       {
         "a": "item",
-        "t": "30001",
-        "n": 1
+        "t": "16001001",
+        "n": 2
       }
     ],
     "star": 1,
-    "p": 333
-  },
-  {
-    "id": 13,
-    "dropid": 1002,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "90001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 14,
-    "dropid": 1002,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "90001",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
+    "p": 1000
   },
   {
     "id": 15,
@@ -203,11 +21,11 @@
       {
         "a": "item",
         "t": "16001001",
-        "n": 4
+        "n": 2
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 1000
   },
   {
     "id": 16,
@@ -217,39 +35,11 @@
       {
         "a": "item",
         "t": "16001001",
-        "n": 4
+        "n": 2
       }
     ],
     "star": 1,
-    "p": 333
-  },
-  {
-    "id": 17,
-    "dropid": 1003,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "90002",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
-  },
-  {
-    "id": 18,
-    "dropid": 1003,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "90002",
-        "n": 1
-      }
-    ],
-    "star": 1,
-    "p": 333
+    "p": 1000
   },
   {
     "id": 19,
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
index d242bbf23..84ae95167 100644
--- a/bin/json/game_mail.json
+++ b/bin/json/game_mail.json
@@ -244,7 +244,7 @@
     },
     "recipient": {
       "key": "mail_mail_recipient_12",
-      "text": "亲爱的{0}："
+      "text": "亲爱的的玩家你在跑商中荣获第{0}名：这是您的排名奖励请查收"
     },
     "content": {
       "key": "mail_mail_content_12",
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 2be05ad3a..0eab587d3 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -6623,7 +6623,7 @@
     "type": 109,
     "valid": 0,
     "NPC": 10361,
-    "data1": 0,
+    "data1": 1,
     "data2": 0,
     "data3": 0,
     "data4": 0,
diff --git a/modules/combat/module.go b/modules/combat/module.go
index 7aaaa6164..536395872 100644
--- a/modules/combat/module.go
+++ b/modules/combat/module.go
@@ -64,7 +64,7 @@ func (this *Combat) EventUserOffline(uid, sessionid string) {
 	this.modelCombat.delInfo(uid)
 }
 
-func (this *Combat) GetLevelStatus(uid string) (levels map[int32]*pb.DBCombatLevel) {
+func (this *Combat) GetLevels(uid string) (levels map[int32]*pb.DBCombatLevel) {
 	combat := &pb.DBCombatUser{}
 	levels = make(map[int32]*pb.DBCombatLevel)
 	if err := this.modelCombat.Get(uid, combat); err != nil {
@@ -73,7 +73,3 @@ func (this *Combat) GetLevelStatus(uid string) (levels map[int32]*pb.DBCombatLev
 	levels = combat.Level
 	return
 }
-
-func (this *Combat) GetLevels(uid string) (levels map[int32]*pb.DBCombatLevel) {
-	return
-}