调整了技能的伤害数值；merge上次提交的冲突

GameEditor/.setting/items/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="物品" IsExpanded="False" />
+<node Name="物品" IsExpanded="True" />

GameEditor/.setting/unit_triggers/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="单位触发器" IsExpanded="False" />
+<node Name="单位触发器" IsExpanded="True" />

GameEditor/data/buffs/.md5

@@ -288,7 +288,7 @@ ba570782e76f77f0a0f6ab399a6df35d :         1851 : 12034.xml
 1acfee25f46bbc196bcde797d3dd27c9 :         1671 : 10025.xml
 bd5766553b845656bb1488392e64a1bd :         3019 : 10026.xml
 cf45472f4a7a51594bc9b38109fe49f5 :         2307 : 10027.xml
-16f79b8ad21c850f2967e4af9ab1d332 :         1833 : 10051.xml
+646df7ded1dc796524d3187fb3fecdca :         1787 : 10051.xml
 d7eec5423ea8ac091f959c01dc7b5ab0 :         1845 : 2000.xml
 3fc9e4ca6c7e27a97beed495dcff3ecc :         2549 : 9003.xml
 7b2d10eca86a20d5318ab504b2033e80 :         2901 : 12044.xml

GameEditor/data/scenes/.md5

@@ -1 +1 @@
-3e2e6c2a5bd4bba798ba85c74b39608f :        33298 : 10098.xml
+fefadb26516c69a9268e487d81e1cb0e :        33888 : 10098.xml

GameEditor/data/scenes/10098.xml

@@ -366,6 +366,31 @@
         </Datas>
       </Triggers>
     </element>
+    <element type="CommonAI.Zone.ZoneEditor.ZoneEvent">
+      <Actions type="CommonAI.Zone.ZoneEditor.EventActions">
+        <Datas element_type="CommonAI.Zone.EventTrigger.AbstractAction">
+          <element type="XmdsCommonServer.Plugin.Editor.SendXmdsBattleReportAction" />
+        </Datas>
+      </Actions>
+      <Active>True</Active>
+      <Comment></Comment>
+      <Conditions type="CommonAI.Zone.ZoneEditor.EventConditions">
+        <Datas element_type="CommonAI.Zone.EventTrigger.AbstractCondition">
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.AlwaysTrue" />
+        </Datas>
+      </Conditions>
+      <DelayTimeMS>0</DelayTimeMS>
+      <LocalVars type="CommonAI.Zone.ZoneEditor.EventLocalVars">
+        <Datas element_type="CommonAI.Zone.EventTrigger.LocalVar" />
+      </LocalVars>
+      <Name>单位受到伤害，发送战报</Name>
+      <SavePath></SavePath>
+      <Triggers type="CommonAI.Zone.ZoneEditor.EventTriggers">
+        <Datas element_type="CommonAI.Zone.EventTrigger.AbstractTrigger">
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.GenericUnitDamaged" />
+        </Datas>
+      </Triggers>
+    </element>
   </Events>
   <FileName>/res/scene/sc_openmap_03.assetbundles</FileName>
   <ID>10098</ID>

GameEditor/data/skills/.list

@@ -1,3 +1,4 @@
+Buff增益效果;1001
 斩妖修仙传技能/boss技能/副本-910XX/蕈境;912906
 斩妖修仙传技能/boss技能/普攻-902XX;90200
 斩妖修仙传技能/boss技能/普攻-902XX;90203

GameEditor/data/skills/.md5

@@ -1,3 +1,4 @@
+51bf0134d730c23e56564ec8d5cc4168 :         4130 : 1001.xml
 3800a2cf5f2588ca6dbe74438881ac4d :         4999 : 912906.xml
 9d5f3bcbe86fb6591a9f923e52895358 :         4890 : 90200.xml
 adc1942cef08c1dd1d31143da39be8d7 :         4866 : 90203.xml
@@ -8,4 +9,4 @@ adc1942cef08c1dd1d31143da39be8d7 :         4866 : 90203.xml
 c80fd7a4cc79d922ea523c174760a827 :         4869 : 90208.xml
 08266cbebe58a9f7d17bd4846eabe6e6 :         4869 : 90209.xml
 192ffb4635d630484cde6752be8caa00 :         4869 : 90210.xml
