修改代码

BoomMaster/Assembly-CSharp-Editor.csproj

@@ -293,9 +293,6 @@
     <Reference Include="DOTweenEditor">
       <HintPath>D:/wan/dyspaceGame/BoomMaster_Git/BoomMaster/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll</HintPath>
     </Reference>
-    <Reference Include="DOTweenUpgradeManager">
-      <HintPath>D:/wan/dyspaceGame/BoomMaster_Git/BoomMaster/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>D:/wan/dyspaceGame/BoomMaster_Git/BoomMaster/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
     </Reference>

BoomMaster/Assembly-CSharp.csproj

@@ -122,6 +122,11 @@
     <Compile Include="Assets\#A2_Scripts\Services\InputServices.cs" />
     <Compile Include="Assets\#A2_Scripts\Services\TimerServices.cs" />
     <Compile Include="Assets\#A2_Scripts\SoliderController.cs" />
+    <Compile Include="Assets\#E1_Plugins\PigeonCoopToolkit\Effects (Trails) Examples\Scripts\Interpolate.cs" />
+    <Compile Include="Assets\#E1_Plugins\PigeonCoopToolkit\Effects (Trails) Examples\Scripts\LookAtTarget.cs" />
+    <Compile Include="Assets\#E1_Plugins\PigeonCoopToolkit\Effects (Trails) Examples\Scripts\MeleeWeaponTrail.cs" />
+    <Compile Include="Assets\#E1_Plugins\PigeonCoopToolkit\Effects (Trails) Examples\Scripts\MouseMove.cs" />
+    <Compile Include="Assets\#E1_Plugins\PigeonCoopToolkit\Effects (Trails) Examples\Scripts\SwooshTest.cs" />
     <Compile Include="Assets\#E1_Plugins\RayFire\Scripts\Classes\Cluster\RFFace.cs" />
     <Compile Include="Assets\#E1_Plugins\RayFire\Scripts\Classes\Cluster\RFTriangle.cs" />
     <Compile Include="Assets\#E1_Plugins\RayFire\Scripts\Classes\Man\RFManDemolition.cs" />
@@ -180,6 +185,7 @@
     <Compile Include="Assets\#E1_Plugins\RayFire\Tutorial\Scripts\DemolitionEventScript.cs" />
     <None Include="Assets\#D2_Shaders\CustomLightingToon.shader" />
     <None Include="Assets\#D2_Shaders\Shader\Dissolve.shader" />
+    <None Include="Assets\#E1_Plugins\RayFire\RayFire_切割.txt" />
     <None Include="Assets\#D2_Shaders\Planet.shader" />
     <None Include="Assets\#D2_Shaders\RimShader.shader" />
     <None Include="Assets\#D2_Shaders\AlphaRimPro.shader" />

BoomMaster/Assets/#A1_Scenes/DemoScenes.unity

@@ -166,7 +166,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   levelPrefs:
-  - {fileID: 8039451421880427360, guid: 3be717467d3392c47b7b4ffc29dad449, type: 3}
   - {fileID: 3451800651537292262, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3}
   - {fileID: 8917163245792337139, guid: dea24af8619dcf749af7f9f2088520b3, type: 3}
 --- !u!1 &543166196

BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -101,12 +101,6 @@ public class BattleUI : MonoBehaviour
     private void Start()
     {
         m_boomBtn.interactable = false;
-        if (LocalRecord.HasKey(GlobalConfig.CoinReCordKey))
-        {
-            m_coin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
-        }
-        m_coin = 10000;
-        LocalRecord.SetIntRecord(GlobalConfig.CoinReCordKey, m_coin);
         m_totalCoinText.text = m_coin.ToString();
     }
     void SetDragMode()
@@ -287,7 +281,7 @@ public class BattleUI : MonoBehaviour
             varAddCoin *= 2;
         }
         m_levelCoinText.text = string.Format("+{0:d}", varAddCoin);
-        SetCoin(varAddCoin);
+        //SetCoin(varAddCoin);
     }
     //失败
     public void OnBattleFail()
@@ -362,6 +356,15 @@ public class BattleUI : MonoBehaviour
         //    BattleCtrl.instance.SelectPropState = true;
         //}
 
