Merge branch 'master' of 192.168.3.91:GameDev/Script

策划脚本/items/Item.xml

@@ -14850,7 +14850,7 @@
     <Cell><Data ss:Type="String">res/unit/item/itm_xiaobaoguo_01.assetbundles</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
-    <Cell><Data ss:Type="String">炼丹炉图纸一</Data></Cell>
+    <Cell><Data ss:Type="String">青铜炉制造图</Data></Cell>
     <Cell><Data ss:Type="String">stoveDrawing</Data></Cell>
     <Cell><Data ss:Type="String">dongfu5-0</Data></Cell>
     <Cell><Data ss:Type="String">炼丹炉图纸零，可以解锁丹炉的必要材料</Data></Cell>

策划脚本/itemshop/IntegralShop.xml

@@ -2017,7 +2017,7 @@
     <Cell><Data ss:Type="Number">50</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2035,7 +2035,7 @@
     <Cell><Data ss:Type="Number">100</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2052,7 +2052,7 @@
     <Cell><Data ss:Type="Number">50</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2069,7 +2069,7 @@
     <Cell><Data ss:Type="Number">100</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2086,7 +2086,7 @@
     <Cell><Data ss:Type="Number">50</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2103,7 +2103,7 @@
     <Cell><Data ss:Type="Number">100</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
@@ -2120,7 +2120,24 @@
     <Cell><Data ss:Type="Number">500</Data></Cell>
     <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">80</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="Number">0</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:Index="2"><Data ss:Type="Number">8</Data></Cell>
+    <Cell><Data ss:Type="String">dongfu5-0</Data></Cell>
+    <Cell><Data ss:Type="String">青铜炉制造图</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">-1</Data></Cell>
+    <Cell><Data ss:Type="Number">-1</Data></Cell>
+    <Cell ss:Index="9"><Data ss:Type="Number">0</Data></Cell>
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">300</Data></Cell>
+    <Cell ss:Index="15"><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">110</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>

策划脚本/manor/ManorAlchemy.xml

@@ -200,31 +200,30 @@
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">丹炉ID</Data></Cell>
     <Cell><Data ss:Type="String">名称</Data></Cell>
-    <Cell><Data ss:Type="String">策划备注</Data></Cell>
     <Cell><Data ss:Type="String">等级</Data></Cell>
     <Cell><Data ss:Type="String">丹炉打造卷</Data><Comment ss:Author="Windows User"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Color="#000000">Windows User:</Font></B><Font html:Color="#000000">&#10;使用丹炉打造卷解锁该丹炉</Font></ss:Data></Comment></Cell>
     <Cell><Data ss:Type="String">需要的材料</Data></Cell>
     <Cell><Data ss:Type="String">炼丹等级要求</Data></Cell>
     <Cell><Data ss:Type="String">丹灵</Data></Cell>
+    <Cell><Data ss:Type="String">策划备注</Data></Cell>
     <Cell><Data ss:Type="String">图标所在图集</Data></Cell>
     <Cell><Data ss:Type="String">图标文件</Data><Comment ss:Author="陈绍治"><ss:Data xmlns="http://www.w3.org/TR/REC-html40">陈绍治:&#10;&#10;ICON文件的文件名，只要前缀就行了</ss:Data></Comment></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">ID</Data></Cell>
     <Cell><Data ss:Type="String">Name</Data></Cell>
-    <Cell><Data ss:Type="String">@remake</Data></Cell>
     <Cell><Data ss:Type="String">Level</Data></Cell>
     <Cell><Data ss:Type="String">StoveDrawing</Data></Cell>
     <Cell><Data ss:Type="String">Materials</Data></Cell>
     <Cell><Data ss:Type="String">AlchemyLevel</Data></Cell>
     <Cell><Data ss:Type="String">DanLing</Data></Cell>
+    <Cell><Data ss:Type="String">@remake</Data></Cell>
     <Cell><Data ss:Type="String">_Atlas</Data></Cell>
     <Cell><Data ss:Type="String">Icon</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">NUMBER</Data></Cell>
     <Cell><Data ss:Type="String">STRING</Data></Cell>
