修改开店动画逻辑

.gitignore

@@ -93,8 +93,12 @@ Blacksmith/Library/
 Blacksmith/Temp/
 Blacksmith/Logs/
 Blacksmith/.idea/
+<<<<<<< Updated upstream
 Blacksmith/obj/
 Blacksmith/Bundles/WebGL/DefaultPackage/v1/defaultpackage_share_assets_pack_icon_ab672aa8e5ab40ed8ed986ca6f9f2e5e.bundle
 Blacksmith/Bundles/
 Blacksmith/Assets/StreamingAssets/yoo/
 Blacksmith/MemoryCaptures/
+=======
+Blacksmith/obj/
+>>>>>>> Stashed changes

Blacksmith/Assets/Editor/StarkBuilderSetting.asset

@@ -0,0 +1,52 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 1315287583, guid: 76741459812cc496eb3634fdc0e9cc80, type: 3}
+  m_Name: StarkBuilderSetting
+  m_EditorClassIdentifier: 
+  wasmResourceUrl: http://
+  webGLOutputDir: E:/Project/apk/BlacksmithTT
+  useByteAudioAPI: 0
+  wasmMemorySize: 128
+  isWebGL2: 1
+  needCompress: 1
+  symbolMode: 1
+  profiling: 0
+  buildOptions: 0
+  optimizeWebGLMemoryInBackground: 1
+  assetBundleFSEnabled: 1
+  assetBundleBufferCapacity: 128
+  assetBundleBufferTTL: 5
+  urlCacheList: []
+  dontCacheFileNames: []
+  isDevBuild: 0
+  stripEngineCode: 0
+  apkFileNameBase: 
+  apkOutputDir: 
+  appHost: 2
+  compressMethod: 1
+  runtimeEnv: 0
+  framework: 1
+  architecture: 2
+  miniApkVersion: 0
+  scriptingBackend: 0
+  NativeWhiteListRegex:
+  - com.bytedance.starksdk
+  - _Backup~
+  a: tt71d3076eeee6cd1207
+  version: 
+  autoVersion: 0
+  b: E:\Project\apk\BlacksmithTT\webgl_package-20241222_220917.zip
+  c: 0
+  d: 0
+  e: 0
+  publishDesc: 
+  idePath: "D:/TT/@bytedminiprogram-ide/\u6296\u97F3\u5F00\u53D1\u8005\u5DE5\u5177.exe"

Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: f167b224892e7e34aad7ca52a0bcc83e
+guid: 96132ae8c02642748804dc8b5f9f148e
-DefaultImporter:
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Blacksmith/Assets/Resources/Data/blacksmithdata_main.json

@@ -160,5 +160,35 @@
     "ConstantValue": "2602",
     "ConstantString": "",
     "Commant": "默认解锁道具7"
+  },
+  {
+    "ID": 28,
+    "ConstantValue": "10",
+    "ConstantString": "",
+    "Commant": "默认拥有木"
+  },
+  {
+    "ID": 29,
+    "ConstantValue": "10",
+    "ConstantString": "",
+    "Commant": "默认拥有铁"
+  },
+  {
+    "ID": 30,
+    "ConstantValue": "10",
+    "ConstantString": "",
+    "Commant": "默认拥有布"
+  },
+  {
+    "ID": 31,
+    "ConstantValue": "10",
+    "ConstantString": "",
+    "Commant": "默认拥有皮"
+  },
+  {
+    "ID": 32,
+    "ConstantValue": "10",
+    "ConstantString": "",
+    "Commant": "默认拥有银"
   }
 ]

Blacksmith/Assets/Script/PrefabPool.cs.rej

