Skip to content

Commit

Permalink
v38
Browse files Browse the repository at this point in the history
  • Loading branch information
@osamadeep
osamadeep committed Apr 3, 2022
1 parent 4e6aa7c commit 48ed651
Show file tree
Hide file tree
Showing 43 changed files with 17,555 additions and 231 deletions.
547 changes: 539 additions & 8 deletions nekoyume/Assets/Resources/UI/Animations/[email protected]
View file

Large diffs are not rendered by default.

14,733 changes: 14,720 additions & 13 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_IntroScreen.prefab
View file

Large diffs are not rendered by default.

47 changes: 39 additions & 8 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_LoginSystem.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4577,16 +4577,11 @@ MonoBehaviour:
weakText: {fileID: 8982525103094461117}
correctText: {fileID: 8982525103109909512}
incorrectText: {fileID: 8982525101640386765}
findPassphraseText: {fileID: 8546934586717003951}
backToLoginText: {fileID: 7730270195095015184}
passPhraseText: {fileID: 8982525103194669091}
retypeText: {fileID: 8982525103036616412}
loginText: {fileID: 8134440647035746807}
enterPrivateKeyText: {fileID: 7247492109166561366}
accountAddressText: {fileID: 1446695841905302001}
accountAddressHolder: {fileID: 4385117584919580316}
accountWarningText: {fileID: 6919093850514959571}
successText: {fileID: 6484929487234727352}
submitButton: {fileID: 2170003972628104885}
findPassphraseButton: {fileID: 1408186267810140111}
backToLoginButton: {fileID: 7441353160012381959}
Expand Down Expand Up @@ -6670,11 +6665,31 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Hue
value: -0.076
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_TargetColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_TargetColor.g
value: 0.009229935
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_TargetColor.r
value: 0.9716981
objectReference: {fileID: 0}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 5c804a6c4a18845af937c66cf6be4407,
objectReference: {fileID: 21300000, guid: be03d5034b209486eaf2e7e0eb51ad83,
type: 3}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
Expand Down Expand Up @@ -6881,11 +6896,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Hue
value: 0.167
objectReference: {fileID: 0}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: e7278085bf6284fcfb6e34b1d5359b11,
objectReference: {fileID: 21300000, guid: 7ab9fbbd403704e8a8593437675eb34d,
type: 3}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
Expand Down Expand Up @@ -7092,11 +7112,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Hue
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 141572c8a340e4a0280102c2d42d0bd5,
objectReference: {fileID: 21300000, guid: b56714e42d6ca45768339d60bfabb422,
type: 3}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
Expand Down Expand Up @@ -7293,6 +7318,12 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: ae083b17ccb784d458c0514045970a0b,
type: 3}
- target: {fileID: 2738034447286896192, guid: 094bb0bf1607e5c4591c28d328d1a9b8,
type: 3}
propertyPath: m_Material
Expand Down
12 changes: 11 additions & 1 deletion nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,11 @@ MonoBehaviour:
remainTime: {fileID: 4957891711189253965}
remainTitle: {fileID: 3590160204569870876}
remainTimeSlider: {fileID: 591887341670838801}
rewardObject: {fileID: 7939827613094386082}
rewardText: {fileID: 0}
blockCountText: {fileID: 0}
seasonEnable: {fileID: 0}
seasonDisable: {fileID: 0}
--- !u!222 &2876561089203938498
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -13138,7 +13143,7 @@ PrefabInstance:
- target: {fileID: 7430616929449913940, guid: 29c5c99555c2b5f40a6f757cea5554b3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7430616929449913940, guid: 29c5c99555c2b5f40a6f757cea5554b3,
type: 3}
Expand Down Expand Up @@ -13795,6 +13800,11 @@ PrefabInstance:
propertyPath: m_Name
value: ArenaRankingCount
objectReference: {fileID: 0}
- target: {fileID: 4014431958358925146, guid: e11f1c7b2d219bc4fb49a384825f6362,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4059356325422965550, guid: e11f1c7b2d219bc4fb49a384825f6362,
type: 3}
propertyPath: m_AnchoredPosition.x
Expand Down
9 changes: 8 additions & 1 deletion nekoyume/Assets/Resources/VFX/MaterialsTextures/NY_leaf_01.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NY_leaf_01
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 20fb5fa09d4675a4e94314a228763c23, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand Down Expand Up @@ -57,6 +57,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
Expand All @@ -70,8 +71,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
9 changes: 8 additions & 1 deletion nekoyume/Assets/Resources/VFX/MaterialsTextures/NY_leaf_02.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NY_leaf_02
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 20fb5fa09d4675a4e94314a228763c23, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand Down Expand Up @@ -57,6 +57,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
Expand All @@ -70,8 +71,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
9 changes: 8 additions & 1 deletion nekoyume/Assets/Resources/VFX/MaterialsTextures/NY_leaf_03.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NY_leaf_03
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 20fb5fa09d4675a4e94314a228763c23, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand Down Expand Up @@ -57,6 +57,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
Expand All @@ -70,8 +71,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
3 changes: 2 additions & 1 deletion nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ private void ProcessAction<T>(T gameAction) where T : GameAction
int stageId,
int playCount)
{
PandoraBoxMaster.CurrentAction = PandoraUtil.ActionType.HackAndSlash;
Analyzer.Instance.Track("Unity/HackAndSlash", new Value
{
["WorldId"] = worldId,
Expand Down Expand Up @@ -518,7 +519,7 @@ List<Guid> equipmentIds
throw new NullReferenceException(nameof(weeklyArenaAddress));
}

PandoraBoxMaster.IsRanking = true;
PandoraBoxMaster.CurrentAction = PandoraUtil.ActionType.Ranking;
Analyzer.Instance.Track("Unity/Ranking Battle");
var action = new RankingBattle
{
Expand Down
64 changes: 24 additions & 40 deletions nekoyume/Assets/_Scripts/BlockChain/ActionRenderHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,16 +877,6 @@ private void ResponseHackAndSlash(ActionBase.ActionEvaluation<HackAndSlash> eval
var log = simulator.Log;
Game.Game.instance.Stage.PlayCount = eval.Action.playCount;

//OneLineSystem.Push(MailType.System, "<color=green>Pandora Box</color>: Stage Fight " + "<color=green><b>Successfully</b></color> committed on the blockchain!"
//, NotificationCell.NotificationType.Information);

//if (PandoraBoxMaster.IsRaid)
//{
// Widget.Find<WorldMap>().Close(true);
// Widget.Find<StageInformation>().Close(true);
// Widget.Find<LoadingScreen>().Show();
//}

if (Widget.Find<LoadingScreen>().IsActive())
{
if (Widget.Find<QuestPreparation>().IsActive())
Expand All @@ -904,7 +894,9 @@ private void ResponseHackAndSlash(ActionBase.ActionEvaluation<HackAndSlash> eval
{
Widget.Find<BattleResultPopup>().NextStage(log);
}
else if (PandoraBoxMaster.IsHackAndSlash)

//|||||||||||||| PANDORA START CODE |||||||||||||||||||
if (PandoraBoxMaster.CurrentAction == PandoraUtil.ActionType.HackAndSlash)
{
BattleResultPopup.Model _battleResultModel = new BattleResultPopup.Model();
Widget.Find<BattleResultPopup>().StageProgressBar.Initialize(false);
Expand All @@ -923,8 +915,7 @@ private void ResponseHackAndSlash(ActionBase.ActionEvaluation<HackAndSlash> eval
avatarState.worldInformation.TryGetLastClearedStageId(out var lasStageId);
_battleResultModel.LastClearedStageId = lasStageId;
_battleResultModel.IsClear = log.IsClear;
var succeedToGetWorldRow =
Game.Game.instance.TableSheets.WorldSheet.TryGetValue(log.worldId, out var worldRow);
var succeedToGetWorldRow = Game.Game.instance.TableSheets.WorldSheet.TryGetValue(log.worldId, out var worldRow);
if (succeedToGetWorldRow)
{
_battleResultModel.IsEndStage = log.stageId == worldRow.StageEnd;
Expand All @@ -941,35 +932,14 @@ private void ResponseHackAndSlash(ActionBase.ActionEvaluation<HackAndSlash> eval
}

_battleResultModel.NextState = BattleResultPopup.NextState.Raid;
//_battleResultModel.ActionPointNotEnough = true;
Widget.Find<BattleResultPopup>().Show(_battleResultModel, eval.Action.playCount > 1);

ActionRenderHandler.Instance.Pending = false;
UpdateCurrentAvatarStateAsync(eval);
UpdateWeeklyArenaState(eval);

Widget.Find<BattleResultPopup>().Show(_battleResultModel, eval.Action.playCount > 1);
PandoraBoxMaster.IsHackAndSlash = false;



//Widget.Find<BattleResultPopup>().NextStage(log);

//var task = UniTask.Run(() =>
//{
// UpdateCurrentAvatarStateAsync(eval);
// UpdateWeeklyArenaState(eval);
// var avatarState = States.Instance.CurrentAvatarState;
// RenderQuest(eval.Action.avatarAddress,
// avatarState.questList.completedQuestIds);
// //_disposableForBattleEnd = null;
// //Game.Game.instance.Stage.IsAvatarStateUpdatedAfterBattle = true;
// Widget.Find<HeaderMenuStatic>().actionPoint.SetActionPoint(States.Instance.CurrentAvatarState.actionPoint);
// Widget.Find<HeaderMenuStatic>().actionPoint.SetEventTriggerEnabled(true);
//});
//task.ToObservable()
// .First()
// // ReSharper disable once ConvertClosureToMethodGroup
// .DoOnError(e => Debug.LogException(e));

////Widget.Find<HeaderMenuStatic>().UpdateAssets(HeaderMenuStatic.AssetVisibleState.Main);
//PandoraBoxMaster.IsRaid = false;

//|||||||||||||| PANDORA END CODE |||||||||||||||||||
}
}
else
Expand All @@ -988,6 +958,9 @@ private void ResponseHackAndSlash(ActionBase.ActionEvaluation<HackAndSlash> eval

Game.Game.BackToMain(showLoadingScreen, eval.Exception.InnerException).Forget();
}
//|||||||||||||| PANDORA START CODE |||||||||||||||||||
PandoraBoxMaster.CurrentAction = PandoraUtil.ActionType.Idle;
//|||||||||||||| PANDORA END CODE |||||||||||||||||||
}

private void ResponseMimisbrunnr(ActionBase.ActionEvaluation<MimisbrunnrBattle> eval)
Expand Down Expand Up @@ -1125,6 +1098,14 @@ private void ResponseRankingBattle(ActionBase.ActionEvaluation<RankingBattle> ev
OneLineSystem.Push(MailType.System, "<color=green>Pandora Box</color>: Arena Random Fight " + "<color=green><b>Successfully</b></color> committed on the blockchain!"
, NotificationCell.NotificationType.Information);

if (PandoraBoxMaster.CurrentAction == PandoraUtil.ActionType.Ranking)
{
ActionRenderHandler.Instance.Pending = false;
UpdateAgentStateAsync(eval);
UpdateCurrentAvatarStateAsync(eval);
UpdateWeeklyArenaState(eval);
}

if (Widget.Find<ArenaBattleLoadingScreen>().IsActive())
{
Widget.Find<RankingBoard>().GoToStage(log);
Expand All @@ -1148,6 +1129,9 @@ private void ResponseRankingBattle(ActionBase.ActionEvaluation<RankingBattle> ev

Game.Game.BackToMain(showLoadingScreen, eval.Exception.InnerException).Forget();
}
//|||||||||||||| PANDORA START CODE |||||||||||||||||||
PandoraBoxMaster.CurrentAction = PandoraUtil.ActionType.Idle;
//|||||||||||||| PANDORA END CODE |||||||||||||||||||
}

private void ResponseRedeemCode(ActionBase.ActionEvaluation<Action.RedeemCode> eval)
Expand Down
2 changes: 1 addition & 1 deletion nekoyume/Assets/_Scripts/Game/Event/EventManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using Nekoyume.Helper;
using UnityEngine;
Expand Down
15 changes: 0 additions & 15 deletions nekoyume/Assets/_Scripts/Game/Stage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,10 +518,6 @@ private IEnumerator CoStageEnd(BattleLog log)
_onEnterToStageEnd.OnNext(this);
yield return new WaitUntil(() => IsAvatarStateUpdatedAfterBattle);
}
//else
//{
// PandoraBoxMaster.IsHackAndSlashSimulate = false;
//}
//|||||||||||||| PANDORA END CODE |||||||||||||||||||

var avatarState = States.Instance.CurrentAvatarState;
Expand Down Expand Up @@ -724,17 +720,6 @@ private IEnumerator CoRankingBattleEnd(BattleLog log, bool forceQuit = false)
yield return null;
}

//public void KillAllCharacters()
//{
// Character.CharacterBase[] characters = GetComponentsInChildren<Character.CharacterBase>();
// //Debug.LogError("Count " + characters.Length);
// foreach (Character.CharacterBase item in characters)
// {
// item.actions.Clear();
// item.gameObject.SetActive(false);
// }
//}

public IEnumerator CoSpawnPlayer(Model.Player character)
{
#if TEST_LOG
Expand Down
Loading

0 comments on commit 48ed651

Please sign in to comment.