PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【优化】具体化解锁提示、解锁条件更改

iOS_release
zhangaotian 2024-08-21 17:31:49 +08:00
parent 1067ca27bf
commit 6ec1eb01c2
9 changed files with 1832 additions and 1670 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3336
Forest/Assets/Art/Font/Canger SDF.asset
View File

File diff suppressed because one or more lines are too long

60
Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 250, y: 0}
m_SizeDelta: {x: 680, y: 250}
m_SizeDelta: {x: 705, y: 250}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5030026709242919137
CanvasRenderer:
@ -59,8 +59,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 5551254462013057748}
m_Horizontal: 0
m_Vertical: 1
m_Horizontal: 1
m_Vertical: 0
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
@ -135,7 +135,6 @@ GameObject:
- component: {fileID: 6674697601847646494}
- component: {fileID: 7580283149116068277}
- component: {fileID: 8779257074991400646}
- component: {fileID: 8027472545961662239}
m_Layer: 5
m_Name: Text_Content
m_TagString: Untagged
@ -160,7 +159,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 97}
m_SizeDelta: {x: 700, y: 300}
m_SizeDelta: {x: 800, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7580283149116068277
CanvasRenderer:
@ -190,9 +189,10 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Not yet unlocked
m_text: 'This node unlock requires completion of level {0}
Go explore more levels!'
Go explore more
levels!'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2}
m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6,
@ -256,25 +256,12 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 3.6498413, y: 0, z: -2.381836, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &8027472545961662239
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 596306884723602069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 311397461488a864a9380a67b5d5d6c6, type: 3}
m_Name:
m_EditorClassIdentifier:
textKey: Build_Tip
--- !u!1 &781503480839846848
GameObject:
m_ObjectHideFlags: 0
@ -753,6 +740,7 @@ GameObject:
m_Component:
- component: {fileID: 5836127941926521288}
- component: {fileID: 2092165300486107022}
- component: {fileID: 4341339576423223021}
- component: {fileID: 3042925071955256829}
m_Layer: 5
m_Name: Viewport
@ -789,6 +777,36 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3284054230750992655}
m_CullTransparentMesh: 1
--- !u!114 &4341339576423223021
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3284054230750992655}
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: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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!114 &3042925071955256829
MonoBehaviour:
m_ObjectHideFlags: 0

8
Forest/Assets/Config/Build/Build_1.json
View File

@ -11,22 +11,22 @@
"preGroup": 0
},
{
"condition": 25,
"condition": 10,
"conditionGroup": 1,
"preGroup": 5
},
{
"condition": 50,
"condition": 25,
"conditionGroup": 3,
"preGroup": 1
},
{
"condition": 75,
"condition": 40,
"conditionGroup": 4,
"preGroup": 3
},
{
"condition": 95,
"condition": 60,
"conditionGroup": 2,
"preGroup": 4
}

16
Forest/Assets/Config/Build/Build_2.json
View File

