Merge branch 'master' of 192.168.3.91:GameDev/Script

工具库文件/client_csv_config/cnS/configasset.csv

@@ -5871,7 +5871,7 @@ yxj_prefab_6472,邓芳不败,
 yxj_prefab_6473,天道榜,
 yxj_prefab_6474,今日暂无排名,
 yxj_prefab_6475,天道积分:,
-yxj_prefab_6476,"使用    <Color=""#FFEDB8FF"">天道点</Color>可兑换下列物品",
+yxj_prefab_6476,使用    <Color="#FFEDB8FF">天道点</Color>可兑换下列物品,
 yxj_prefab_6477,强化福袋,
 yxj_prefab_6478,永久限购:5,
 yxj_prefab_6479,新装备,
@@ -6214,4 +6214,6 @@ reikiLinggenQiding,器鼎,
 reikiLinggenWanjian,万剑,
 reikiLinggenBianYGen,变异灵根,
 reikiLinggenDanyaoGen,丹药修炼,
-reikiLinggenDanyaoBag,丹药背包,
+reikiLinggenDanyaoBag,丹药背包,
+zhongzhi_01,可收获,
+zhongzhi_02,该土地已清除过杂草,

策划脚本/manor/ManorPlant.xml

@@ -24,7 +24,7 @@
    </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">Name</Data></Cell>
     <Cell><Data ss:Type="String">UnlockItems</Data></Cell>
     <Cell><Data ss:Type="String">Path</Data></Cell>
     <Cell><Data ss:Type="String">Pos</Data></Cell>
@@ -88,7 +88,7 @@
    </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">Name</Data></Cell>
     <Cell><Data ss:Type="String">Attr</Data></Cell>
     <Cell><Data ss:Type="String">Level</Data></Cell>
     <Cell><Data ss:Type="String">CropMutationPro</Data></Cell>
@@ -200,7 +200,7 @@
 </WorksheetOptions>
  </Worksheet>
  <Worksheet ss:Name="ManorFieldZhenFa">
-  <Table ss:ExpandedColumnCount="10" x:FullColumns="1"
+  <Table ss:ExpandedColumnCount="11" x:FullColumns="1"
    x:FullRows="1" ss:DefaultColumnWidth="54" ss:DefaultRowHeight="13.5">
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">阵法ID</Data></Cell>
@@ -213,10 +213,11 @@
     <Cell><Data ss:Type="String">指定种子的产出作物数量加成概率</Data><Comment ss:Author="Windows User"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><B><Font html:Size="9" html:Color="#000000">Windows User:</Font></B><Font html:Size="9" html:Color="#000000">&#10;增加数量:概率万分比</Font></ss:Data></Comment></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>
+    <Cell><Data ss:Type="String">阵法文本</Data></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">Name</Data></Cell>
     <Cell><Data ss:Type="String">Level</Data></Cell>
     <Cell><Data ss:Type="String">Attrs</Data></Cell>
     <Cell><Data ss:Type="String">CropMaturationTimeSubPer</Data></Cell>
@@ -225,6 +226,7 @@
     <Cell><Data ss:Type="String">AddOutputCropNumPro</Data></Cell>
     <Cell><Data ss:Type="String">_Atlas</Data></Cell>
     <Cell><Data ss:Type="String">Icon</Data></Cell>
+    <Cell><Data ss:Type="String">Des</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">NUMBER</Data></Cell>
@@ -237,116 +239,127 @@
     <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">1级青龙阵</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">5,1,5,1,3,1,5,1,5</Data></Cell>
-    <Cell><Data ss:Type="Number">2000</Data></Cell>
+    <Cell><Data ss:Type="Number">1000</Data></Cell>
     <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_1_qinglong</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免10%,,阵眼作物几率为0.2</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="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">2,4,2,4,5,4,2,4,2</Data></Cell>
-    <Cell><Data ss:Type="Number">2000</Data></Cell>
+    <Cell><Data ss:Type="Number">1000</Data></Cell>
     <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_1_baihu</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免10%,,阵眼作物几率为0.2</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">3</Data></Cell>
     <Cell><Data ss:Type="String">1级朱雀阵</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">1,3,1,3,2,3,1,3,1</Data></Cell>
-    <Cell><Data ss:Type="Number">2000</Data></Cell>
+    <Cell><Data ss:Type="Number">1000</Data></Cell>
     <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_1_zhuque</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免10%,,阵眼作物几率为0.2</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">4</Data></Cell>
     <Cell><Data ss:Type="String">1级玄武阵</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">4,5,4,5,1,5,4,5,4</Data></Cell>
-    <Cell><Data ss:Type="Number">2000</Data></Cell>
+    <Cell><Data ss:Type="Number">1000</Data></Cell>
     <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_1_xuanwu</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免10%,,阵眼作物几率为0.2</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">5</Data></Cell>
     <Cell><Data ss:Type="String">1级麒麟阵</Data></Cell>
     <Cell><Data ss:Type="Number">1</Data></Cell>
     <Cell><Data ss:Type="String">3,2,3,2,4,2,3,2,3</Data></Cell>
-    <Cell><Data ss:Type="Number">2000</Data></Cell>
+    <Cell><Data ss:Type="Number">1000</Data></Cell>
     <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell ss:Index="9"><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_1_qilin</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免10%,,阵眼作物几率为0.2</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">6</Data></Cell>
     <Cell><Data ss:Type="String">2级青龙阵</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">15,11,15,11,13,11,15,11,15</Data></Cell>
