【GameEditor】实时移除多余的塔以解决monster会锁定攻击非当前战场的塔；修复能量电池功能异常；修改刷兵策略

GameEditor/data/scenes/.md5

@@ -1 +1 @@
-bf59cce97d9c1fde3bf289e9d74bb793 :       179062 : 10098.xml
+2ccd812338cb0c33e1100da997d28139 :       184314 : 10098.xml

GameEditor/data/scenes/10098.xml

@@ -257,11 +257,24 @@
               <Value>Dead:Tower1</Value>
             </Message>
           </element>
-          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.GameNotify">
-            <Message type="CommonAI.Zone.ZoneEditor.EventTrigger.StringValue+VALUE">
-              <Value>Camera1_2</Value>
-            </Message>
-            <Sender type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.GameNotify">
+              <Message type="CommonAI.Zone.ZoneEditor.EventTrigger.StringValue+VALUE">
+                <Value>Camera1_2</Value>
+              </Message>
+              <Sender type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
+            </DelayAction>
+            <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+              <Value>2000</Value>
+            </DelayTimeMS>
+          </element>
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.RemoveUnitAction">
+              <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
+            </DelayAction>
+            <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+              <Value>7000</Value>
+            </DelayTimeMS>
           </element>
         </Datas>
       </Actions>
@@ -385,11 +398,16 @@
               <Value>Dead:Tower2</Value>
             </Message>
           </element>
-          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.GameNotify">
-            <Message type="CommonAI.Zone.ZoneEditor.EventTrigger.StringValue+VALUE">
-              <Value>Camera2_3</Value>
-            </Message>
-            <Sender type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.GameNotify">
+              <Message type="CommonAI.Zone.ZoneEditor.EventTrigger.StringValue+VALUE">
+                <Value>Camera2_3</Value>
+              </Message>
+              <Sender type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
+            </DelayAction>
+            <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+              <Value>2000</Value>
+            </DelayTimeMS>
           </element>
         </Datas>
       </Actions>
@@ -513,7 +531,6 @@
       <Comment></Comment>
       <Conditions type="CommonAI.Zone.ZoneEditor.EventConditions">
         <Datas element_type="CommonAI.Zone.EventTrigger.AbstractCondition">
-          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.AlwaysTrue" />
           <element type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanCondition">
             <Value type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+IntegerComparison">
               <Op>EQUAL</Op>
@@ -1371,20 +1388,25 @@
             </DelayTimeMS>
           </element>
           <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
-            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
-              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitTriggerEventAction">
-                <TriggerID>10054</TriggerID>
-                <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+Trigging" />
-              </Action>
-              <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
-                <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.EveryForceUnitDoAction">
+              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
+                <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitTriggerEventAction">
+                  <TriggerID>10054</TriggerID>
                   <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PickingIteratingUnit" />
-                </Condition1>
-                <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
-                  <Value>True</Value>
-                </Condition2>
-                <Op>EQUAL</Op>
-              </Condition>
+                </Action>
+                <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
+                  <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+                    <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PickingIteratingUnit" />
+                  </Condition1>
+                  <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
+                    <Value>True</Value>
+                  </Condition2>
+                  <Op>EQUAL</Op>
+                </Condition>
+              </Action>
+              <SelectForce type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+                <Value>1</Value>
+              </SelectForce>
             </DelayAction>
             <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
               <Value>1200</Value>
@@ -1879,41 +1901,67 @@
             </DelayTimeMS>
           </element>
           <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
-            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
-              <Direction>0.00</Direction>
-              <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-                <Value>3</Value>
-              </Force>
-              <hpPrecent>100</hpPrecent>
-              <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
-                <X>150.00</X>
-                <Y>227.00</Y>
-              </Position>
-              <unique>True</unique>
-              <UnitLevel>0</UnitLevel>
-              <UnitTemplateID>213</UnitTemplateID>
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
+              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
+                <Direction>0.00</Direction>
+                <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+                  <Value>3</Value>
+                </Force>
+                <hpPrecent>100</hpPrecent>
+                <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
+                  <X>150.00</X>
+                  <Y>227.00</Y>
+                </Position>
+                <unique>True</unique>
+                <UnitLevel>0</UnitLevel>
+                <UnitTemplateID>213</UnitTemplateID>
+              </Action>
+              <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
+                <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+                  <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PointTemplateIDUnit">
+                    <templateIOd>1001</templateIOd>
+                  </Unit>
+                </Condition1>
+                <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
+                  <Value>True</Value>
+                </Condition2>
+                <Op>EQUAL</Op>
+              </Condition>
             </DelayAction>
             <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-              <Value>5000</Value>
