Merge branch 'master' of 192.168.0.254:GameDev/Script

策划脚本/manor/ManorAlchemy.xml

@@ -239,7 +239,7 @@
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">dongfu5-0</Data></Cell>
     <Cell><Data ss:Type="String">dycl-1104:10;dycl-2103:3</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
@@ -285,7 +285,7 @@
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">dongfu5-3</Data></Cell>
     <Cell><Data ss:Type="String">dycl-2006:1;dycl-2105:3</Data></Cell>
-    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="Number">3</Data></Cell>
     <Cell><Data ss:Type="Number">3</Data></Cell>
     <Cell><Data ss:Type="String">上品丹药概率+3%</Data></Cell>
     <Cell><Data ss:Type="String">Potion</Data></Cell>

策划脚本/npc/NpcData.xml

@@ -10245,6 +10245,21 @@
     <Cell><Data ss:Type="String">/res/unit/item/itm_tiankongbei_01</Data></Cell>
     <Cell ss:Index="27"><Data ss:Type="String">0.9,0.33,-1.17,2.28</Data></Cell>
    </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">11039018</Data></Cell>
+    <Cell><Data ss:Type="String">石碑</Data></Cell>
+    <Cell ss:Index="4"><Data ss:Type="String">不周山阴</Data></Cell>
+    <Cell><Data ss:Type="Number">11039</Data></Cell>
+    <Cell ss:Index="7"><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+    <Cell ss:Index="12"><Data ss:Type="Number">30</Data></Cell>
+    <Cell ss:Index="16"><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="String">Letter,2,80397</Data></Cell>
+    <Cell ss:Index="23"><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="String">/res/unit/item/itm_tiankongbei_01</Data></Cell>
+    <Cell ss:Index="27"><Data ss:Type="String">0.9,0.33,-1.17,2.28</Data></Cell>
+   </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">11080001</Data></Cell>
     <Cell><Data ss:Type="String">石碑</Data></Cell>
@@ -36887,6 +36902,11 @@
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">如果太阳都垂挂天上，\n如果游子都回返故乡，\n如果木绳可使金雀囚困，\n如果爱意可将枯石融作甜浆。</Data></Cell>
    </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">80397</Data></Cell>
+    <Cell><Data ss:Type="Number">1</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>