-    <Cell><Data ss:Type="String">STRING</Data></Cell>
     <Cell><Data ss:Type="String">NUMBER</Data></Cell>
     <Cell><Data ss:Type="String">STRING</Data></Cell>
     <Cell><Data ss:Type="String">STRING</Data></Cell>
@@ -232,64 +231,63 @@
     <Cell><Data ss:Type="String">STRING</Data></Cell>
     <Cell><Data ss:Type="String">STRING</Data></Cell>
     <Cell><Data ss:Type="String">STRING</Data></Cell>
+    <Cell><Data ss:Type="String">STRING</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">普通丹炉</Data></Cell>
-    <Cell><Data ss:Type="String">炼丹必要材料-3</Data></Cell>
-    <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="String">dongfu5-1</Data></Cell>
-    <Cell><Data ss:Type="String">dwg101:1;dwg102:1</Data></Cell>
     <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="String">Potion</Data></Cell>
+    <Cell ss:Index="9"><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">丹炉1</Data></Cell>
-    <Cell><Data ss:Type="String">炼丹必要材料-3</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">dongfu5-1</Data></Cell>
-    <Cell><Data ss:Type="String">dwg101:1;dwg102:1</Data></Cell>
+    <Cell><Data ss:Type="String">dycl-1104:20;dycl-2104:3</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="String">炼丹必要材料-3</Data></Cell>
     <Cell><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">3</Data></Cell>
     <Cell><Data ss:Type="String">丹炉2</Data></Cell>
-    <Cell><Data ss:Type="String">20%概率丹药产量+1</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">dongfu5-2</Data></Cell>
-    <Cell><Data ss:Type="String">dwg101:1;dwg102:1</Data></Cell>
+    <Cell><Data ss:Type="String">dycl-2005:1;dycl-2104:3</Data></Cell>
     <Cell><Data ss:Type="Number">3</Data></Cell>
-    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="String">炼丹经验+10%</Data></Cell>
     <Cell><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">4</Data></Cell>
     <Cell><Data ss:Type="String">丹炉3</Data></Cell>
-    <Cell><Data ss:Type="String">上品丹药概率+2%</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="String">dongfu5-3</Data></Cell>
-    <Cell><Data ss:Type="String">dwg101:1;dwg102:1</Data></Cell>
-    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="String">dongfu5-4</Data></Cell>
+    <Cell><Data ss:Type="String">dycl-2005:1;dycl-2105:3</Data></Cell>
     <Cell><Data ss:Type="Number">3</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="String">20%概率丹药产量+1</Data></Cell>
     <Cell><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">5</Data></Cell>
     <Cell><Data ss:Type="String">丹炉4</Data></Cell>
-    <Cell><Data ss:Type="String">炼丹经验+10%</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
-    <Cell><Data ss:Type="String">dongfu5-4</Data></Cell>
-    <Cell><Data ss:Type="String">dwg101:1;dwg102:1</Data></Cell>
-    <Cell><Data ss:Type="Number">5</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="String">上品丹药概率+3%</Data></Cell>
     <Cell><Data ss:Type="String">Potion</Data></Cell>
     <Cell><Data ss:Type="String">hpot_yqsa</Data></Cell>
    </Row>
@@ -332,9 +330,9 @@
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">3</Data></Cell>
-    <Cell><Data ss:Type="String">丹灵：上品丹药概率+2%</Data></Cell>
+    <Cell><Data ss:Type="String">丹灵：上品丹药概率+3%</Data></Cell>
     <Cell><Data ss:Type="Number">3</Data></Cell>
-    <Cell><Data ss:Type="String">1:200</Data><Comment ss:Author="Administrator"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Color="#000000">123对应上中下&#10;万分比</Font></B></ss:Data></Comment></Cell>
+    <Cell><Data ss:Type="String">1:300</Data><Comment ss:Author="Administrator"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Color="#000000">123对应上中下&#10;万分比</Font></B></ss:Data></Comment></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">4</Data></Cell>