Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://1.14.122.170:3000/PHXH/NLDClient into dev

main
Vinny 2026-03-27 18:32:59 +08:00
parent 3b528d2f4a 2079463940
commit 753e8bbee3
10 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectNLD/Assets/Art/UI/Texture/SDKLogin/UI_Tap_button_40.png (Stored with Git LFS)
View File

Binary file not shown.

9
ProjectNLD/Assets/Art_Out/UI/Prefab/StartScene/Newest/UI_StartGameInterface.prefab
View File

@ -5116,8 +5116,8 @@ RectTransform:
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: 420, y: 120}
m_AnchoredPosition: {x: 0, y: -348}
m_SizeDelta: {x: 540, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6706723364792565775
CanvasRenderer:
@ -13842,6 +13842,11 @@ PrefabInstance:
propertyPath: m_Name
value: UI_LoginWindow
objectReference: {fileID: 0}
- target: {fileID: 8267997438564038778, guid: 234cf7737ed0e4c4bae11f4c59182f0f,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:

6
ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs
View File

@ -69,7 +69,11 @@ namespace Framework
LevelUnitUnSelect,
LevelTimeIncrease,
/// <summary>
/// 关卡中每0.5秒时间事件
/// </summary>
LevelHalfSecondTick,
LevelCharacterArriveBlock,
Relogin_BackToGame,//重连重返游戏

BIN
ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll (Stored with Git LFS)
View File

Binary file not shown.

13
ProjectNLD/Assets/Code/Scripts/GameWrapper/Map/TerrainTypeConfig.cs
View File

@ -1,8 +1,10 @@
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
using Framework;
using PhxhSDK;
using PhxhSDK.Phxh;
using UnityEngine;
using Constants = Framework.Constants;
namespace Gameplay
{
@ -15,9 +17,9 @@ namespace Gameplay
public static TerrainTypeProperty DefaultTerrainTypeProperty
{
get
get
{
if(DicTerrainTypePropertie.TryGetValue(NULL_TERRAIN_ID, out TerrainTypeProperty terrainTypeProperty))
if (DicTerrainTypePropertie.TryGetValue(NULL_TERRAIN_ID, out TerrainTypeProperty terrainTypeProperty))
return terrainTypeProperty;
DebugUtil.LogError("空地格获取错误");
@ -32,7 +34,7 @@ namespace Gameplay
/// </summary>
public static Dictionary<int, TerrainTypeProperty> DicTerrainTypePropertie
{
get
get
{
if (null == dicTerrainTypePropertie)
{
@ -58,6 +60,11 @@ namespace Gameplay
return true;
}
public static void UnLoad()
{
AssetManager.Instance.Unload(Constants.TERRAIN_TYPE_CONFIG_PATH);
}
public static void Save(List<TerrainTypeProperty> terrainTypeProperties)
{
SetTerrainTypePropertyID(terrainTypeProperties);

2
ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json
View File

@ -61506,7 +61506,7 @@
"Key": "shop_MonthlyPass_Rule_Desc",
"Name": "shop_MonthlyPass_Help_Desc",
"value": "",
"Desc": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，可以进行补领；连续多日未登录时，可补领最后一天的每日奖励。",
"Desc": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，则次日登录可以在邮件内补领前一日未领取奖励。若连续多日未登录，则再度登录时只能补领最后一日的未领取奖励。",
"Notes": "",
"Param0": "",
"Param1": "",

2
ProjectNLD/Assets/Config/Data/illustratedhandbookcfg_characterfileconfig.json
View File

@ -145,8 +145,6 @@
1060002,
1060003,
1060101,
1060102,
1060103,
1060201,
1060301,
1060401,

4
ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
View File

@ -61505,8 +61505,8 @@
{
"Key": "shop_MonthlyPass_Rule_Desc",
"Name": "shop_MonthlyPass_Help_Desc",
"value": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，可以进行补领；连续多日未登录时，可补领最后一天的每日奖励。",
"Desc": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，可以进行补领；连续多日未登录时，可补领最后一天的每日奖励。",
"value": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，则次日登录可以在邮件内补领前一日未领取奖励。若连续多日未登录，则再度登录时只能补领最后一日的未领取奖励。",
"Desc": "1.空月补给售价为30元人民币，购买后可立即获得300信用点数，生效期间每日登录可领取40打口磁带。\n2.每日奖励的领取时间于每日上午5点刷新。\n3.每次购买空月补给的有效期为30天，当剩余有效期≤180天时可进行续购，若剩余有效期＞180天则暂时无法购买。\n4.生效期间若因未登录而错过每日奖励，则次日登录可以在邮件内补领前一日未领取奖励。若连续多日未登录，则再度登录时只能补领最后一日的未领取奖励。",
"Notes": "",
"Param0": "",
"Param1": "",

2
ProjectNLD/Assets/PhxhSDK

@ -1 +1 @@
Subproject commit e983490ddc773aa4f37cf8db15c8313d54d5a402
Subproject commit 63af744da44b46930828fc516e70e5eaa722e678

8
Tool/sdk_packages/ThinkingData/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/ThikingData/ThinkingDataHelper.cs
View File

@ -16,6 +16,8 @@ public class ThikingDataHelper : SdkHelper, IBIService
private string _distinctId;
private List<EventInfo> _tempEvent = new List<EventInfo>();
private Dictionary<string, object> _superProperties = new Dictionary<string, object>();
private class EventInfo
{
@ -118,8 +120,10 @@ public class ThikingDataHelper : SdkHelper, IBIService
{
if (!_isInit)
return;
TDAnalytics.SetSuperProperties(name, value); //设置公共事件属性
_superProperties.Clear();
_superProperties[name] = value;
// 设置用户属性
TDAnalytics.UserSet(_superProperties, _appId);
}
public void ReportEvent(string eventName, Dictionary<string, object> param = null)