From 59fdf3bcb3c4847479676362913c146274c3d526 Mon Sep 17 00:00:00 2001
From: jingyushiwo <751360932@qq.com>
Date: Fri, 4 Mar 2022 16:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=EF=BC=9A=E8=AE=B8=E6=84=BF?=
 =?UTF-8?q?=E6=B1=A0=E5=86=9B=E5=8A=9F=E5=85=91=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/jsons/dic_army_wishReward.json   | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/shared/resource/jsons/dic_army_wishReward.json b/shared/resource/jsons/dic_army_wishReward.json
index 8b6aafa52..a1f202c63 100644
--- a/shared/resource/jsons/dic_army_wishReward.json
+++ b/shared/resource/jsons/dic_army_wishReward.json
@@ -3,35 +3,24 @@
         "id": 1,
         "itid": 25,
         "quality": 1,
-        "honourReward": 40,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
+        "honourReward": 40
     },
     {
         "id": 2,
         "itid": 25,
         "quality": 2,
-        "honourReward": 80,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
+        "honourReward": 80
     },
     {
         "id": 3,
         "itid": 25,
         "quality": 3,
-        "honourReward": 200,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
+        "honourReward": 200
     },
     {
         "id": 4,
         "itid": 41,
+<<<<<<< Updated upstream
         "quality": 1,
         "honourReward": 20,
         "__EMPTY": 0,
@@ -82,14 +71,13 @@
     {
         "id": 9,
         "itid": 41,
+=======
+>>>>>>> Stashed changes
         "quality": 2,
-        "honourReward": 80,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
+        "honourReward": 20
     },
     {
+<<<<<<< Updated upstream
         "id": 10,
         "itid": 41,
         "quality": 3,
@@ -211,15 +199,15 @@
     },
     {
         "id": 22,
+=======
+        "id": 5,
+>>>>>>> Stashed changes
         "itid": 41,
         "quality": 3,
-        "honourReward": 220,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0
+        "honourReward": 50
     },
     {
+<<<<<<< Updated upstream
         "id": 23,
         "itid": 41,
         "quality": 4,
@@ -268,5 +256,17 @@
         "__EMPTY_1": 0,
         "__EMPTY_2": 0,
         "__EMPTY_3": 0
+=======
+        "id": 6,
+        "itid": 41,
+        "quality": 4,
+        "honourReward": 70
+    },
+    {
+        "id": 7,
+        "itid": 41,
+        "quality": 5,
+        "honourReward": 80
+>>>>>>> Stashed changes
     }
 ]
\ No newline at end of file