@@ -1,28 +0,0 @@
-diff a/Blacksmith/Assets/Script/PrefabPool.cs b/Blacksmith/Assets/Script/PrefabPool.cs	(rejected hunks)
-@@ -34,6 +34,26 @@
-         obj.SetActive(true);
-         action.Invoke(obj);
-     }
-+    public void LoadObj(string key,int i,Action<GameObject,int> action)
-+    {
-+        //如果池中没有该游戏物体或者游戏物体的队列中已经没有剩余的游戏对象时。
-+        //在这种情况下需要实例化一个新的物体，然后在判断是否需要在池中新加一个健值对还是直接放入队列中去
-+        //然后把新生成的放入池中。
-+        
-+        if (!objDic.ContainsKey(key)||objDic[key].Count==0) {
-+            AssetBundleManager.ins.LoadAsset(key, (GameObject obj) =>
-+            {
-+                obj.name = key;
-+                obj.SetActive(true);
-+                action.Invoke(obj,i);
-+            });
-+            return;
-+        }
-+
-+        var obj = objDic[key].Dequeue();
-+        obj.SetActive(true);
-+        action.Invoke(obj,i);
-+    }
- 
-     public void AddPond(string key,int num)
-     {

Blacksmith/Assets/Script/UI/ForgePanel.cs

@@ -2,6 +2,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Spine;
+using Spine.Unity;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -20,6 +22,9 @@ public class ForgePanel : MonoBehaviour
     [SerializeField] private List<CraftingUI> _craftingUis;
     [SerializeField] private Button _craftButton;
     [SerializeField] private NPCTrigger _npcTrigger;
+    [SerializeField] private SkeletonGraphic startAni;
+
+    [SerializeField] private GameObject openParent;
     [SerializeField] private Button startButton;
     [SerializeField] private Button title;
     [SerializeField] public Button _buyEventButton;
@@ -68,15 +73,23 @@ public class ForgePanel : MonoBehaviour
     public void Close()
     {
         _npcTrigger.Close();
-        startButton.gameObject.SetActive(true);
+        openParent.SetActive(true);
         _craftingPanel.gameObject.SetActive(false);
     }
 
     public void OpenStartPanel()
     {
-        _settlementPanel.gameObject.SetActive(true);
+        openParent.SetActive(true);
+        startAni.AnimationState.SetAnimation(0, "EnterAnim_1", false);
+        startAni.AnimationState.Complete += StarIdle;
         _settlementPanel.SettlementEvent();
     }
+
+    public void StarIdle(TrackEntry trackentry)
+    {
+        startAni.AnimationState.Complete -= StarIdle;
+        startAni.AnimationState.SetAnimation(0, "idle_1", true);
+    }
     public void CloseTitle()
     {
         title.gameObject.SetActive(false);
@@ -97,10 +110,17 @@ public class ForgePanel : MonoBehaviour
 
     void GameStart()
     {
-        GameSystem.ins.StartNpcData();
+        startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false);
-        startButton.gameObject.SetActive(false);
+        startAni.AnimationState.Complete += StartEvent;
     }
 
+    private void StartEvent(TrackEntry trackentry)
+    {
+        startAni.AnimationState.Complete -= StartEvent;
+        GameSystem.ins.StartNpcData();
+        openParent.SetActive(false);
+    }
+    
     void CraftEvent()
     {
         _craftingPanel.gameObject.SetActive(true);

Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset

@@ -9,21 +9,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1795359250, guid: 1cf430f187a0b40eda7f668318d8be23, type: 3}
+  m_Script: {fileID: 0}
   m_Name: MiniGameConfig
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: wx-editor:WeChatWASM:WXEditorScriptObject
   ProjectConf:
     projectName: 
-    Appid: wxebc4a7e0a0792246
+    Appid: 
-    CDN: https://youtukeji.com.cn/Game/Blacksmithv2/
+    CDN: 
     assetLoadType: 0
-    compressDataPackage: 1
+    compressDataPackage: 0
     VideoUrl: 
-    DST: E:\Project\apk\Blacksmith
+    DST: E:\UnityProject\Game\Blacksmith\
     StreamCDN: 
     bundleHashLength: 32
     bundlePathIdentifier: StreamingAssets;
-    bundleExcludeExtensions: json;version;bytes;
+    bundleExcludeExtensions: json;
     AssetsUrl: 
     MemorySize: 256
     HideAfterCallMain: 1
@@ -46,7 +46,7 @@ MonoBehaviour:
     UseMiniGameChat: 0
     PreloadWXFont: 0
   CompileOptions:
-    DevelopBuild: 1
+    DevelopBuild: 0
     AutoProfile: 0
     ScriptOnly: 0
     Il2CppOptimizeSize: 1
@@ -58,7 +58,7 @@ MonoBehaviour:
     CleanBuild: 0
     CustomNodePath: 
     autoAdaptScreen: 1
-    showMonitorSuggestModal: 0
+    showMonitorSuggestModal: 1
     enableProfileStats: 0
     enableRenderAnalysis: 0
     enablePerfAnalysis: 0

Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta

@@ -2,7 +2,11 @@ fileFormatVersion: 2
 guid: 8deef7d4eaf645f48a68c68a2b347a57
 NativeFormatImporter:
   externalObjects: {}
+<<<<<<< Updated upstream
   mainObjectFileID: 11400000
+=======
+  mainObjectFileID: 0
+>>>>>>> Stashed changes
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Blacksmith/UserSettings/Layouts/default-2022.dwlt

@@ -39,9 +39,15 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 1913
+<<<<<<< Updated upstream
     y: 48
     width: 1920
     height: 984
+=======
+    y: 54
+    width: 1920
+    height: 978
+>>>>>>> Stashed changes
   m_ShowMode: 0
   m_Title: Game
   m_RootView: {fileID: 7}
@@ -67,7 +73,11 @@ MonoBehaviour:
     width: 1920
     height: 989
   m_ShowMode: 4
+<<<<<<< Updated upstream
   m_Title: Console
+=======
+  m_Title: Project
+>>>>>>> Stashed changes
   m_RootView: {fileID: 12}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -122,7 +132,11 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 50}
   m_MaxSize: {x: 8096, y: 8096}
   vertical: 0
