Merge branch 'master' of 192.168.3.91:GameDev/Script

策划脚本/config/GameConfig.xml

@@ -4549,18 +4549,17 @@
     <Cell><Data ss:Type="String">召唤持续时间，单位秒</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell ss:Index="2"><Data ss:Type="String">召唤参与BUFF</Data></Cell>
-    <Cell><Data ss:Type="String">CallServerReplyBuffId</Data></Cell>
-    <Cell><Data ss:Type="String">NUMBER</Data></Cell>
-    <Cell><Data ss:Type="Number">100095</Data></Cell>
-    <Cell><Data ss:Type="String">召唤提供BUFFid</Data></Cell>
+    <Cell ss:Index="2"><Data ss:Type="String">召唤参与事件ID, 每层提供效果,持续时间</Data></Cell>
+    <Cell><Data ss:Type="String">CallSrvInfo</Data></Cell>
+    <Cell><Data ss:Type="String">STRING</Data></Cell>
+    <Cell><Data ss:Type="String">2000,1000,30000</Data></Cell>
    </Row>
   </Table>
 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"><Unsynced/> <FrozenNoSplit/> <SplitHorizontal>3</SplitHorizontal> <TopRowBottomPane>3</TopRowBottomPane> <SplitVertical>1</SplitVertical><LeftColumnRightPane>1</LeftColumnRightPane> <ActivePane>0</ActivePane>
 </WorksheetOptions>
  </Worksheet>
  <Worksheet ss:Name="NoticeMsg">
-  <Table ss:ExpandedColumnCount="9" ss:ExpandedRowCount="750" x:FullColumns="1"
+  <Table ss:ExpandedColumnCount="9" ss:ExpandedRowCount="751" x:FullColumns="1"
    x:FullRows="1" ss:DefaultColumnWidth="54" ss:DefaultRowHeight="14.25">
    <Row ss:AutoFitHeight="0" ss:Height="24">
     <Cell><Data ss:Type="String">消息ID</Data><Comment ss:Author="PC"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Size="9">PC:</Font></B><Font html:Size="9">&#10;客户端通用提示&#10;&#10; * 代码内部定义 ： [0, 600),&#10;&#10; * 特殊功能 : [600, 700)&#10;&#10; * 登录服：[700, 1000]&#10;&#10; * 游戏： [1000, 9999)&#10;&#10;特殊：&#10;编辑器消息推送，发送系统消息，结构为：Notice.Msg|MsgId|参数1.参数2.参数3</Font></ss:Data></Comment></Cell>
@@ -11370,6 +11369,15 @@
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="String">修士%s响应了修士%s的穿云箭，前往助战！！！</Data></Cell>
    </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">1721</Data></Cell>
+    <Cell ss:Index="3"><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="String">PotUseLimit</Data></Cell>
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="String">该场景不能使用该道具！</Data></Cell>
+   </Row>
   </Table>
 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"><Unsynced/> <FrozenNoSplit/> <SplitHorizontal>3</SplitHorizontal> <TopRowBottomPane>3</TopRowBottomPane> <SplitVertical>1</SplitVertical><LeftColumnRightPane>1</LeftColumnRightPane> <ActivePane>0</ActivePane>
 </WorksheetOptions>