-f33b46ee2a0961bee0668b0cf0de3506 :         4842 : 90003.xml
+041a905ea1b92c1d4a0907ba188a8787 :         4842 : 90003.xml

GameEditor/data/spells/.md5

@@ -8,5 +8,5 @@ fe62873d3b031e6a9a072d9589b5114d :         4884 : 90208.xml
 335b1c21625de847c6fe89b020a35d11 :         4884 : 90209.xml
 c368aa61595b034cbe43add34d8bd611 :         4799 : 90210.xml
 64a95bb8a8429962373549a56db55211 :         6345 : 90003.xml
-4c08d0a4a52b28d00949357607a6dd14 :         4060 : 91001.xml
+218b338c567dde0c907a4400def7ea38 :         3965 : 91001.xml
 be591c4ba17c952522a9beb2c78fa75d :         3346 : 910010.xml

GameEditor/data/units/.md5

@@ -1,7 +1,7 @@
 11c83cdfb738b20b2fd86cffeda9f801 :         7607 : 1.xml
-b2d7c65059b2d2154a9c2e28fb112893 :         7609 : 1001.xml
-341cfe30a7c2d382e30e7badbc0e6428 :         7609 : 1002.xml
-e33fbce710646438f29d657bf03c9f30 :         7608 : 1003.xml
+a6ec437eb60c8010657bfd23f1d80935 :         7607 : 1001.xml
+60b0dd7b9ae4221764937fdc58dedcec :         7607 : 1002.xml
+240e2175c15057b8f57cc070d10bf58c :         7606 : 1003.xml
 d21a240b840f6a82bb228d5da1fd77b9 :         8088 : 101.xml
 4be5d1b2105686cf840af5652760b044 :         8072 : 102.xml
 a7677009a645b59f8d380e4e52c4d79b :         8072 : 103.xml
@@ -26,4 +26,4 @@ e45ea7b94c689f8b287de27830e1a09b :         8078 : 120.xml
 ff25f13eddc39e5e2c475e970ce1d91a :         8083 : 122.xml
 2b4a308b7a8a407b306277ad2962ddd2 :         8091 : 123.xml
 56b232fc5da526c1f031f642224d792a :         8081 : 124.xml
-65c6b60c321797ee4ff63be0efa1c0be :         8763 : 125.xml
+6242071fb9ff4dda3a309ce4959e85a8 :         8537 : 125.xml

GameEditor/data/ver.md5

@@ -1,12 +1,12 @@
-995afb6ba3935494562c9bf9803c0965
+642f298c50c9abceb16460a005a36f9f
 df42af314a1e0b2fdc2fef25681cdbcf :         2032 : \config.xml
 7cbbd479512dfc10a006df1cea79c89b :         2415 : \config_ext.xml
 0581a6b6b04394a594541167bc7fdeef :         1486 : \terrain_definition.xml
-f8ee232d5573a703a4a735175cb28bab :         1712 : \units\.md5
-8243fa0854fdb5ae636694cc5006b04e :          672 : \skills\.md5
-fb0ab6133b669cd234644b86efb19561 :          736 : \spells\.md5
-afa712cbadc796b456dd75ddd8c64edb :        29973 : \buffs\.md5
+b971fe599e933c513805d69be238360b :         1712 : \units\.md5
+19c1808562adc51f4b3eff452fe9d180 :          732 : \skills\.md5
+ed77d3fcb99f81bd1e3e50f16e25ceb0 :          736 : \spells\.md5
+aa3e7d076c32048e4a0e9982ae95bce6 :        29973 : \buffs\.md5
 d41d8cd98f00b204e9800998ecf8427e :            0 : \items\.md5
 d41d8cd98f00b204e9800998ecf8427e :            0 : \unit_triggers\.md5
 d41d8cd98f00b204e9800998ecf8427e :            0 : \unit_events\.md5
-f2a0463759e31477a8bab65cfbec5efb :           61 : \scenes\.md5
+c951dd913529d98f053d449c9bca39f4 :           61 : \scenes\.md5