处理一些editor代码

Assets/Editor/CombatEditor/CombaReportEnditorManager.cs

@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 
@@ -119,4 +120,5 @@ public class CombaReportEnditorManager : EditorWindow
             allHeroReportEditors.Remove(remove[i]);
         }
     }
-}
+}
+#endif

Assets/Editor/CombatEditor/CombatPeportMassgeModle.cs

@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Text;
 using Core.BattleReport;
 using GameLogic.Combat.CombatTool.CombatReport;
@@ -78,4 +79,5 @@ namespace xy002Editor.CombatEditor
             label.text = stringBuilder.ToString();
         }
     }
-}
+}
+#endif

Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -1,3 +1,6 @@
+#if UNITY_EDITOR
+
+
 using System;
 using System.Collections.Generic;
 using Core.BattleReport;
@@ -127,7 +130,7 @@ namespace xy002Editor.CombatEditor
             visualElement_h.Add(miaoShuFoldout);
             VisualElement miaoshuve = combaReportEnditorManager.Copy<VisualElement>("miaoshuve"); //英雄信息
             miaoShuFoldout.Add(miaoshuve);
-          
+
             combatPeportMassgeModle = new CombatPeportMassgeModle();
             combatPeportMassgeModle.Init(miaoshuve, combatReportEntityInfo, combaReportEnditorManager);
         }
@@ -179,4 +182,5 @@ namespace xy002Editor.CombatEditor
             root.Remove(foldout);
         }
     }
-}
+}
+#endif

Assets/Editor/CombatEditor/ProgressBarShowModle.cs

@@ -1,3 +1,6 @@
+#if UNITY_EDITOR
+
+
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -74,4 +77,5 @@ namespace xy002Editor.CombatEditor
             }
         }
     }
-}
+}
+#endif

Assets/RenderSkyboxToCubemap.cs

@@ -1,4 +1,7 @@
-using UnityEngine;
+#if UNITY_EDITOR
+
+
+using UnityEngine;
 using UnityEditor;
 
 public class RenderSkyboxToCubemap : MonoBehaviour
@@ -30,3 +33,4 @@ public class RenderSkyboxToCubemap : MonoBehaviour
         Debug.Log("✅ Skybox 已成功渲染并保存为 Cubemap： " + path);
     }
 }
+#endif

Assets/Scripts/GameLogic/Shop/ShopManger.cs

@@ -280,10 +280,11 @@ public class ShopManger : Singleton<ShopManger>
         else if (shopItemConfig.costItemId == 1031)
         {
 #if UNITY_ANDROID && !UNITY_EDITOR
-            var dic = new Dictionary<string, string>();
-            dic.Add("ShopItemId",shopItemConfig.ID.ToString());
-            YouLoftSDK.Instance.CustomEvent("OnclickBuyItem",dic);
-            isOk = await YouLoftSDK.Instance.Buy(shopItemConfig.giftID);
+            // var dic = new Dictionary<string, string>();
+            // dic.Add("ShopItemId",shopItemConfig.ID.ToString());
+            // YouLoftSDK.Instance.CustomEvent("OnclickBuyItem",dic);
+            // isOk = await YouLoftSDK.Instance.Buy(shopItemConfig.giftID);
+              isOk = true;
 #elif UNITY_EDITOR
             isOk = true;
 #endif

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
-using GameLogic.Bag;
-using log4net.Util;
 using UnityEngine;
 using Transform = UnityEngine.Transform;
 

Assets/StreamingAssets/Dll.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bn8btn7/Unl+s6dnAwYMk4DplDVHT+Bf6+Pc9h2bxuM4nCyurnOLxEp4PbRJ
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/Obfuz.asset

@@ -24,6 +24,7 @@ MonoBehaviour:
     - NetCoreBasic
     - Protocol
     - GameTimeLine
+    - Assembly-CSharp
     nonObfuscatedButReferencingObfuscatedAssemblies: []
     additionalAssemblySearchPaths: []
   obfuscationPassSettings:
@@ -38,7 +39,7 @@ MonoBehaviour:
   encryptionVMSettings:
     codeGenerationSecretKey: Obfuz
     encryptionOpCodeCount: 256
-    codeOutputPath: Assets/Obfuz/GeneratedEncryptionVirtualMachine.cs
+    codeOutputPath: Assets/Scripts/GameStart/GeneratedEncryptionVirtualMachine.cs
   symbolObfusSettings:
     debug: 0
     obfuscatedNamePrefix: $

ProjectSettings/ProjectSettings.asset

@@ -805,7 +805,7 @@ PlayerSettings:
   webGLMemoryGeometricGrowthCap: 96
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: KAMGAM_SKY_CLOUDS_URP
+    Android: KAMGAM_SKY_CLOUDS_URP;AMPLIFY_SHADER_EDITOR
     ArmLinux: KAMGAM_SKY_CLOUDS_URP
     ArmLinuxServer: KAMGAM_SKY_CLOUDS_URP
     EmbeddedLinux: KAMGAM_SKY_CLOUDS_URP

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 93
+    y: 688
+    width: 1370
+    height: 543
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -19,12 +43,63 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 2}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1370
+    height: 543
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1370
+    height: 543
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 14001
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +112,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 4}
-  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -52,7 +127,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -73,8 +148,8 @@ MonoBehaviour:
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 1
---- !u!114 &4
+  m_LastLoadedLayoutName: 
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,10 +162,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 12}
   - {fileID: 9}