+<<<<<<< Updated upstream
   controlID: 38
+=======
+  controlID: 39
+>>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -142,9 +156,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
+<<<<<<< Updated upstream
     height: 984
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
+=======
+    height: 978
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+>>>>>>> Stashed changes
   m_ActualView: {fileID: 26}
   m_Panes:
   - {fileID: 26}
@@ -169,7 +189,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
+<<<<<<< Updated upstream
     height: 984
+=======
+    height: 978
+>>>>>>> Stashed changes
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
@@ -199,7 +223,11 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
+<<<<<<< Updated upstream
   controlID: 118
+=======
+  controlID: 116
+>>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -220,8 +248,8 @@ MonoBehaviour:
     y: 0
     width: 347
     height: 939
-  m_MinSize: {x: 276, y: 71}
+  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -246,8 +274,13 @@ MonoBehaviour:
     y: 0
     width: 388
     height: 559
+<<<<<<< Updated upstream
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
+=======
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+>>>>>>> Stashed changes
   m_ActualView: {fileID: 23}
   m_Panes:
   - {fileID: 23}
@@ -263,7 +296,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -272,14 +305,20 @@ MonoBehaviour:
     y: 559
     width: 1573
     height: 380
+<<<<<<< Updated upstream
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 25}
+=======
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 21}
+>>>>>>> Stashed changes
   m_Panes:
   - {fileID: 21}
   - {fileID: 25}
-  m_Selected: 1
+  m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -375,7 +414,11 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
+<<<<<<< Updated upstream
   controlID: 71
+=======
+  controlID: 125
+>>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &16
 MonoBehaviour:
@@ -401,7 +444,11 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
+<<<<<<< Updated upstream
   controlID: 72
+=======
+  controlID: 70
+>>>>>>> Stashed changes
   draggingID: 0
 --- !u!114 &17
 MonoBehaviour:
@@ -422,8 +469,13 @@ MonoBehaviour:
     y: 0
     width: 1185
     height: 559
+<<<<<<< Updated upstream
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
+=======
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+>>>>>>> Stashed changes
   m_ActualView: {fileID: 24}
   m_Panes:
   - {fileID: 24}
@@ -604,7 +656,11 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
+<<<<<<< Updated upstream
     - Assets/Script/UI
+=======
+    - Assets
+>>>>>>> Stashed changes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -612,16 +668,27 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
+<<<<<<< Updated upstream
   - Assets/Script/UI
+=======
+  - Assets
+>>>>>>> Stashed changes
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\UnityProject\Game\Blacksmith
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
+<<<<<<< Updated upstream
     scrollPos: {x: 0, y: 349}
     m_SelectedIDs: 308d0000
     m_LastClickedID: 36144
     m_ExpandedIDs: 000000007a8b00007c8b0000c88c0000e48c0000ea8c0000308d0000328d0000dc50030000ca9a3bffffff7f
+=======
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 3c410000
+    m_LastClickedID: 16700
+    m_ExpandedIDs: 000000003c410000e8410000d843000000ca9a3bffffff7f
+>>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -649,7 +716,11 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
+<<<<<<< Updated upstream
     m_ExpandedIDs: 000000007a8b00007c8b00007e8b0000
+=======
+    m_ExpandedIDs: 
+>>>>>>> Stashed changes
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -674,9 +745,15 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
+<<<<<<< Updated upstream
     m_SelectedInstanceIDs: c0cf0500
     m_LastClickedInstanceID: 380864
     m_HadKeyboardFocusLastEvent: 1
