Merge commit 'ab65d46a159f0feaa38a1060a1d9829aa3ed4d94' into yujie

* commit 'ab65d46a159f0feaa38a1060a1d9829aa3ed4d94':
  公用机提交
  导表
  公用机提交
  首通奖励不展示来源
  属性图标改名
  公用机提交

# Conflicts:
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

FGUIProject/assets/CommonGame/package.xml

@@ -60,8 +60,8 @@
     <component id="pq5x6e" name="Button7.xml" path="/components/" exported="true"/>
     <component id="pq5x6f" name="Button8.xml" path="/components/" exported="true"/>
     <image id="842s6h" name="kp_sx_1.png" path="/imagesNew/" exported="true"/>
-    <image id="842s6i" name="kp_sx_2.png" path="/imagesNew/" exported="true"/>
-    <image id="842s6j" name="kp_sx_3.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6i" name="kp_sx_3.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6j" name="kp_sx_2.png" path="/imagesNew/" exported="true"/>
     <image id="842s6k" name="kp_sx_4.png" path="/imagesNew/" exported="true"/>
     <component id="842s6q" name="BtnNormal1.xml" path="/components/" exported="true"/>
     <image id="j539t" name="hc_kuang_3.png" path="/images/" exported="true" scale="9grid" scale9grid="42,12,84,24"/>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -341,7 +341,7 @@ namespace GFGEditor
                 StoryFightCfgArray manager = StoryFightCfgArray.Instance;
                 StoryFightCfg storyFightCfg = manager.GetCfg(cfg.fightID);
                 List<int[]> a = new List<int[]>();
-                a.AddRange(cfg.bonusOnceArr);
+                // a.AddRange(cfg.bonusOnceArr);
                 a.AddRange(storyFightCfg.bonusBaseArr);
                 int[][] bonus = a.ToArray();
                 bool result = CheckItemInBonus(itemId, bonus);