Merge remote-tracking branch 'origin/master'

GameEditor/.setting/skills/.tree

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-16"?>
 <node Name="技能" IsExpanded="True">
+  <node Name="00通用" IsExpanded="True">
+    <node Name="-1" IsExpanded="False" />
+    <node Name="9999901" IsExpanded="False" />
+  </node>
   <node Name="Buff增益效果" IsExpanded="True">
     <node Name="1001" IsExpanded="False" />
+    <node Name="510200" IsExpanded="False" />
+  </node>
+  <node Name="普通玩家普攻" IsExpanded="True">
+    <node Name="101" IsExpanded="False" />
+    <node Name="102" IsExpanded="False" />
   </node>
   <node Name="斩妖修仙传技能" IsExpanded="True">
     <node Name="boss技能" IsExpanded="True">
@@ -26,11 +35,4 @@
       </node>
     </node>
   </node>
-  <node Name="正式玩家" IsExpanded="True">
-    <node Name="灵狐ext" IsExpanded="True">
-      <node Name="2技能" IsExpanded="True">
-        <node Name="510200" IsExpanded="False" />
-      </node>
-    </node>
-  </node>
 </node>

GameEditor/.setting/spells/.tree

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-16"?>
 <node Name="法术" IsExpanded="True">
+  <node Name="普通玩家普攻法术" IsExpanded="True">
+    <node Name="101" IsExpanded="False" />
+    <node Name="102" IsExpanded="False" />
+  </node>
   <node Name="斩妖修仙传" IsExpanded="True">
     <node Name="BOSS法术" IsExpanded="True">
       <node Name="副本" IsExpanded="True">

GameEditor/data/buffs/.list

@@ -1,3 +1,4 @@
+～游戏使用到的BUFF;10111
 BOSS/怪物;910201
 BOSS/怪物;910202
 BOSS/怪物;910203
@@ -199,7 +200,6 @@ pvp;1280
 副本/石头村;10073
 副本/石头村;10074
 副本/石头村;10105
-副本/石头村;10111
 副本/石头村;10112
 副本/石头村;10126
 副本/石头村;10127

GameEditor/data/skills/.list

@@ -1,4 +1,9 @@
+00通用;-1
+00通用;9999901
 Buff增益效果;1001
+Buff增益效果;510200
+普通玩家普攻;101
+普通玩家普攻;102
 斩妖修仙传技能/boss技能/副本-910XX/蕈境;912906
 斩妖修仙传技能/boss技能/普攻-902XX;90200
 斩妖修仙传技能/boss技能/普攻-902XX;90203
@@ -10,4 +15,3 @@ Buff增益效果;1001
 斩妖修仙传技能/boss技能/普攻-902XX;90209
 斩妖修仙传技能/boss技能/普攻-902XX;90210
 斩妖修仙传技能/boss技能/主动-900XX;90003
-正式玩家/灵狐ext/2技能;510200

GameEditor/data/skills/.md5

@@ -1,4 +1,9 @@
+ebfaedc9473abbd377731802a15f461b :         2246 : -1.xml
+b05fbafdecd3756cf5e88a13938453cb :         2262 : 9999901.xml
 51bf0134d730c23e56564ec8d5cc4168 :         4130 : 1001.xml
+9b244dba39a0b2aeb2715d258831a483 :         6508 : 510200.xml
+d582902e0fd8e3ac5f95c81fdc4b8479 :         4818 : 101.xml
+3d1b9634aa9944bff05adb19ddd12909 :         4818 : 102.xml
 3800a2cf5f2588ca6dbe74438881ac4d :         4999 : 912906.xml
 9d5f3bcbe86fb6591a9f923e52895358 :         4890 : 90200.xml
 adc1942cef08c1dd1d31143da39be8d7 :         4866 : 90203.xml
@@ -10,4 +15,3 @@ c80fd7a4cc79d922ea523c174760a827 :         4869 : 90208.xml
 08266cbebe58a9f7d17bd4846eabe6e6 :         4869 : 90209.xml
 192ffb4635d630484cde6752be8caa00 :         4869 : 90210.xml
 cff2cc011d892d3c47b06ab091ebaadf :         4733 : 90003.xml
-b93918349a51beae781503b44975ca69 :         6521 : 510200.xml

GameEditor/data/spells/.list

@@ -1,3 +1,5 @@
+普通玩家普攻法术;101
+普通玩家普攻法术;102
 斩妖修仙传/BOSS法术/副本/蕈境;91290501
 斩妖修仙传/BOSS法术/远程普攻;90203
 斩妖修仙传/BOSS法术/远程普攻;90204

GameEditor/data/spells/.md5

@@ -1,13 +1,15 @@
+4717d02966078238fe220ae52ff38b35 :         4007 : 101.xml
+70cd06e7470d0d057ef0bb911117b918 :         4007 : 102.xml
 93403920c2976ab6341f3ada5ebda64b :         2683 : 91290501.xml
