Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/90.2.2 #3696

Merged
merged 129 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
14cdc2b
change claim items defualt respone
jonny-jeahyunchoi Nov 20, 2023
1b5aa06
Set currency
Nov 21, 2023
a56674d
Merge pull request #3647 from planetarium/feature/add-current-value
Nov 21, 2023
fe618f1
Merge pull request #3649 from planetarium/release/90.0.24
jonny-jeahyunchoi Nov 21, 2023
64f2351
[Design]UI_IntroScreen_Prefab_Edit
boramqo83 Nov 20, 2023
3370dea
check UNITY_EDITOR first
boscohyun Nov 20, 2023
b9de1bf
introduce SelectPlanetCell
boscohyun Nov 20, 2023
5fbc69d
introduce SelectPlanetScroll
boscohyun Nov 20, 2023
4e5a046
update UI_IntroScreen
boscohyun Nov 20, 2023
c78984a
implement behavior of IntroScreen.SelectPlanetScroll
boscohyun Nov 20, 2023
90c6102
introduce PlanetAccountInfoCell
boscohyun Nov 21, 2023
e96a319
introduce PlanetAccountInfoScroll
boscohyun Nov 21, 2023
b8c1dcb
fix SelectPlanetCell
boscohyun Nov 21, 2023
d71558a
fix SelectPlanetScroll
boscohyun Nov 21, 2023
4f2dec3
update CommandLineOptions.PrivateKey before initialize Agent
boscohyun Nov 21, 2023
37ffe0e
clean up PlanetSelector
boscohyun Nov 21, 2023
419b4fa
add comment temporary
boscohyun Nov 21, 2023
d4aeb5f
apply PlanetAccountInfoScroll in IntroScreen
boscohyun Nov 21, 2023
159ede2
add argument to PlanetSelector.UpdatePlanetAccountInfosAsync
boscohyun Nov 21, 2023
9e01f24
fix minor
boscohyun Nov 21, 2023
37b09a7
show there is no character when agent not pledged
boscohyun Nov 21, 2023
c88021a
Add airbridge events
Nov 21, 2023
07c987b
bump lib9c to 1.5.0
area363 Nov 21, 2023
06c94ce
[Design]UI_IntroScreen_Prefab_Edit
boramqo83 Nov 22, 2023
0d7ce4f
[Design]UI_SeasonPassNewPopup_Prefab_Edit
boramqo83 Nov 22, 2023
d071544
[Design]UI_Craft_Prefab_Edit
boramqo83 Nov 22, 2023
1679b6d
[Design]UI_Battle_Prefab_Edit
boramqo83 Nov 22, 2023
ff7c9a8
[Design]UI_StageInformation_Prefab_Edit
boramqo83 Nov 22, 2023
6475eb2
fix GetKeystore() on runtime
sonohoshi Nov 22, 2023
a79e045
move the timing of Analyzer.SetPlanetId
boscohyun Nov 22, 2023
890856a
[Design]UI_EventReleaseNotePopup_Prefab_Edit
boramqo83 Nov 22, 2023
75de481
remove useless PlanetContext.HasAccount
boscohyun Nov 22, 2023
95b8f49
shuffle the order of PlanetRegistry.PlanetInfos
boscohyun Nov 22, 2023
0b2e6a3
[Design]UI_ProfileSelectPopup_Prefab_Edit
boramqo83 Nov 22, 2023
1bd595f
Merge pull request #3650 from planetarium/feature/add-events
Nov 22, 2023
4e44a37
[Design]UI_RuneEnhancementResultScreen_Prefab_Edit
boramqo83 Nov 22, 2023
64b1b91
show Currency ticker
jonny-jeahyunchoi Nov 22, 2023
64fc6ec
fix lint
boscohyun Nov 22, 2023
a0eba1d
fix text
boscohyun Nov 22, 2023
ab48b5c
[Design]UI_EquipmentTooltip_Prefab_Edit
boramqo83 Nov 22, 2023
25f7be4
remove prosperity meter label
Namyujeong Nov 22, 2023
5c07044
remove mimir dialog
Namyujeong Nov 22, 2023
6fd487e
check null exception
jonny-jeahyunchoi Nov 22, 2023
48d34c8
Merge pull request #3653 from planetarium/bugfix/reset-keystore-at-ru…
sonohoshi Nov 22, 2023
844141a
change korean live asset data to eng on mobile platform
sonohoshi Nov 22, 2023
5ca8fb7
remove ios pushnoti subtitle
jonny-jeahyunchoi Nov 22, 2023
2a98a6a
add SDESC_THERE_IS_NO_ACCOUNT l10n key
boscohyun Nov 22, 2023
349f95b
fix comments and logs
boscohyun Nov 22, 2023
293e996
change UnmarshalBlock invoking to thread pool
sonohoshi Nov 22, 2023
518ad05
Fix error popup
tyrosine1153 Nov 22, 2023
cfe20fb
Fix tooltip prefab bugs
tyrosine1153 Nov 22, 2023
4308afc
Fix item tooltip - disable laycast target, set eventtrigger to scroll…
tyrosine1153 Nov 22, 2023
7355f86
Fix FungibleAssetTooltip, RuneTooltip point event trigger
tyrosine1153 Nov 22, 2023
4547af3
Merge pull request #3656 from planetarium/bugfix/mobileshop-refresh-c…
jonny-jeahyunchoi Nov 22, 2023
9495e96
Merge pull request #3658 from planetarium/bugfix/ios-pushnoti-subtitl…
jonny-jeahyunchoi Nov 22, 2023
b1dbbab
Merge pull request #3661 from planetarium/bugfix/error-popup
tyrosine1153 Nov 22, 2023
0344281
Merge pull request #3654 from planetarium/feature/mail-defualt-respon…
jonny-jeahyunchoi Nov 22, 2023
6d4030f
Merge pull request #3657 from planetarium/bugfix/patch-note-lang
jonny-jeahyunchoi Nov 22, 2023
aeda9ba
Merge pull request #3659 from planetarium/improve/unmarshalblock
sonohoshi Nov 22, 2023
0275df2
chore 90.1.0
jonny-jeahyunchoi Nov 22, 2023
e802724
add pending purchase
jonny-jeahyunchoi Nov 22, 2023
3483ce3
do not recreate Keystore in LoginSystem
boscohyun Nov 22, 2023
fda508e
Merge pull request #3662 from planetarium/fix/recreate-keystore-in-lo…
jonny-jeahyunchoi Nov 22, 2023
d463e1d
Merge pull request #3663 from planetarium/feature/pending-purchase
jonny-jeahyunchoi Nov 22, 2023
3cde9a3
chore 90.1.1
jonny-jeahyunchoi Nov 22, 2023
e31d3a4
fix: added ITSAppUsesNonExemptEncryption
danielbae-devcra Nov 23, 2023
2ac66ba
Delete air bridge sample code
tyrosine1153 Nov 23, 2023
2f2e5d9
add l10n key: LOADING_TO_CONNECT_TO_PLANET
boscohyun Nov 23, 2023
48510a6
add ContentType.WaitingForConnectingToPlanet to DimmedLoadingScreen
boscohyun Nov 23, 2023
4175513
improve loading screen for agent initialization
boscohyun Nov 23, 2023
ca12a89
improve text
boscohyun Nov 23, 2023
4a2baaf
Merge pull request #3665 from planetarium/feature/delete-sample-code
tyrosine1153 Nov 23, 2023
a7fdd7a
Fix world boss l10n key
tyrosine1153 Nov 23, 2023
f2ca027
fix notice json url at korean and pc
sonohoshi Nov 23, 2023
2b2e8f3
change PrepareHackAndSlash to really prepare state for updating
sonohoshi Nov 23, 2023
cddf6d5
improve log message
boscohyun Nov 23, 2023
da86b3c
fix and refactor IntroScreen
boscohyun Nov 23, 2023
6ec2c74
return more values as a tuple in PortalConnect
boscohyun Nov 23, 2023
8674e59
improve signing logic of Game.CoLogin
boscohyun Nov 23, 2023
22f3c49
Merge pull request #3668 from planetarium/bugfix/patch-note-kor-pc
sonohoshi Nov 23, 2023
bd3f3f1
add iap pending and repurchase flow
jonny-jeahyunchoi Nov 23, 2023
5b7be59
Merge pull request #3670 from planetarium/feature/90.1.2-iap-safe
jonny-jeahyunchoi Nov 23, 2023
adb19bc
chore 90.1.2
jonny-jeahyunchoi Nov 23, 2023
91e06e3
Merge pull request #3664 from planetarium/feature/ios-info-plist
jonny-jeahyunchoi Nov 23, 2023
588cfa5
season pass cell view bugfix
jonny-jeahyunchoi Nov 23, 2023
579be2a
Merge pull request #3671 from planetarium/release/90.1.2
jonny-jeahyunchoi Nov 23, 2023
36a868a
state nre exception handling
jonny-jeahyunchoi Nov 23, 2023
2c09d52
Merge pull request #3673 from planetarium/feature/90.1.2-iap-safe
jonny-jeahyunchoi Nov 23, 2023
27685ad
Update Costume Item L10n Add
NineSyu Nov 23, 2023
0ec0e57
Update nekoyume/Assets/_Scripts/UI/Scroller/PlanetAccountInfoCell.cs
boscohyun Nov 24, 2023
0cf0031
Merge pull request #3606 from planetarium/ui/planet-add
boscohyun Nov 24, 2023
9d53426
Merge pull request #3652 from planetarium/ui/seasonpass_popup-edit
jonny-jeahyunchoi Nov 24, 2023
b6b2fa1
Fix costume inventory reddot
tyrosine1153 Nov 23, 2023
d0ecd06
Fix equipment sort error
tyrosine1153 Nov 23, 2023
fe28d34
Merge branch 'development' into ui/ui-polishing-231122
jonny-jeahyunchoi Nov 24, 2023
ab1331e
Merge pull request #3655 from planetarium/ui/ui-polishing-231122
jonny-jeahyunchoi Nov 24, 2023
5828807
Merge pull request #3666 from planetarium/bugfix/red-dot
jonny-jeahyunchoi Nov 24, 2023
c6cdd7b
Merge pull request #3667 from planetarium/bugfix/worldboss-l10n
jonny-jeahyunchoi Nov 24, 2023
a1e3686
Merge pull request #3669 from planetarium/bugfix/update-avatar-action…
jonny-jeahyunchoi Nov 24, 2023
89d74d5
Merge pull request #3672 from planetarium/bugfix/seasonpass-cell-notr…
jonny-jeahyunchoi Nov 24, 2023
bacdbf9
Merge pull request #3674 from planetarium/new-costumeItem-l10n
jonny-jeahyunchoi Nov 24, 2023
57800a5
Merge pull request #3651 from planetarium/bump-lib9c-231121
jonny-jeahyunchoi Nov 24, 2023
1e91694
[Design]UI_Enhancement_Prefabs_Edit
boramqo83 Nov 24, 2023
4173f28
Merge pull request #3676 from planetarium/development
jonny-jeahyunchoi Nov 24, 2023
26b5feb
Merge pull request #3675 from planetarium/ui/upgrade_button-edit
jonny-jeahyunchoi Nov 24, 2023
fc14920
chore 90.2.0
jonny-jeahyunchoi Nov 24, 2023
f8dc12e
seasonpass bug fix
jonny-jeahyunchoi Nov 24, 2023
ac52613
Edit sprite border
tyrosine1153 Nov 23, 2023
fb7358c
Refactor shop ui
tyrosine1153 Nov 23, 2023
6f96f28
RemainTime method to MobileShop
tyrosine1153 Nov 23, 2023
8281a1e
Add TimeLimit Text to ShopListCell, ShopListPopup
tyrosine1153 Nov 24, 2023
2798c07
add timeout handling to dcc GetParts
sonohoshi Nov 24, 2023
9cd336f
add Settings.MasterVolume
sonohoshi Nov 24, 2023
deb7959
use Setting.MasterVolume for AudioListener
sonohoshi Nov 24, 2023
3b376a1
Update nekoyume/Assets/_Scripts/Settings.cs
sonohoshi Nov 24, 2023
f87e60b
remove code and prefab about GrandFinale
sonohoshi Nov 24, 2023
f5b46cc
remove dregs of GrandFinale at code
sonohoshi Nov 24, 2023
0ba1179
remove dregs of GrandFinale at prefab
sonohoshi Nov 24, 2023
cea7ec4
call ArenaInformationOrderedWithScore.UpdateAsync() at ArenaBoard.Sho…
sonohoshi Nov 24, 2023
1e56528
Update ShopListPopup to show at entering lobby
tyrosine1153 Nov 24, 2023
f9ec407
Merge pull request #3682 from planetarium/bugfix/arena-board-score
jonny-jeahyunchoi Nov 25, 2023
a2bea91
Merge pull request #3681 from planetarium/bugfix/master-volume
jonny-jeahyunchoi Nov 25, 2023
eb80fd4
Merge pull request #3680 from planetarium/bugfix/dcc-initialize
jonny-jeahyunchoi Nov 25, 2023
d8ad012
Merge pull request #3679 from planetarium/feature/shop-cell-view
jonny-jeahyunchoi Nov 25, 2023
934c0c2
Merge pull request #3678 from planetarium/bugfix/seasonpass-ui-bugfix
jonny-jeahyunchoi Nov 25, 2023
2dd9872
chore 90.2.1
jonny-jeahyunchoi Nov 25, 2023
3a54af1
Merge pull request #3688 from planetarium/fix/private-key-error
boscohyun Nov 27, 2023
f5d2bfd
Merge pull request #3692 from planetarium/cherry-pick-3688
jonny-jeahyunchoi Nov 27, 2023
2efc2be
chore 90.2.2
jonny-jeahyunchoi Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -514,82 +514,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3355895840381158326
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7535839762550681365}
- component: {fileID: 6483867776925603609}
- component: {fileID: 1435369107652297142}
m_Layer: 5
m_Name: Win
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7535839762550681365
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355895840381158326}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9129760065478134538}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 95, y: 67}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6483867776925603609
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355895840381158326}
m_CullTransparentMesh: 1
--- !u!114 &1435369107652297142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355895840381158326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e6ee4f46a9a2c403abfe9bff514fb55f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3554638772614769806
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -666,82 +590,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3804535062619151780
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2767782327982941398}
- component: {fileID: 4359170499270745007}
- component: {fileID: 5474600044420514369}
m_Layer: 5
m_Name: Lose
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2767782327982941398
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3804535062619151780}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9129760065478134538}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 91, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4359170499270745007
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3804535062619151780}
m_CullTransparentMesh: 1
--- !u!114 &5474600044420514369
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3804535062619151780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ec9d84e57356440dc8aa44d6d8408f89, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3936972823144919216
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1043,7 +891,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1873739629045411989}
- {fileID: 9129760065478134538}
m_Father: {fileID: 1923313123159329931}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1138,8 +985,6 @@ MonoBehaviour:
_cpText: {fileID: 1991182203086928886}
_plusRatingText: {fileID: 4133636230288920637}
_choiceButton: {fileID: 5759196546260136036}
winObject: {fileID: 3355895840381158326}
loseObject: {fileID: 3804535062619151780}
_normalizedPosition: 0
--- !u!1 &6022805100448495617
GameObject:
Expand Down Expand Up @@ -1312,7 +1157,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 19.5
m_fontSize: 17.55
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -1875,44 +1720,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8769797658117863255
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9129760065478134538}
m_Layer: 5
m_Name: WinLoseInfo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9129760065478134538
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8769797658117863255}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7535839762550681365}
- {fileID: 2767782327982941398}
m_Father: {fileID: 7565167441089159519}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 110, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8847354548172463120
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2288,7 +2095,7 @@ PrefabInstance:
- target: {fileID: 2471016746552703132, guid: 2a68c5685c2668a4c8e9ff8c45bab175,
type: 3}
propertyPath: m_fontSize
value: 16
value: 14.15
objectReference: {fileID: 0}
- target: {fileID: 2656173852145778065, guid: 2a68c5685c2668a4c8e9ff8c45bab175,
type: 3}
Expand Down
Loading
Loading