diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 716236044..03932e299 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -23295,8 +23295,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: d60b2d9427fe9d3675d8a7dfcd87355e - Size: 15629342 + Hash: 87fb02b0e4a45289b5e84b52150afd3f + Size: 15629341 Assets: - Path: Assets/ResRaw/Fgui/Common/Background - Gray (Light).png Address: UI/Background - Gray (Light) @@ -41928,8 +41928,8 @@ MonoBehaviour: Dependencies: [] Tags: - Name: main/plyaer.bundle - Hash: 44e8e09453d51e947b7f6f0034ba15d5 - Size: 393873086 + Hash: 3b776aff4b78aa80eb66895d5a7df917 + Size: 393872102 Assets: - Path: Assets/ResRaw/Prefabs/chwytak/chwytak.prefab Address: Plyaer/chwytak diff --git a/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat b/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat index fc6d1cbe9..1d30dd9f5 100644 --- a/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat +++ b/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat @@ -284,7 +284,7 @@ Material: - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _DstBlend2: 10 - - _DstBlendAlpha: 10 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 diff --git a/Assets/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 2a3f3e1a0..6bd0bbab8 100644 Binary files a/Assets/ResRaw/Fgui/Main/Main_fui.bytes and b/Assets/ResRaw/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/ResRaw/Maps/Map1/Map1.unity b/Assets/ResRaw/Maps/Map1/Map1.unity index 4eb58a5a0..ca4411db4 100644 --- a/Assets/ResRaw/Maps/Map1/Map1.unity +++ b/Assets/ResRaw/Maps/Map1/Map1.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 0.8050667 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_SkyboxMaterial: {fileID: 1945732412} + m_SkyboxMaterial: {fileID: 1769569826} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -729,7 +729,7 @@ MonoBehaviour: - rid: 2003882626816671954 type: {class: DynamicWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: - _Enabled: 0 + _Enabled: 1 _OverrideResolution: 0 _Resolution: 512 _TextureFormatMode: 300 @@ -801,7 +801,7 @@ MonoBehaviour: - rid: 2003882626816671959 type: {class: ClipLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} data: - _Enabled: 0 + _Enabled: 1 _OverrideResolution: 1 _Resolution: 256 _TextureFormatMode: 100 @@ -1381,6 +1381,54 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1769569826 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enviro/Skybox + m_Shader: {fileID: 4800000, guid: 34fee0a1b19b20b45aea7483b5f757da, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _GalaxyTex: + m_Texture: {fileID: 8900000, guid: 5734983fc81450b4187c3cfa5985edef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MoonGlowTex: + m_Texture: {fileID: 2800000, guid: 6838e0810da4e49488b5d9a6ee76eb07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MoonTex: + m_Texture: {fileID: 2800000, guid: c6fd9f694390e0245b6dca5812065950, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _StarsTex: + m_Texture: {fileID: 8900000, guid: b5a7175da0f133b4d951c19c9c2cebfc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SunTex: + m_Texture: {fileID: 2800000, guid: c95bed5306e94f24ba5802d841607ac7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1804549341 GameObject: m_ObjectHideFlags: 0 @@ -1439,54 +1487,6 @@ MonoBehaviour: _MaximumSpeed: 100 _WarnOnSpeedClamp: 0 _DebugSubsteps: 0 ---- !u!21 &1945732412 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Enviro/Skybox - m_Shader: {fileID: 4800000, guid: 34fee0a1b19b20b45aea7483b5f757da, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _GalaxyTex: - m_Texture: {fileID: 8900000, guid: 5734983fc81450b4187c3cfa5985edef, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MoonGlowTex: - m_Texture: {fileID: 2800000, guid: 6838e0810da4e49488b5d9a6ee76eb07, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MoonTex: - m_Texture: {fileID: 2800000, guid: c6fd9f694390e0245b6dca5812065950, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _StarsTex: - m_Texture: {fileID: 8900000, guid: b5a7175da0f133b4d951c19c9c2cebfc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SunTex: - m_Texture: {fileID: 2800000, guid: c95bed5306e94f24ba5802d841607ac7, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: [] - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &2079119365 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab index 4351f05d9..411353b2c 100644 --- a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab +++ b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 5757538020472164704} m_Layer: 0 - m_Name: RodRoot + m_Name: LeftRodRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Fishing/Player/States/PlayerStateFishing.cs b/Assets/Scripts/Fishing/Player/States/PlayerStateFishing.cs index b53cc2193..cd02a6bc8 100644 --- a/Assets/Scripts/Fishing/Player/States/PlayerStateFishing.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStateFishing.cs @@ -23,7 +23,80 @@ namespace NBF protected override uint onUpdate() { - return States.None; + var ret = States.None; + var isUpRod = false; + var isSubLine = false; + + if (InputManager.IsOp1) + { + if (!Player.Data.IsLureRod) + { + //抬杆 + isUpRod = true; + } + else + { + //收线 + isSubLine = true; + } + } + + if (InputManager.IsOp2) + { + if (Player.Data.IsLureRod) + { + //抬杆 + isUpRod = true; + } + } + + //Player.ModelAsset.PlayerAnimator.FishingUp = 0; + + if (isUpRod || Player.ModelAsset.PlayerAnimator.FishingUp > 0) + { + var upForce = 1; + var addNum = upForce * Time.deltaTime; + if (!isUpRod) + { + addNum *= -1; + } + else + { + addNum *= 0.5f; + } + + // Debug.Log($"addNum={addNum}"); + Player.ModelAsset.PlayerAnimator.FishingUp += addNum; + Debug.LogError($"ishingFinal={Player.ModelAsset.PlayerAnimator.FishingUp}"); + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 1) + { + Player.ModelAsset.PlayerAnimator.FishingUp = 1; + } + else if (Player.ModelAsset.PlayerAnimator.FishingUp < 0) + { + Player.ModelAsset.PlayerAnimator.FishingUp = 0; + } + + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) + { + ret = CheckTackFish(); + } + } + else + { + Player.ModelAsset.PlayerAnimator.FishingUp = 0; + } + + return ret; } + + #region 检查上鱼或者返回待机 + + private uint CheckTackFish() + { + return (uint)PlayerState.Idle; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs index 7f263f907..4226971f3 100644 --- a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs +++ b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs @@ -19,6 +19,7 @@ namespace NBF protected override void OnShow() { + InputManager.Instance.On(this); ItemInfo = GetData() as ItemInfo; if (ItemInfo == null || ItemInfo.Config == null) { @@ -35,32 +36,89 @@ namespace NBF // var model = PrefabsHelper.CreatePrefab(ItemInfo.Config.Model); Model.SetData(ItemInfo); // Model.SetBackground(Back); - - InputManager.OnUICanceled += OnUICanceled; } - private void OnUICanceled(string action) + #region UI事件 + + // + // [InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)] + // private void OnPrev() + // { + // ItemList.Menu.OnClickBtnPrev(); + // } + // + // [InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)] + // private void OnNext() + // { + // ItemList.Menu.OnClickBtnNext(); + // } + // + // [InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)] + // private void OnLeft() + // { + // ItemList.List.Selector.Left(); + // } + // + // [InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)] + // private void OnRight() + // { + // ItemList.List.Selector.Right(); + // } + // + // [InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)] + // private void OnUp() + // { + // ItemList.List.Selector.Up(); + // // ChangeListSelected(); + // } + // + // [InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)] + // private void OnDown() + // { + // ItemList.List.Selector.Down(); + // } + // + // [InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "查看")] + // private void OnApplySettings() + // { + // var selectedItem = ItemList.List.Selector.SelectedItem; + // if (selectedItem != null) + // { + // ItemList.List.InvokeClickItem(selectedItem); + // } + // } + + + [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)] + private void OnBack() { - if (!IsTop) return; - if (action == InputDef.UI.SubPrev) - { - } - else if (action == InputDef.UI.SubNext) - { - } - else if (action == InputDef.UI.Up) - { - } - else if (action == InputDef.UI.Down) - { - } + Hide(); } + #endregion + + // private void OnUICanceled(string action) + // { + // if (!IsTop) return; + // if (action == InputDef.UI.SubPrev) + // { + // } + // else if (action == InputDef.UI.SubNext) + // { + // } + // else if (action == InputDef.UI.Up) + // { + // } + // else if (action == InputDef.UI.Down) + // { + // } + // } + protected override void OnHide() { + InputManager.Instance.Off(this); Model.UnloadModel(); - InputManager.OnUICanceled -= OnUICanceled; } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Binders/Binder.cs b/Assets/Scripts/UI/Binders/Binder.cs index b1f7bb041..6d45ddcbc 100644 --- a/Assets/Scripts/UI/Binders/Binder.cs +++ b/Assets/Scripts/UI/Binders/Binder.cs @@ -8,6 +8,7 @@ CommonBinder.BindAll(); FishingBinder.BindAll(); MainBinder.BindAll(); + Common2Binder.BindAll(); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs index 8f11515cd..152618cad 100644 --- a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs +++ b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs @@ -37,7 +37,8 @@ namespace NBF } else if (btn == BtnMake) { - MakePanel.Show(); + BagSlotPanel.Show(); + // MakePanel.Show(); } else if (btn == BtnMap) { diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 60c175670..fcdd0d8eb 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -32,14 +32,14 @@ namespace NBF { await LoginHelper.Login(InputAccount.text); - // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); + await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); // FishingShopPanel.Show(); // BagPanel.Show(); // BagSlotPanel.Show(); - SettingPanel.Show(); + // SettingPanel.Show(); // HomePanel.Show(); diff --git a/FGUIProject/assets/Main/Bag/BagSelectPanel.xml b/FGUIProject/assets/Main/Bag/BagSelectPanel.xml index d8582538f..8973acb9e 100644 --- a/FGUIProject/assets/Main/Bag/BagSelectPanel.xml +++ b/FGUIProject/assets/Main/Bag/BagSelectPanel.xml @@ -12,7 +12,7 @@ -