diff --git a/AndroidSDK/app/src/main/AndroidManifest.xml b/AndroidSDK/app/src/main/AndroidManifest.xml
index 0a67fef234..27c1f1d39d 100644
--- a/AndroidSDK/app/src/main/AndroidManifest.xml
+++ b/AndroidSDK/app/src/main/AndroidManifest.xml
@@ -24,6 +24,10 @@
+
+
+
+
diff --git a/AndroidSDK/app/src/main/java/com/mht/tcxcsb/project/MhtActivity.java b/AndroidSDK/app/src/main/java/com/mht/tcxcsb/project/MhtActivity.java
index 5c6df0719c..7940c5c2e0 100644
--- a/AndroidSDK/app/src/main/java/com/mht/tcxcsb/project/MhtActivity.java
+++ b/AndroidSDK/app/src/main/java/com/mht/tcxcsb/project/MhtActivity.java
@@ -250,8 +250,8 @@ public class MhtActivity extends IUnityPlayerActivity {
Map map2 = new HashMap<>();
//必传
- map2.put("consumerId", roleID);//用户ID
- map2.put("consumerName", roleName);//玩家昵称
+// map2.put("consumerId", roleID);//用户ID
+// map2.put("consumerName", roleName);//玩家昵称
map2.put("mhtCurrency", String.valueOf(coinNum));//充值50元宝(数量)
map2.put("vipLevel", vip);// vip等级
map2.put("playerName",guildlD);// 工会,帮派
diff --git a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs
index b4f85c2656..dd6f1e172f 100644
--- a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs
+++ b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs
@@ -23,12 +23,16 @@ namespace GameLogic
private Dictionary stringToDic(string s)
{
+ Debug.Log("stringToDic***************" + s);
Dictionary d = new Dictionary();
+ if (s == "") return d;
string[] kvs = s.Split('|');
foreach (string ss in kvs)
{
+
+ Debug.Log("***************" + ss);
string[] kv = ss.Split('#');
- if (kv[3] == "1")
+ if (kv[2] == "1")
{
d.Add(kv[0], Convert.ToInt32(kv[1]));
}
diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
index bc2d56f98f..3b682d4161 100644
--- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
+++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs
@@ -69,7 +69,7 @@ namespace SDK
",goodDec= " + args.productName +
",count= " + args.buyNum +
",goodsId= " + args.productId +
- ",ext= " + GameLogic.Util.Base64Encode(args.extension)
+ ",ext= " + args.extension //GameLogic.Util.Base64Encode(args.extension)
);
currentActivity.Call("Pay",args.productId,
@@ -89,7 +89,8 @@ namespace SDK
args.vip,
args.guildID,
args.payNotifyUrl,
- GameLogic.Util.Base64Encode(args.extension));
+ args.extension);
+ //GameLogic.Util.Base64Encode(args.extension));
}
public override bool IsSupportExit()
diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
index 77feb8bbde..7e6dc106d9 100644
--- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
+++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
@@ -189,7 +189,7 @@ namespace SDK
//sdk SwitchAccount回调
public void SwitchAccountCallback(string data)
{
- Debug.Log("Helper : PayCallback - data: " + data);
+ Debug.Log("Helper : SwitchAccountCallback - data: " + data);
proxy.PushMessage(new Message
{
msgId = MessageDef.MSG_SwitchAccountCallback,
@@ -200,7 +200,7 @@ namespace SDK
//sdk Logout回调
public void LogoutCallback(string data)
{
- Debug.Log("Helper : PayCallback - data: " + data);
+ Debug.Log("Helper : LogoutCallback - data: " + data);
proxy.PushMessage(new Message
{
msgId = MessageDef.MSG_LogoutCallback,
diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua
index 629617790a..6683ec6afd 100644
--- a/Assets/ManagedResources/~Lua/Common/Managers.lua
+++ b/Assets/ManagedResources/~Lua/Common/Managers.lua
@@ -1,6 +1,10 @@
--- 管理器名字
local ManagerNames = {
+ --数据中心管理
+ "DataCenterService/DataCenterManager",
+ "DataCenterService/ThinkingAnalyticsManager",
+ "DataCenterService/TapDBManager",
-- 游戏设置管理
"Setting/SettingManager",
--通信管理,所有的通信接口
@@ -95,10 +99,6 @@ local ManagerNames = {
"Pay/PayManager",
--首充
"FirstRecharge/FirstRechargeManager",
- --数据中心管理
- "DataCenterService/DataCenterManager",
- "DataCenterService/ThinkingAnalyticsManager",
- "DataCenterService/TapDBManager",
-- 云梦祈祷
"Pray/PrayManager",
-- 无尽副本数据
diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua
index 3668e6d2b1..ae7f764242 100644
--- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua
@@ -17,6 +17,7 @@ local function _DicToStr(data)
str = str .."|"
end
str = str..string.format(fmt, key, tostring(value), type(value) == "number" and 1 or 0)
+ index = index + 1
end
return str
end
@@ -61,6 +62,7 @@ function this.SetSuperProperties(data)
end
local sData = _DicToStr(_SuperPropertise)
+ Log("打点静态数据:"..sData)
App.TAMgr:SetSuperProperties(sData)
end
end
@@ -74,7 +76,9 @@ end
-- 打点事件
function this.Track(event, data)
- local dStr = _DicToStr(data)
+ Log("打点事件:"..event)
+ local dStr = data and _DicToStr(data) or ""
+ Log("打点数据:"..dStr)
App.TAMgr:Track(event, dStr)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
index 5d566f47a8..bd57deea58 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
@@ -23,21 +23,26 @@ function this.Initialize()
SDKMgr.onLoginCallback = function(loginResp)
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,loginResp)
+ ThinkingAnalyticsManager.Track("app_login")
end
SDKMgr.onSwitchAccountCallback = function(resp)
+ Log("onSwitchAccountCallback::"..resp)
local result = string.split(resp, "#")
--Util.LogError(debug.traceback("onSwitchAccountCallback:" .. result[1] .. ""))
- if LoginManager.IsLogin and tonumber(result[1]) == SDKCodeResult.CODE_SW_LOGIN_SUCCESS then
+ if LoginManager.IsLogin and tonumber(result[1]) == SDK_RESULT.SUCCESS then
+ ThinkingAnalyticsManager.Track("change_account")
Framework.Dispose()
App.Instance:ReStart()
end
end
SDKMgr.onLogoutCallback = function(resp)
+ Log("onLogoutCallback::"..resp)
local result = string.split(resp, "#")
--Util.LogError(debug.traceback("onLogoutCallback:" .. result[1] .. ""))
- if LoginManager.IsLogin and tonumber(result[1]) == SDKCodeResult.CODE_LOGOUT_SUCCESS then
+ if LoginManager.IsLogin and tonumber(result[1]) == SDK_RESULT.SUCCESS then
+ ThinkingAnalyticsManager.Track("quit_account")
Framework.Dispose()
App.Instance:ReStart()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index 9da5533996..b66e890ff8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -139,11 +139,12 @@ function this:OnOpen(...)
end
if IsSDKLogin then
- this.sdkLoginBtn:SetActive(true)
+ this.sdkLoginBtn:SetActive(false)
this.inputField.gameObject:SetActive(false)
this.UserBtn:SetActive(false)
this.btnUser:SetActive(false)
this.btnNotice.transform.position = this.btnUser.transform.position
+ this.SDKLogin()
else
this.sdkLoginBtn:SetActive(false)
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 77a4f0852d..6c4a9b2853 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -119,8 +119,6 @@ function this.PlayerInfoRequest(func)
-- 数据打点
ThinkingAnalyticsManager.SetSuperProperties({
- server_id = 1,
- account = AppConst.OpenId,
role_id = PlayerManager.uid,
role_name = PlayerManager.nickName,
vip_level = msg.player.vipLevel,
diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
index ab7d565874..253861a399 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua
@@ -30,16 +30,18 @@ end
function this.RequestPay(context)
SDKMgr.onPayCallback = function(payResp)
+ Log("onPayCallback::"..payResp)
local str = string.split(payResp, "#")
local result = tonumber(str[1])
- if code == SDK_RESULT.SUCCESS then
+ local orderId = str[2]
+ if result == SDK_RESULT.SUCCESS then
DataCenterManager.CommitPayStatus(
"IN_GAME_"..context.Type,
SDKMgr:GetPayOrderID(),
"VALID",
tostring(context.Price)
)
- elseif code == SDK_RESULT.FAILED then
+ elseif result == SDK_RESULT.FAILED then
DataCenterManager.CommitPayStatus(
"IN_GAME_"..context.Type,
SDKMgr:GetPayOrderID(),
@@ -76,11 +78,17 @@ function this.RequestPay(context)
params.guildID = PlayerManager.familyId
-- 其他
params.payNotifyUrl = ""
- params.extension = tostring(context.Id)
- -- string.format("%s_%s_%s_%s_%s_%s",
- -- AppConst.OpenId,context.Id,context.Price,PlayerManager.uid,
- -- PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name)
+ params.extension = string.format("%s#%s", PlayerManager.uid, context.Id)--tostring(context.Id)
+ --string.format("%s_%s_%s_%s_%s_%s",
+ -- AppConst.OpenId,context.Id,context.Price,PlayerManager.uid,
+ -- PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name)
SDKMgr:Pay(params)
+
+ --
+ ThinkingAnalyticsManager.Track("create_order", {
+ goods_id = context.Id,
+ order_money_amount = context.Price,
+ })
end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
index 56f6f07072..dce086c756 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
@@ -176,6 +176,11 @@ function this.PromoteLevel(exp)
-- Log("玩家升级成功!")
-- Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnLevelChange)
--end
+ -- 打点数据
+ TapDBManager.SetLevel(this.level)
+ -- ThinkingAnalyticsManager.SetSuperProperties({
+
+ -- })
end
function this.SetMaxEnergy()
this.maxEnergy = this.userLevelData[this.level].MaxEnergy
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua
index e57bfc4b4b..e44e78ad5f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/NameManager.lua
@@ -49,6 +49,10 @@ function this.ChangeUserName(type, name, teamPosId, sex, callBack)
this.roleName = name
PlayerManager.nickName = name
+ -- 打点静态数据修改
+ ThinkingAnalyticsManager.SetSuperProperties({
+ role_name = PlayerManager.nickName,
+ })
-- 创建角色时保存一下头像数据
if type == 1 then
local config = ConfigManager.GetConfigDataByKey(ConfigName.PlayerRole, "Role", sex)
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index 9037177c37..9f414899c5 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -44,6 +44,9 @@
+
+
+
diff --git a/Assets/Plugins/Android/libs/main.jar b/Assets/Plugins/Android/libs/main.jar
index 96f2f10bec..b93ea30143 100644
Binary files a/Assets/Plugins/Android/libs/main.jar and b/Assets/Plugins/Android/libs/main.jar differ
diff --git a/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs b/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs
index 4f9f3c61ae..e7b6fe04e3 100644
--- a/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs
+++ b/Assets/Scripts/Editor/LanguageTool/LanguageTool.cs
@@ -430,7 +430,7 @@ namespace Assets.Scripts.Editor.LanguageTool
for (int lIndex = 0; lIndex < lines.Length; lIndex++)
{
string line = lines[lIndex].Trim();
- if (!line.StartsWith("--") && !line.StartsWith("log"))
+ if (!line.StartsWith("--") && !line.StartsWith("Log"))
{
Regex reg = new Regex("\"[^\"]*?[\u4e00-\u9fa5][^\"]*?\"");//正则表达式,判断是否包含中文字符
if (reg.IsMatch(line))