+        if (LocalRecord.HasKey(GlobalConfig.CoinReCordKey))
+        {
+            m_coin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
+        }
+        else
+        {
+            m_coin = 100;//初始给100
+            LocalRecord.SetIntRecord(GlobalConfig.CoinReCordKey, m_coin);
+        }
         if (m_propSelectUi)
         {
             m_propSelectUi.Show();

BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs

@@ -25,10 +25,10 @@ public class PropSelectUI : MonoBehaviour
     public Button m_coinButton;
     public Button m_KnifeButton;
 
-    private int m_needMoneyOne = 10;
-    private int m_needMoneyTwo = 40;
-    private int m_needMoneyThree = 80;
-    private int m_needMoneyFour = 100;
+    private int m_needMoneyOne = 0;
+    private int m_needMoneyTwo = 0;
+    private int m_needMoneyThree = 0;
+    private int m_needMoneyFour = 0;
 
     //private bool m_bIsBuyOne;
     //private bool m_bIsBuyTwo;

BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

@@ -6061,7 +6061,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 240, y: 74}
+  m_AnchoredPosition: {x: 147.8, y: 74}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929955050858487627
@@ -7115,7 +7115,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 240, y: 0}
+  m_AnchoredPosition: {x: 149.5, y: 0}
   m_SizeDelta: {x: 20, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4451731301031833143
@@ -7595,7 +7595,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5361302980812627964
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9282,7 +9282,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 60, y: 74}
+  m_AnchoredPosition: {x: -0.9, y: 74}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2961904627599851865
@@ -12263,7 +12263,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677159922112}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -12317,7 +12317,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677159922112}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
   m_Name: 
@@ -13166,7 +13166,7 @@ Animator:
   m_GameObject: {fileID: 6064464677660112694}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -16728,7 +16728,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -120, y: 74}
+  m_AnchoredPosition: {x: -150.3, y: 74}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2362660969704643474
@@ -19440,7 +19440,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3
+  m_Text: '?'
 --- !u!1 &9212786435426634722
 GameObject:
   m_ObjectHideFlags: 0

BoomMaster/Assets/#B2_Graphics.meta

+fileFormatVersion: 2
+guid: 317d19313d1d7204e9bbc37122116e7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C1_Models/Props/Prefab/Props4Parent.prefab

@@ -253,7 +253,7 @@ Animator:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6639848910144351729}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: 770fb26f08fbbae459033ae04e608a9d, type: 2}
   m_CullingMode: 0

BoomMaster/Assets/#C2_Animations/Porps4_Idle.anim

@@ -132,7 +132,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

BoomMaster/Assets/#C2_Animations/Props4.controller

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-7768999641122944336
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: Value
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1240991289833488374}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-1261298109814287111
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: Value
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2855802888761130571}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9375
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1240991289833488374
 AnimatorState:
   serializedVersion: 5
@@ -10,7 +60,8 @@ AnimatorState:
   m_Name: Porps4_Idle
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -1261298109814287111}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -34,7 +85,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: Props4
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Value
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -62,7 +119,7 @@ AnimatorStateMachine:
     m_Position: {x: 250, y: 330, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -1240991289833488374}
-    m_Position: {x: 220, y: 200, z: 0}
+    m_Position: {x: 250, y: 190, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -72,7 +129,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 2855802888761130571}
+  m_DefaultState: {fileID: -1240991289833488374}
 --- !u!1102 &2855802888761130571
 AnimatorState:
   serializedVersion: 5
@@ -83,7 +140,8 @@ AnimatorState:
   m_Name: Porps4_Attack
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -7768999641122944336}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

BoomMaster/Assets/#Z1_Tabs.meta

+fileFormatVersion: 2
+guid: ca40beb7fc6998f40a6e15a59c6ab599
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#Z2_Documents.meta

+fileFormatVersion: 2
+guid: 325c11e064841204bbd6de7c85bebef6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#Z3_WebAPI.meta

+fileFormatVersion: 2
+guid: aa43ce62596b0784081ec9bd0abc8516
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#Z4_Previews.meta

+fileFormatVersion: 2
+guid: 55c4962f2a6593c4b9c1bb6003b1ff08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab

@@ -6193,7 +6193,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &3451800650240289083
 Transform:
   m_ObjectHideFlags: 0
@@ -10299,7 +10299,7 @@ MonoBehaviour:
   m_chainRopeView: {fileID: 0}
   m_camera: {fileID: 0}
   m_bombView: {fileID: 3451800651537292261}
-  curLevelIndex: 1
+  curLevelIndex: 0
 --- !u!114 &3451800651537292261
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10315,6 +10315,9 @@ MonoBehaviour:
   m_cameraTrans: {fileID: 3451800649926637928}
   m_rootTrans: {fileID: 3121500411971811190}
   m_propPosParent: {fileID: 1633887187434432277}
+  lineRenderer: {fileID: 3451800650340832984}
+  m_normalObj: {fileID: 5320918402582742454}
+  m_cutOffObj: {fileID: 5795836104360549552}
 --- !u!65 &4809511935948006901
 BoxCollider:
   m_ObjectHideFlags: 0