+=======
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 0
+>>>>>>> Stashed changes
     m_ExpandedInstanceIDs: c623000044860000228500003c0001002e000100be740000c4740000c2740000b4740000b2740000ba740000bc740000b0740000c0740000b6740000b87400009c7400008c740000867400009274000098740000967400009a74000090740000a07400008e740000847400009e740000000000004683000040830000388300005c830000aa780000d0690000e4690000f06a0000c06b00003a6a000070360500107a0000e27900009e6a0000267a0000387a00001e7a000082500200f0790000287a00007c7d00007aa100002a130100381301001a8300000c83000068f90200e88a0000728a00006a8d0000768a0000208a00006e8a0000008e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -701,7 +778,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
+<<<<<<< Updated upstream
     m_ScrollPosition: {x: 0, y: 40}
+=======
+    m_ScrollPosition: {x: 0, y: 0}
+>>>>>>> Stashed changes
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 379
@@ -789,9 +870,15 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
+<<<<<<< Updated upstream
       m_SelectedIDs: c0cf0500
       m_LastClickedID: 380864
       m_ExpandedIDs: 4047fdff4c47fdff5847fdff6447fdff6e47fdff004dfdff3268fdffa869fdff906afdff1870fdff4273fdff6083fdffacccfdffb2ccfdffb4ccfdffb6ccfdffbaccfdffbeccfdffc2ccfdff3038ffff3438ffff3a38ffff3e38ffff4038ffff4238ffff4438ffff7846fffffa4dffff7ee6ffffa2e6ffff64f1ffff2af3ffff2cf3ffff30f3ffff16fbffff0672000082720000e27200007a750000fc7500000a7600002476000038760000b6760000e27600002a770000b8770000d677000042790000b87900006a7a0000be7b0000e07b00009c7c0000c87c0000b47d0000b8810000088200005282000094820000f2820000fc820000f48400006e86000088870000ac870000048800005e8800007e5405006c570500505a05007ac10500fec4050036c5050048c60500c0cf0500
+=======
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: ce78fcff2479fcffac7cfcffe88efcfff4abfcfff8bafcff4ebbfcffd2befcffa8acfdffe8adfdff229801000e9c01003a9d0100ac9d0100069e0100249e01006ea2010088a201002ca50100daae0100
+>>>>>>> Stashed changes
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1210,9 +1297,15 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
+<<<<<<< Updated upstream
     m_Target: {x: 592.7956, y: 884.87994, z: -1.187256}
     speed: 2
     m_Value: {x: 592.7956, y: 884.87994, z: -1.187256}
+=======
+    m_Target: {x: 733.4134, y: 614.5811, z: 2.794509}
+    speed: 2
+    m_Value: {x: 733.4134, y: 614.5811, z: 2.794509}
+>>>>>>> Stashed changes
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1262,9 +1355,15 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
+<<<<<<< Updated upstream
     m_Target: 176.87944
     speed: 2
     m_Value: 176.87944
+=======
+    m_Target: 1079.4711
+    speed: 2
+    m_Value: 1079.4711
+>>>>>>> Stashed changes
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1344,9 +1443,15 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 1913
+<<<<<<< Updated upstream
     y: 48
     width: 1920
     height: 963
+=======
+    y: 54
+    width: 1920
+    height: 957
+>>>>>>> Stashed changes
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1402,15 +1507,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 1920
+<<<<<<< Updated upstream
       height: 942
     m_Scale: {x: 0.490625, y: 0.490625}
     m_Translation: {x: 960, y: 471}
+=======
+      height: 936
+    m_Scale: {x: 0.4875, y: 0.4875}
+    m_Translation: {x: 960, y: 468}
+>>>>>>> Stashed changes
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
+<<<<<<< Updated upstream
       x: -1956.6879
       y: -960
       width: 3913.3757
@@ -1418,6 +1530,15 @@ MonoBehaviour:
     m_MinimalGUI: 1
   m_defaultScale: 0.490625
   m_LastWindowPixelSize: {x: 1920, y: 963}
+=======
+      x: -1969.2307
+      y: -960
+      width: 3938.4614
+      height: 1920
+    m_MinimalGUI: 1
+  m_defaultScale: 0.4875
+  m_LastWindowPixelSize: {x: 1920, y: 957}
+>>>>>>> Stashed changes
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000

Blacksmith/project.config.json

@@ -0,0 +1 @@
+{"appid":"tt71d3076eeee6cd1207","projectname":"Blacksmith","unity":{"build":{"webgl":"E:\\Project\\apk\\BlacksmithTT\\webgl_package-20241222_220917.zip","native":{"il2cpp":"","apk":"","fullApk":""},"instantGame":""},"publishType":"2","starkSdkVersion":"Without StarkSDK","unityToolsVersion":"4.0.4","unityEngineVersion":"2022.3.44f1c1","arch":"both"}}