diff --git a/Assets/Resources/config/configs.json b/Assets/Resources/config/configs.json index 1de7a8935..c0e6dd3f2 100644 --- a/Assets/Resources/config/configs.json +++ b/Assets/Resources/config/configs.json @@ -43,7 +43,7 @@ ], "ItemConfig": [ { - "Id": 30001, + "Id": 31001, "Model": "rods/syberia/tele_10037/tele_10037_t13", "Type": 1, "Quality": 1, @@ -55,7 +55,7 @@ "Deal": 0 }, { - "Id": 30002, + "Id": 33002, "Model": "rods/syberia/bolo_10021/bolo_10021_LB400", "Type": 0, "Quality": 2, @@ -67,7 +67,7 @@ "Deal": 0 }, { - "Id": 30003, + "Id": 32003, "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, "Quality": 3, @@ -79,7 +79,7 @@ "Deal": 0 }, { - "Id": 30004, + "Id": 32004, "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, "Quality": 4, @@ -91,7 +91,7 @@ "Deal": 0 }, { - "Id": 30005, + "Id": 32005, "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, "Quality": 5, @@ -103,7 +103,7 @@ "Deal": 0 }, { - "Id": 30006, + "Id": 32006, "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, "Quality": 4, @@ -115,7 +115,7 @@ "Deal": 0 }, { - "Id": 30007, + "Id": 32007, "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, "Quality": 3, diff --git a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs index 5baa9acc4..c30b1749a 100644 --- a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs +++ b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs @@ -58,6 +58,7 @@ namespace NBF protected override void OnHide() { + Model.UnloadModel(); Game.Input.OnUICanceled -= OnUICanceled; } } diff --git a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs index 1e19bf64a..5d6e4d089 100644 --- a/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs +++ b/Assets/Scripts/UI/Common/ModelViewer/ModelViewRenderImage.cs @@ -110,8 +110,6 @@ namespace NBF Object.Destroy(_model.gameObject); _model = null; } - - // _rotating = Vector3.zero; } diff --git a/Assets/Scripts/UI/Common/ModelViewer/ModelViewer.cs b/Assets/Scripts/UI/Common/ModelViewer/ModelViewer.cs index a6e59f5cc..2c516dd04 100644 --- a/Assets/Scripts/UI/Common/ModelViewer/ModelViewer.cs +++ b/Assets/Scripts/UI/Common/ModelViewer/ModelViewer.cs @@ -53,6 +53,11 @@ namespace NBF _renderImage.LoadModel(itemConfig.GetModelPath(), null); } + public void UnloadModel() + { + _renderImage.UnloadModel(); + } + #region 用户输入操作(滑动,拖动等) private bool _focus; diff --git a/Config/BasicConfig.xlsx b/Config/BasicConfig.xlsx deleted file mode 100644 index c37ad998c..000000000 Binary files a/Config/BasicConfig.xlsx and /dev/null differ diff --git a/Config/FishConfig.xlsx b/Config/FishConfig.xlsx deleted file mode 100644 index 608d6ec15..000000000 Binary files a/Config/FishConfig.xlsx and /dev/null differ diff --git a/Config/Gear.xlsx b/Config/Gear.xlsx deleted file mode 100644 index 9da0f0a3a..000000000 Binary files a/Config/Gear.xlsx and /dev/null differ diff --git a/Config/Item.xlsx b/Config/Item.xlsx deleted file mode 100644 index a2973d879..000000000 Binary files a/Config/Item.xlsx and /dev/null differ diff --git a/Config/language/Language.xlsx b/Config/language/Language.xlsx deleted file mode 100644 index 776c81703..000000000 Binary files a/Config/language/Language.xlsx and /dev/null differ diff --git a/Config/language/LanguageFont.xlsx b/Config/language/LanguageFont.xlsx deleted file mode 100644 index b5d1e455a..000000000 Binary files a/Config/language/LanguageFont.xlsx and /dev/null differ diff --git a/Config/language/LanguageImage.xlsx b/Config/language/LanguageImage.xlsx deleted file mode 100644 index 00f0a6af6..000000000 Binary files a/Config/language/LanguageImage.xlsx and /dev/null differ diff --git a/Config/language/~$LanguageFont.xlsx b/Config/language/~$LanguageFont.xlsx deleted file mode 100644 index 3f6dd46cb..000000000 Binary files a/Config/language/~$LanguageFont.xlsx and /dev/null differ diff --git a/Config/language/命名规则.txt b/Config/language/命名规则.txt deleted file mode 100644 index 5d156ee56..000000000 --- a/Config/language/命名规则.txt +++ /dev/null @@ -1,10 +0,0 @@ -模块名_.. -例: -Mission_Title_10001 -Mission_Describe_10001 -Notice_GoldLow -Item_Name_300001 - -艺术字,增加第二个字段,标注为Image -例 -Mission_Image_Title_10001 \ No newline at end of file diff --git a/Config/~$BasicConfig.xlsx b/Config/~$BasicConfig.xlsx deleted file mode 100644 index fd5ec1854..000000000 Binary files a/Config/~$BasicConfig.xlsx and /dev/null differ diff --git a/Config/~$Gear.xlsx b/Config/~$Gear.xlsx deleted file mode 100644 index 036bba4a9..000000000 Binary files a/Config/~$Gear.xlsx and /dev/null differ diff --git a/Config/~$Item.xlsx b/Config/~$Item.xlsx deleted file mode 100644 index 036bba4a9..000000000 Binary files a/Config/~$Item.xlsx and /dev/null differ diff --git a/Config/新建 文本文档.txt b/Config/新建 文本文档.txt deleted file mode 100644 index e69de29bb..000000000