-  - {fileID: 6}
-  - {fileID: 7}
-  - {fileID: 8}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -100,9 +175,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 791
+  controlID: 160
   draggingID: 0
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -123,7 +198,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,14 +217,14 @@ MonoBehaviour:
     y: 0
     width: 411
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -166,16 +241,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1620
     y: 0
-    width: 367
+    width: 526
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,18 +265,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1987
+    x: 2146
     y: 0
-    width: 573
+    width: 414
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -222,13 +297,47 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 14}
-  - {fileID: 13}
+  - {fileID: 18}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &10
+--- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 93
+    y: 688
+    width: 1370
+    height: 522
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -267,23 +376,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: d2bbf3ffd6bbf3ffe4bbf3fff2f4f3ff34f5f3ff36fff3ff44fff3fff4caf8ff4ecbf8ff56cbf8ff62d1f8ff68d1f8ff54d2f8ff66d2f8ff8ee3ffff
+      m_ExpandedIDs: ca90feff469dfeff4c9dfeff389efeff3c9efeff4a9efeff5ce2feffc601ffff66faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Text_Settlement
-        m_OriginalName: Text_Settlement
+        m_Name: FabaoRoot
+        m_OriginalName: FabaoRoot
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 311550
+        m_UserData: 93114
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -291,7 +400,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,9 +420,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1987
+    x: 2146
     y: 73
-    width: 572
+    width: 413
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -338,7 +447,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -360,7 +469,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1620
     y: 73
-    width: 365
+    width: 524
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -383,7 +492,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI
+    - Assets/Scripts/GameLogic/Combat/CombatTool
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -391,32 +500,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI
+  - Assets/Scripts/GameLogic/Combat/CombatTool
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 00f80000
-    m_LastClickedID: 63488
-    m_ExpandedIDs: 000000000ef7000010f7000012f7000014f7000016f70000def7000000f8000000ca9a3b
+    m_SelectedIDs: 1cec0200
+    m_LastClickedID: 191516
+    m_ExpandedIDs: 0000000020df000022df00007adf00007cdf0000a8df0000b23401003c3701008a370100e4370100244301008e4d020012ec020000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: GameStart
+      m_OriginalName: GameStart
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 79678
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -428,7 +537,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000000ef7000010f7000012f7000014f7000016f7000000ca9a3b
+    m_ExpandedIDs: 0000000020df000022df000024df000026df000028df0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -459,20 +568,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: UniEaseCopy
+      m_OriginalName: UniEaseCopy
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 80962
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -483,8 +592,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 187
---- !u!114 &13
+  m_DirectoriesAreaWidth: 294
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -582,7 +691,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}