diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy.cs
index 20f5e0d3b9..58b58a8aae 100644
--- a/Assets/LuaFramework/Scripts/SDK/Proxy.cs
+++ b/Assets/LuaFramework/Scripts/SDK/Proxy.cs
@@ -20,6 +20,7 @@ namespace SDK
public void PushMessage(Message msg) { lock (messages) { messages.Enqueue(msg); } }
public Message PopMessage() { lock (messages) { return messages.Count > 0 ? messages.Dequeue() : null; } }
public virtual void CustomEvent(string events,string desc, string type) { }
+ public virtual void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId) { }
}
}
diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
index 98764c7304..7872eb3dc5 100644
--- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
+++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
@@ -127,6 +127,11 @@ namespace SDK
{
currentActivity.Call("CustomEvent", events, desc , type);
}
+ //sdk新手引导上报
+ public override void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId)
+ {
+ currentActivity.Call("NetRoleTutorial", eventName, guide_start_time, guide_end_time, serverId, serverName, roleName, roleId);
+ }
//登出
public override void Logout()
{
diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
index e3c38f9cd7..391e3ed451 100644
--- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
+++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
@@ -164,6 +164,11 @@ namespace SDK
{
proxy.CustomEvent(events,desc, type);
}
+ //sdk 新手引导上报
+ public void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId)
+ {
+ proxy.NewRoleTutorial(eventName, guide_start_time, guide_end_time, serverId, serverName, roleName, roleId);
+ }
///
/// ///////// sdk层回调
///
diff --git a/Assets/ManagedResources/DynamicAtlas/Logo_dhyq.png.meta b/Assets/ManagedResources/DynamicAtlas/Logo_dhyq.png.meta
index 925121bc80..0dc0a803d0 100644
--- a/Assets/ManagedResources/DynamicAtlas/Logo_dhyq.png.meta
+++ b/Assets/ManagedResources/DynamicAtlas/Logo_dhyq.png.meta
@@ -101,10 +101,10 @@ TextureImporter:
serializedVersion: 2
x: 0
y: 0
- width: 437
- height: 583
+ width: 662
+ height: 1249
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab
index 1a21d15527..6736b0bc4c 100644
--- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab
@@ -11460,7 +11460,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 223}
- m_SizeDelta: {x: 437, y: 583}
+ m_SizeDelta: {x: 430, y: 812}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8239642799241069030
CanvasRenderer:
@@ -11490,7 +11490,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 7e4a9bc2eff052644a4e9188d42ef59a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: b08152c1b4c2f5e4cb1c294dfcbef0c6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -16696,7 +16696,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 73.1001, y: -26.800049}
+ m_AnchoredPosition: {x: 73.1001, y: -26.800293}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9171444830315599766
diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
index 24607c36ad..0ab21cd3a2 100644
--- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
@@ -24,10 +24,10 @@ local FBSDKCustomEvents = {
}
function this.SetisFirstLogVal(isDayFirst)
if isDayFirst == 0 then--今天第一次登陆
- LogGreen("埋点上报数据 : "..CalculateSecondsNowTo_N_OClock(24).." "..GetTimeStamp().." "..PlayerManager.userCreateTime)
+ -- LogGreen("埋点上报数据 : "..CalculateSecondsNowTo_N_OClock(24).." "..GetTimeStamp().." "..PlayerManager.userCreateTime)
local cur24Times = CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp()
local day = math.floor((cur24Times - PlayerManager.userCreateTime)/86400) + 1
- LogGreen("day "..day)
+ -- LogGreen("day "..day)
--发送埋点数据
this.SendCustomEvents(FBSDKCustomEventType.LoginNum,day)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
index 29303d7103..b9585b9c69 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
@@ -125,9 +125,13 @@ function this.ShowGuide(id, ...)
step_id = id,
guild_start_time = math.floor(GetTimeStamp()),
})
- if id == -1 then
+ if AppConst.isSDKLogin then
+ SDKMgr:NewRoleTutorial(tostring(id) ,tostring(math.floor(GetTimeStamp())) ,tostring(math.floor(GetTimeStamp())),
+ PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name,PlayerManager.nickName,tostring(PlayerManager.uid))
--发送埋点数据
- CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FinishGuide,0)
+ if id == -1 then
+ CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FinishGuide,0)
+ end
end
-- 引导结束回调
local function onGuideClose()
diff --git a/Assets/Source/Generate/GameLogic_TapDBManagerWrap.cs b/Assets/Source/Generate/GameLogic_TapDBManagerWrap.cs
index 0acd07f3fb..986b924ac3 100644
--- a/Assets/Source/Generate/GameLogic_TapDBManagerWrap.cs
+++ b/Assets/Source/Generate/GameLogic_TapDBManagerWrap.cs
@@ -9,6 +9,7 @@ public class GameLogic_TapDBManagerWrap
L.BeginClass(typeof(GameLogic.TapDBManager), typeof(GameCore.UnitySingleton));
L.RegFunction("Init", Init);
L.RegFunction("SetAppId", SetAppId);
+ L.RegFunction("SetChannel", SetChannel);
L.RegFunction("OnStart", OnStart);
L.RegFunction("SetUser", SetUser);
L.RegFunction("SetServer", SetServer);
@@ -72,6 +73,23 @@ public class GameLogic_TapDBManagerWrap
}
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int SetChannel(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ GameLogic.TapDBManager obj = (GameLogic.TapDBManager)ToLua.CheckObject(L, 1);
+ string arg0 = ToLua.CheckString(L, 2);
+ obj.SetChannel(arg0);
+ return 0;
+ }
+ catch (Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int OnStart(IntPtr L)
{
diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs
index 616ceddd72..0b84fbef31 100644
--- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs
+++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs
@@ -18,6 +18,7 @@ public class SDK_SDKManagerWrap
L.RegFunction("CaptureShot", CaptureShot);
L.RegFunction("Logout", Logout);
L.RegFunction("CustomEvent", CustomEvent);
+ L.RegFunction("NewRoleTutorial", NewRoleTutorial);
L.RegFunction("InitCallback", InitCallback);
L.RegFunction("RegisterCallback", RegisterCallback);
L.RegFunction("LoginCallback", LoginCallback);
@@ -225,6 +226,29 @@ public class SDK_SDKManagerWrap
}
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int NewRoleTutorial(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 8);
+ SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1);
+ string arg0 = ToLua.CheckString(L, 2);
+ string arg1 = ToLua.CheckString(L, 3);
+ string arg2 = ToLua.CheckString(L, 4);
+ string arg3 = ToLua.CheckString(L, 5);
+ string arg4 = ToLua.CheckString(L, 6);
+ string arg5 = ToLua.CheckString(L, 7);
+ string arg6 = ToLua.CheckString(L, 8);
+ obj.NewRoleTutorial(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ return 0;
+ }
+ catch (Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int InitCallback(IntPtr L)
{