+              <Value>8000</Value>
             </DelayTimeMS>
           </element>
           <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
-            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
-              <Direction>0.00</Direction>
-              <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-                <Value>3</Value>
-              </Force>
-              <hpPrecent>100</hpPrecent>
-              <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
-                <X>150.00</X>
-                <Y>227.00</Y>
-              </Position>
-              <unique>True</unique>
-              <UnitLevel>0</UnitLevel>
-              <UnitTemplateID>203</UnitTemplateID>
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
+              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
+                <Direction>0.00</Direction>
+                <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+                  <Value>3</Value>
+                </Force>
+                <hpPrecent>100</hpPrecent>
+                <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
+                  <X>150.00</X>
+                  <Y>227.00</Y>
+                </Position>
+                <unique>True</unique>
+                <UnitLevel>0</UnitLevel>
+                <UnitTemplateID>203</UnitTemplateID>
+              </Action>
+              <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
+                <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+                  <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PointTemplateIDUnit">
+                    <templateIOd>1001</templateIOd>
+                  </Unit>
+                </Condition1>
+                <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
+                  <Value>True</Value>
+                </Condition2>
+                <Op>EQUAL</Op>
+              </Condition>
             </DelayAction>
             <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-              <Value>15000</Value>
+              <Value>30000</Value>
             </DelayTimeMS>
           </element>
         </Datas>
@@ -2010,22 +2058,67 @@
             </DelayTimeMS>
           </element>
           <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
-            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
-              <Direction>0.00</Direction>
-              <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-                <Value>3</Value>
-              </Force>
-              <hpPrecent>100</hpPrecent>
-              <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
-                <X>150.00</X>
-                <Y>100.00</Y>
-              </Position>
-              <unique>True</unique>
-              <UnitLevel>0</UnitLevel>
-              <UnitTemplateID>213</UnitTemplateID>
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
+              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
+                <Direction>0.00</Direction>
+                <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+                  <Value>3</Value>
+                </Force>
+                <hpPrecent>100</hpPrecent>
+                <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
+                  <X>150.00</X>
+                  <Y>227.00</Y>
+                </Position>
+                <unique>True</unique>
+                <UnitLevel>0</UnitLevel>
+                <UnitTemplateID>213</UnitTemplateID>
+              </Action>
+              <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
+                <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+                  <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PointTemplateIDUnit">
+                    <templateIOd>1002</templateIOd>
+                  </Unit>
+                </Condition1>
+                <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
+                  <Value>True</Value>
+                </Condition2>
+                <Op>EQUAL</Op>
+              </Condition>
+            </DelayAction>
+            <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+              <Value>8000</Value>
+            </DelayTimeMS>
+          </element>
+          <element type="CommonAI.Zone.ZoneEditor.EventTrigger.DelayedAction">
+            <DelayAction type="CommonAI.Zone.ZoneEditor.EventTrigger.ConditionAction">
+              <Action type="CommonAI.Zone.ZoneEditor.EventTrigger.AddUnitAction">
+                <Direction>0.00</Direction>
+                <Force type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
+                  <Value>3</Value>
+                </Force>
+                <hpPrecent>100</hpPrecent>
+                <Position type="CommonAI.Zone.ZoneEditor.EventTrigger.PositionValue+VALUE">
+                  <X>150.00</X>
+                  <Y>227.00</Y>
+                </Position>
+                <unique>True</unique>
+                <UnitLevel>0</UnitLevel>
+                <UnitTemplateID>203</UnitTemplateID>
+              </Action>
+              <Condition type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+BooleanComparison">
+                <Condition1 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+UnitIsAlived">
+                  <Unit type="CommonAI.Zone.ZoneEditor.EventTrigger.UnitValue+PointTemplateIDUnit">
+                    <templateIOd>1002</templateIOd>
+                  </Unit>
+                </Condition1>
+                <Condition2 type="CommonAI.Zone.ZoneEditor.EventTrigger.BooleanValue+VALUE">
+                  <Value>True</Value>
+                </Condition2>
+                <Op>EQUAL</Op>
+              </Condition>
             </DelayAction>
             <DelayTimeMS type="CommonAI.Zone.ZoneEditor.EventTrigger.IntegerValue+VALUE">
-              <Value>5000</Value>
+              <Value>45000</Value>
             </DelayTimeMS>
           </element>
         </Datas>