Merge pull request #5204 from planetarium/merge/backmerge-190.0.6-tomain

backmerge release/190.0.6 to main
planetarium · Jun 27, 2024 · cfece6c · cfece6c
2 parents 9700534 + dd12fcd
commit cfece6c
Show file tree

Hide file tree

Showing 79 changed files with 21,335 additions and 20,267 deletions.
diff --git a/.github/workflows/android-build-and-release-for-9ck.yml b/.github/workflows/android-build-and-release-for-9ck.yml
@@ -51,7 +51,7 @@ jobs:
  build:
  name: Build for ${{ matrix.targetPlatform }}
  runs-on:
- labels: ["linux", "8cores"]
+ group: linux-8cores
  defaults:
  run:
  shell: bash

diff --git a/.github/workflows/android-build-and-release.yml b/.github/workflows/android-build-and-release.yml
@@ -60,7 +60,7 @@ jobs:
  build:
  name: Build for ${{ matrix.targetPlatform }}
  runs-on:
- labels: ["linux", "8cores"]
+ group: linux-8cores
  defaults:
  run:
  shell: bash

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
  build:
  name: Build for ${{ matrix.targetPlatform }}
  runs-on:
- labels: ["linux", "8cores"]
+ group: linux-8cores
  defaults:
  run:
  shell: bash

diff --git a/.github/workflows/ios-build-and-release-for-9ck.yml b/.github/workflows/ios-build-and-release-for-9ck.yml
@@ -36,7 +36,7 @@ jobs:
  build:
  name: Build for ${{ matrix.targetPlatform }}
  runs-on: 
- labels: ["linux", "8cores"]
+ group: linux-8cores
  defaults:
  run:
  shell: bash

diff --git a/.github/workflows/ios-build-and-release.yml b/.github/workflows/ios-build-and-release.yml
@@ -39,7 +39,7 @@ jobs:
  build:
  name: Build for ${{ matrix.targetPlatform }}
  runs-on: 
- labels: ["linux", "8cores"]
+ group: linux-8cores
  defaults:
  run:
  shell: bash

diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/ItemView/ItemView_ShopCart.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/ItemView/ItemView_ShopCart.prefab
@@ -1,38 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &2500131001733671945
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3521684216641102730}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
- m_Name: 
- m_EditorClassIdentifier: 
- m_IgnoreLayout: 0
- m_MinWidth: 64
- m_MinHeight: 64
- m_PreferredWidth: 64
- m_PreferredHeight: 64
- m_FlexibleWidth: -1
- m_FlexibleHeight: -1
- m_LayoutPriority: 1
---- !u!114 &2122343705967058995
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3521684216641102730}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 775d8badf40f4d51916de7dbbe7442ea, type: 3}
- m_Name: 
- m_EditorClassIdentifier: 
- baseItemView: {fileID: 2940001543578451742}
 --- !u!1001 &5730770946470943652
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -140,6 +107,11 @@ PrefabInstance:
  propertyPath: m_AnchoredPosition.y
  value: 0
  objectReference: {fileID: 0}
+ - target: {fileID: 8852934787611549579, guid: fd7a738610a297e41bd57e2eebf6fe64,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
  - target: {fileID: 8953210588604891776, guid: fd7a738610a297e41bd57e2eebf6fe64,
  type: 3}
  propertyPath: m_Pivot.x
@@ -252,21 +224,54 @@ PrefabInstance:
  objectReference: {fileID: 0}
  m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fd7a738610a297e41bd57e2eebf6fe64, type: 3}
+--- !u!114 &2940001543578451742 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7443097800403870906, guid: fd7a738610a297e41bd57e2eebf6fe64,
+ type: 3}
+ m_PrefabInstance: {fileID: 5730770946470943652}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3521684216641102730}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 40fcf8383091bc5408284e882ab64823, type: 3}
+ m_Name: 
+ m_EditorClassIdentifier: 
 --- !u!1 &3521684216641102730 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 9176155653163038766, guid: fd7a738610a297e41bd57e2eebf6fe64,
  type: 3}
  m_PrefabInstance: {fileID: 5730770946470943652}
  m_PrefabAsset: {fileID: 0}
---- !u!114 &2940001543578451742 stripped
+--- !u!114 &2122343705967058995
 MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 7443097800403870906, guid: fd7a738610a297e41bd57e2eebf6fe64,
-  type: 3}
- m_PrefabInstance: {fileID: 5730770946470943652}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3521684216641102730}
  m_Enabled: 1
  m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 40fcf8383091bc5408284e882ab64823, type: 3}
+ m_Script: {fileID: 11500000, guid: 775d8badf40f4d51916de7dbbe7442ea, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+ baseItemView: {fileID: 2940001543578451742}
+--- !u!114 &2500131001733671945
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3521684216641102730}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+ m_Name: 
+ m_EditorClassIdentifier: 
+ m_IgnoreLayout: 0
+ m_MinWidth: 64
+ m_MinHeight: 64
+ m_PreferredWidth: 64
+ m_PreferredHeight: 64
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1