@ -6,42 +6,42 @@
"unlockConditionType": 0,
"unlockInfos": [
{
"condition": 1,
"condition": 60,
"conditionGroup": 1,
"preGroup": 0
},
{
"condition": 12,
"condition": 70,
"conditionGroup": 2,
"preGroup": 1
},
{
"condition": 30,
"condition": 80,
"conditionGroup": 3,
"preGroup": 2
},
{
"condition": 40,
"condition": 90,
"conditionGroup": 4,
"preGroup": 3
},
{
"condition": 60,
"condition": 105,
"conditionGroup": 5,
"preGroup": 4
},
{
"condition": 80,
"condition": 120,
"conditionGroup": 6,
"preGroup": 5
},
{
"condition": 110,
"condition": 135,
"conditionGroup": 7,
"preGroup": 6
},
{
"condition": 135,
"condition": 150,
"conditionGroup": 8,
"preGroup": 7
}

8
Forest/Assets/Config/Data/stringcfg_stringconfig.json
View File

@ -350,8 +350,8 @@
{
"ID": 159,
"Key": "Build_Tip",
"Value": "尚未解锁\n去探索更多关卡吧!",
"Value_En": "Not yet unlocked\nGo explore more levels!"
"Value": "该节点解锁需要完成关卡{0}\n去探索更多关卡吧!",
"Value_En": "This node unlock requires completion of level {0}\nGo explore more levels!"
},
{
"ID": 160,
@ -398,8 +398,8 @@
{
"ID": 167,
"Key": "Guide_107",
"Value": "更换岛屿",
"Value_En": "Replace island"
"Value": "选择岛屿",
"Value_En": "Select island"
},
{
"ID": 168,

1
Forest/Assets/Editor/Art/Font/FontConfig.json
View File

@ -72,3 +72,4 @@ QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm
点击开始游戏
开始闯关
金币不足
该节点解锁需要完成关卡

19
Forest/Assets/Scripts/Gameplay2/GameBuild/BuildBoot.cs
View File

@ -2,6 +2,7 @@ using TMPro;
using System;
using PhxhSDK;
using UnityEngine;
using Framework.UI;
using UnityEngine.UI;
using Gameplay.Level;
using Framework.Event;
@ -257,6 +258,9 @@ public class BuildBoot : MonoBehaviour
private Option _curOption;
private Node _curNode;
//当前节点条件
private int _curCondition;
//当前节点字典
private Dictionary<string, Node> _nodes;
@ -264,6 +268,7 @@ public class BuildBoot : MonoBehaviour
private GameObject _tipObj;
private Button _btnTipGoGame;
private Button _btnTipClose;
private TMP_Text _txtTip;
//遮罩
private GameObject _mask;
@ -455,6 +460,7 @@ public class BuildBoot : MonoBehaviour
_btnTipGoGame = _tipObj.transform.Find("Btn_Game").GetComponent<Button>();
_btnTipClose.onClick.AddListener(CloseTipPanel);
_btnTipGoGame.onClick.AddListener(TipGoGame);
_txtTip = _tipObj.transform.Find("Text_Content").GetComponent<TMP_Text>();
}
/// <summary>
@ -580,12 +586,11 @@ public class BuildBoot : MonoBehaviour
{
_curNode = node;
_curOption = node.GetOption(optionName);
var condition = BuildManager.Instance.GetCondition(nodeName);
_buildBar.Open(node, BuildIconClick, BuildLockIconClick, CurCondition, condition);
_curCondition = BuildManager.Instance.GetCondition(nodeName);
_buildBar.Open(node, BuildIconClick, BuildLockIconClick, CurCondition, _curCondition);
_buildBar.PickItemDisplay(optionName);
if (_curOption != null)
OutlinePickItem(_curOption);
EventManager.Instance.Send(EventManager.EventName.OpenUI);
}
else
@ -609,10 +614,9 @@ public class BuildBoot : MonoBehaviour
BuildManager.Instance.PlaySound();
if (_nodes.TryGetValue(nodeName, out var node))
{
var condition = BuildManager.Instance.GetCondition(nodeName);
_curCondition = BuildManager.Instance.GetCondition(nodeName);
_curNode = node;
_buildBar.Open(node, BuildIconClick, BuildLockIconClick, CurCondition, condition);
_buildBar.Open(node, BuildIconClick, BuildLockIconClick, CurCondition, _curCondition);
EventManager.Instance.Send(EventManager.EventName.OpenUI);
}
else
@ -651,6 +655,9 @@ public class BuildBoot : MonoBehaviour
/// </summary>
private void BuildLockIconClick()
{
var keyString = StringManager.Instance.GetTextByKey("Build_Tip");
var content = string.Format(keyString, _curCondition);
_txtTip.text = content;
_mask.SetActive(true);
_tipObj.SetActive(true);
BuildManager.Instance.PlaySound();

52
Tool/Luban/.cache.meta
View File

@ -1,30 +1,30 @@
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildconfig.json,48AB9FAF4B191CBFAD1AE41D8DB5E9,264,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,F0B7F2CC3D5E8E1F289E6F854F40E2,2491,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,F1DE33A5B922A3DDE9A415397E854250,8636,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildConfig.cs,734C93C94E7956CBFC7EEFA6D012384,2021,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuild.cs,58A25B6C58163A71C557A4F7DF7A73F3,2062,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,BEB85D16C8FEBFBE0679C7F9C9F9A8,606,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,C360B48BE0179D52C15D41892A4B,1008,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1724048330943
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,D55A3261561E846DDDB2C7D41F75,2643,1724048330944
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1724230904175
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildconfig.json,48AB9FAF4B191CBFAD1AE41D8DB5E9,264,1724230904164
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,F0B7F2CC3D5E8E1F289E6F854F40E2,2491,1724230904164
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1724230904169
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,96ED9D903D2646B5C01DE38EEDFBD2F6,8692,1724230904173
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1724230904162
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildConfig.cs,734C93C94E7956CBFC7EEFA6D012384,2021,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuild.cs,58A25B6C58163A71C557A4F7DF7A73F3,2062,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,BEB85D16C8FEBFBE0679C7F9C9F9A8,606,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,C360B48BE0179D52C15D41892A4B,1008,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,D55A3261561E846DDDB2C7D41F75,2643,1724230904163
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,BB1B7B4C814680E15D54B12E0C4BAD5,12703,1722244651038
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,F5E663DB51F49239D4EF4F4A87EAD5CC,11140,1724048322583
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,F5E663DB51F49239D4EF4F4A87EAD5CC,11140,1724143842408
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,D49DD4C2226B1AED21398727B2144A9,9832,1722244651037
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/BuildConfig.xlsx,413DFEA990EC718571D09D4632F8AD41,9393,1724048052747
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Guide.xlsx,EFF399A2B66C639A70B9956CB653A6D3,10462,1723616895685
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/BuildConfig.xlsx,413DFEA990EC718571D09D4632F8AD41,9393,1724143842407
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Guide.xlsx,EFF399A2B66C639A70B9956CB653A6D3,10462,1724143842408
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,98D2191EAFD292EBEA0D6FFBD8B890,13563,1723616895685
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,826739B95127998467781535C9,13582,1724230213374

BIN
Tool/Luban/Datas/StringConfig.xlsx
View File

Binary file not shown.