From 0551b9f0188d44094e13212472e12327ead195e8 Mon Sep 17 00:00:00 2001 From: CortexCore <2630229280@qq.com> Date: Thu, 27 Feb 2025 17:52:42 +0800 Subject: [PATCH] 1 --- .../Configs/Items/item_suitcase_yangdun.asset | 44 + .../Items/item_suitcase_yangdun.asset.meta | 8 + .../Configs/reference_dictionary.asset | 2 + Assets/Artists/Scripts/Program.cs | 5 + Assets/Artists/UX/ui_inventory_swap.uxml | 24 + Assets/Artists/UX/ui_inventory_swap.uxml.meta | 10 + .../Icons.meta | 8 + .../Icons/Case_1.png | Bin 0 -> 98922 bytes .../Icons/Case_1.png.meta | 140 ++++ .../Models/Airoport.fbx | Bin 464044 -> 459420 bytes .../Models/Materials/Coffe.mat | 4 +- .../Models/Materials/M_Runway_Light_Green.mat | 2 +- .../Models/Materials/M_Runway_Light_Red.mat | 2 +- .../Models/Materials/No Name.mat | 133 +++ .../Models/Materials/No Name.mat.meta | 8 + .../Models/Prefabs/ATM.prefab | 81 +- .../Models/Prefabs/Case_1.prefab | 115 --- .../Models/Prefabs/Introscope.prefab | 445 +++++++++- .../Models/Prefabs/escalator.prefab | 98 +++ .../Scenes/scene_terminal.unity | 786 +++--------------- .../Scenes/scene_terminal_ground.unity | 67 ++ .../Scenes/scene_terminal_interior.unity | 597 +++---------- .../Scenes/scene_terminal_metro.unity | 112 ++- .../Arts/Japanese bus Toei Bus (Tokyo).meta | 8 + .../Japanese bus Toei Bus (Tokyo)/Nagoya.mat | 137 +++ .../Nagoya.mat.meta | 8 + .../bus_rouNagoya.png | Bin 0 -> 270020 bytes .../bus_rouNagoya.png.meta | 140 ++++ .../nagoyabus_emi.png | Bin 0 -> 250789 bytes .../nagoyabus_emi.png.meta | 140 ++++ .../nagoyacity.png | Bin 0 -> 1697239 bytes .../nagoyacity.png.meta | 140 ++++ .../nagoyacitybus.fbx | Bin 0 -> 119052 bytes .../nagoyacitybus.fbx.meta | 114 +++ Assets/Arts/Stylized Traveler's Bag.meta | 8 + Assets/Arts/Stylized Traveler's Bag/bag.fbx | Bin 0 -> 277436 bytes .../Arts/Stylized Traveler's Bag/bag.fbx.meta | 114 +++ Assets/Arts/Stylized Traveler's Bag/bag.png | Bin 0 -> 74718 bytes .../Arts/Stylized Traveler's Bag/bag.png.meta | 140 ++++ Assets/Arts/Stylized Traveler's Bag/bag_D.png | Bin 0 -> 4699369 bytes .../Stylized Traveler's Bag/bag_D.png.meta | 140 ++++ Assets/Arts/Stylized Traveler's Bag/low.mat | 135 +++ .../Arts/Stylized Traveler's Bag/low.mat.meta | 8 + Assets/BITKit/Core/Item/ItemContainer.cs | 5 + .../InputSystem/InputSystemExtensions.cs | 3 +- .../com.unity.probuilder/Settings.json | 2 +- 46 files changed, 2627 insertions(+), 1306 deletions(-) create mode 100644 Assets/Artists/Configs/Items/item_suitcase_yangdun.asset create mode 100644 Assets/Artists/Configs/Items/item_suitcase_yangdun.asset.meta create mode 100644 Assets/Artists/UX/ui_inventory_swap.uxml create mode 100644 Assets/Artists/UX/ui_inventory_swap.uxml.meta create mode 100644 Assets/Arts/Airport - terminal for airplanes/Icons.meta create mode 100644 Assets/Arts/Airport - terminal for airplanes/Icons/Case_1.png create mode 100644 Assets/Arts/Airport - terminal for airplanes/Icons/Case_1.png.meta create mode 100644 Assets/Arts/Airport - terminal for airplanes/Models/Materials/No Name.mat create mode 100644 Assets/Arts/Airport - terminal for airplanes/Models/Materials/No Name.mat.meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo).meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/Nagoya.mat create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/Nagoya.mat.meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/bus_rouNagoya.png create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/bus_rouNagoya.png.meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyabus_emi.png create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyabus_emi.png.meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyacity.png create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyacity.png.meta create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyacitybus.fbx create mode 100644 Assets/Arts/Japanese bus Toei Bus (Tokyo)/nagoyacitybus.fbx.meta create mode 100644 Assets/Arts/Stylized Traveler's Bag.meta create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag.fbx create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag.fbx.meta create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag.png create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag.png.meta create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag_D.png create mode 100644 Assets/Arts/Stylized Traveler's Bag/bag_D.png.meta create mode 100644 Assets/Arts/Stylized Traveler's Bag/low.mat create mode 100644 Assets/Arts/Stylized Traveler's Bag/low.mat.meta diff --git a/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset new file mode 100644 index 000000000..1a3ebf3ae --- /dev/null +++ b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset @@ -0,0 +1,44 @@ +%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: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: item_suitcase_yangdun + m_EditorClassIdentifier: + id: 1006 + displayName: + rid: 2091308013898957191 + description: + rid: 2091308013898957192 + icon: {fileID: 21300000, guid: dac88ff57837fb84bb81ac3c183bab59, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: -8679921383154817045, guid: bfaf50fe3d6e63141946d6385de31004, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 2091308013898957191 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u7F8A\u987F\u7684\u968F\u8EAB\u5305" + - rid: 2091308013898957192 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u7F8A\u987F\u7684\u9B54\u6CD5\u4E16\u754C\u968F\u8EAB\u5305,\u91CC\u9762\u6709\u5404\u79CD\u5404\u6837\u7684\u9B54\u6CD5\u5C0F\u9053\u5177" diff --git a/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset.meta b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset.meta new file mode 100644 index 000000000..b9141aa66 --- /dev/null +++ b/Assets/Artists/Configs/Items/item_suitcase_yangdun.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fe8d1930925e47449bb73f56b373a36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/reference_dictionary.asset b/Assets/Artists/Configs/reference_dictionary.asset index ff90aab8b..fea1ecdd0 100644 --- a/Assets/Artists/Configs/reference_dictionary.asset +++ b/Assets/Artists/Configs/reference_dictionary.asset @@ -25,3 +25,5 @@ MonoBehaviour: Value: item_sushi_futomaski - Key: 1004 Value: item_taiyaki + - Key: 1006 + Value: item_suitcase_yangdun diff --git a/Assets/Artists/Scripts/Program.cs b/Assets/Artists/Scripts/Program.cs index 412b908e0..2f0e35045 100644 --- a/Assets/Artists/Scripts/Program.cs +++ b/Assets/Artists/Scripts/Program.cs @@ -43,6 +43,8 @@ namespace Net.Like.Xue.Tokyo serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); + + serviceCollection.AddSingleton(); //获取服务提供者 await using var serviceProvider = BITApp.ServiceProvider = serviceCollection.BuildServiceProvider(); @@ -70,6 +72,9 @@ namespace Net.Like.Xue.Tokyo serviceProvider.GetRequiredService(); serviceProvider.GetRequiredService(); + + + serviceProvider.GetRequiredService(); Application.targetFrameRate = 165; diff --git a/Assets/Artists/UX/ui_inventory_swap.uxml b/Assets/Artists/UX/ui_inventory_swap.uxml new file mode 100644 index 000000000..f88aa6a18 --- /dev/null +++ b/Assets/Artists/UX/ui_inventory_swap.uxml @@ -0,0 +1,24 @@ + + +