-    <Cell><Data ss:Type="Number">3000</Data></Cell>
+    <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell><Data ss:Type="Number">3000</Data></Cell>
     <Cell><Data ss:Type="String">dongfu3-7</Data></Cell>
     <Cell><Data ss:Type="String">1:1000</Data></Cell>
     <Cell><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_01_qinglong</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免20%,,,阵眼作物几率为0.2，金攻击种子10%几率产量+1</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">7</Data></Cell>
     <Cell><Data ss:Type="String">2级白虎阵</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">12,14,12,14,15,14,12,14,12</Data></Cell>
-    <Cell><Data ss:Type="Number">3000</Data></Cell>
+    <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell><Data ss:Type="Number">3000</Data></Cell>
     <Cell><Data ss:Type="String">dongfu3-8</Data></Cell>
     <Cell><Data ss:Type="String">1:1000</Data></Cell>
     <Cell><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_01_baihu</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免20%,,,阵眼作物几率为0.2，木攻击种子10%几率产量+1</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">8</Data></Cell>
     <Cell><Data ss:Type="String">2级朱雀阵</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">11,13,11,13,12,13,11,13,11</Data></Cell>
-    <Cell><Data ss:Type="Number">3000</Data></Cell>
+    <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell><Data ss:Type="Number">3000</Data></Cell>
     <Cell><Data ss:Type="String">dongfu3-9</Data></Cell>
     <Cell><Data ss:Type="String">1:1000</Data></Cell>
     <Cell><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_01_zhuque</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免20%,,,阵眼作物几率为0.2，水攻击种子10%几率产量+1</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">9</Data></Cell>
     <Cell><Data ss:Type="String">2级玄武阵</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">14,15,14,15,11,15,14,15,14</Data></Cell>
-    <Cell><Data ss:Type="Number">3000</Data></Cell>
+    <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell><Data ss:Type="Number">3000</Data></Cell>
     <Cell><Data ss:Type="String">dongfu3-10</Data></Cell>
     <Cell><Data ss:Type="String">1:1000</Data></Cell>
     <Cell><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_01_xuanwu</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免20%,,,阵眼作物几率为0.2，火攻击种子10%几率产量+1</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="Number">10</Data></Cell>
     <Cell><Data ss:Type="String">2级麒麟阵</Data></Cell>
     <Cell><Data ss:Type="Number">2</Data></Cell>
     <Cell><Data ss:Type="String">13,12,13,12,14,12,13,12,13</Data></Cell>
-    <Cell><Data ss:Type="Number">3000</Data></Cell>
+    <Cell><Data ss:Type="Number">2000</Data></Cell>
     <Cell><Data ss:Type="Number">3000</Data></Cell>
     <Cell><Data ss:Type="String">dongfu3-11</Data></Cell>
     <Cell><Data ss:Type="String">1:1000</Data></Cell>
     <Cell><Data ss:Type="String">AWorld</Data></Cell>
     <Cell><Data ss:Type="String">zz_zf_01_qilin</Data></Cell>
+    <Cell><Data ss:Type="String">作物成熟时间减免20%,,,阵眼作物几率为0.2，土攻击种子10%几率产量+1</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>
@@ -370,7 +383,7 @@
    </Row>
    <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">code</Data></Cell>
-    <Cell><Data ss:Type="String">@Name</Data></Cell>
+    <Cell><Data ss:Type="String">Name</Data></Cell>
     <Cell><Data ss:Type="String">Level</Data></Cell>
     <Cell><Data ss:Type="String">BaseMaturationTime</Data></Cell>
     <Cell><Data ss:Type="String">BaseOutputCropNum</Data></Cell>

策划脚本/quest/QuestData.xml

@@ -13571,8 +13571,8 @@
     <Cell ss:Index="37"><Data ss:Type="Number">0</Data></Cell>
     <Cell ss:Index="41"><Data ss:Type="String">探索阴阳幻境</Data></Cell>
     <Cell><Data ss:Type="String">交谈</Data></Cell>
-    <Cell><Data ss:Type="String">探索&lt;color='#008000ff'&gt;阴阳幻境&lt;/color&gt;，了解青城山二百年前的故事</Data></Cell>
-    <Cell><Data ss:Type="String">探索&lt;color='#ff00d6'&gt;阴阳幻境&lt;/color&gt;</Data></Cell>
+    <Cell><Data ss:Type="String">&lt;color='#008000ff'&gt;罗白白&lt;/color&gt;是郭鹤从外面带回来的孩子，如今青城山强敌环伺，保护他不受伤害</Data></Cell>
+    <Cell><Data ss:Type="String">跟随&lt;color='#ff00d6'&gt;罗白白&lt;/color&gt;</Data></Cell>
     <Cell ss:Index="48"><Data ss:Type="Number">0</Data></Cell>
     <Cell><Data ss:Type="Number">0</Data></Cell>
     <Cell ss:Index="61"><Data ss:Type="Number">51038</Data></Cell>
@@ -13614,7 +13614,6 @@
     <Cell ss:Index="61"><Data ss:Type="Number">51038</Data></Cell>
     <Cell ss:Index="63"><Data ss:Type="Number">51038</Data></Cell>
     <Cell><Data ss:Type="Number">51038024</Data></Cell>
-    <Cell><Data ss:Type="String">无阅大师</Data></Cell>
     <Cell ss:Index="69"><Data ss:Type="Number">51038</Data></Cell>
     <Cell ss:Index="77"><Data ss:Type="String">51038024:西虎归山，生灵涂炭；青城一去，山空鸟散！</Data></Cell>
     <Cell ss:Index="83"><Data ss:Type="Number">51038024</Data></Cell>