-959cc86cbce96d3efadb9cc11c7b503a :         4885 : 90203.xml
-0e6024de24fdefbf2f29b78951558cef :         4888 : 90204.xml
-0962315c37380143d17305c213812fb4 :         4890 : 90205.xml
-38bfd86d553390ebb9db518c9977ccf6 :         4884 : 90206.xml
-89069ba1dcf9045e9fcd0e597dbce1c4 :         4890 : 90207.xml
-fe62873d3b031e6a9a072d9589b5114d :         4884 : 90208.xml
-335b1c21625de847c6fe89b020a35d11 :         4884 : 90209.xml
-fb25bb3c6a9663900b776914969951d2 :         4688 : 90210.xml
+d5352d49bcde3767b0e7dce47cf3de93 :         4886 : 90203.xml
+efbf3fee916c12cca84ce6185d09a70e :         4889 : 90204.xml
+8568b81965f941dff84c3f2cc9cc2788 :         4891 : 90205.xml
+e489dd0776c4d2f8f38494709c2f6341 :         4885 : 90206.xml
+21498d9c9c7276eb6bac957fbc383143 :         4891 : 90207.xml
+d2a3b44b521b8bbd752116dc645d1446 :         4885 : 90208.xml
+a4cec58926ee3a739d75514ecaaf7ede :         4885 : 90209.xml
+62180c406b8d27de6077912dcf7ef9f8 :         4800 : 90210.xml
 64a95bb8a8429962373549a56db55211 :         6345 : 90003.xml
 218b338c567dde0c907a4400def7ea38 :         3965 : 91001.xml
 be591c4ba17c952522a9beb2c78fa75d :         3346 : 910010.xml
-e62e76f165491c438f387e4f1e0644cd :         3980 : 510200.xml
+741b6e3a9ca3b6adc9abbafddf406d2c :         3328 : 510200.xml

GameEditor/data/spells/510200.xml

@@ -12,7 +12,7 @@
   <ExpectTarget>AlliesIncludeSelf</ExpectTarget>
   <FanAngle>0.00</FanAngle>
   <FileBodyScale>1.00</FileBodyScale>
-  <FileName>vfx_com_xieping_jiaxie_01</FileName>
+  <FileName>huixue01</FileName>
   <HeightUpdate>False</HeightUpdate>
   <HitIntervalKeyFrame type="CommonAI.Zone.SpellTemplate+KeyFrame">
     <Attack type="CommonAI.Zone.AttackProp">
@@ -46,7 +46,7 @@
   <IsBindingOrbit>False</IsBindingOrbit>
   <IsCycAnim>True</IsCycAnim>
   <KeyFrames element_type="CommonAI.Zone.SpellTemplate+KeyFrame" />
-  <LifeTimeMS>3000</LifeTimeMS>
+  <LifeTimeMS>5000</LifeTimeMS>
   <MaxAffectUnit>0</MaxAffectUnit>
   <MaxMoveDistance>0.00</MaxMoveDistance>
   <MSpeed_MAX>100.00</MSpeed_MAX>
@@ -76,21 +76,5 @@
   <SpecialEffect>None</SpecialEffect>
   <SpecialEffectParam>0.00</SpecialEffectParam>
   <StopBindingSkillOnRemoved>False</StopBindingSkillOnRemoved>
-  <TargetEffect type="CommonAI.Zone.LaunchEffect">
-    <BindBody>False</BindBody>
-    <EarthQuakeMS>0</EarthQuakeMS>
-    <EarthQuakeXYZ>0.00</EarthQuakeXYZ>
-    <EffectAddSpeed>1.00</EffectAddSpeed>
-    <EffectHight>0.00</EffectHight>
-    <EffectOffsetX>0.00</EffectOffsetX>
-    <EffectOffsetY>0.00</EffectOffsetY>
-    <EffectTimeMS>0</EffectTimeMS>
-    <IsLoop>False</IsLoop>
-    <IsSyncSenderRotation>False</IsSyncSenderRotation>
-    <Name>vfx_chr_fashi_attack_02</Name>
-    <RType>None</RType>
-    <ScaleToBodySize>0.00</ScaleToBodySize>
-    <property.SerialNumber>30670859</property.SerialNumber>
-  </TargetEffect>
   <property.EditorPath>法术/正式玩家/灵狐ext/2技能/治疗2技能(510200)</property.EditorPath>
 </SpellTemplate>

Unity/ProjectSettings/GraphicsSettings.asset

@@ -63,7 +63,7 @@ GraphicsSettings:
   m_FogKeepExp: 0
   m_FogKeepExp2: 0
   m_AlbedoSwatchInfos: []
-  m_LightsUseLinearIntensity: 0
+  m_LightsUseLinearIntensity: 1
   m_LightsUseColorTemperature: 1
   m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0

Unity/ProjectSettings/ProjectSettings.asset

@@ -53,7 +53,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 0
+  m_ActiveColorSpace: 1
   m_MTRendering: 1
   mipStripping: 0
   numberOfMipsStripped: 0