Merge branch 'master_test' into master_develop
commit
346a1a5f6f
Binary file not shown.
Binary file not shown.
|
|
@ -1,29 +1,113 @@
|
||||||
<component name="ProjectCodeStyleConfiguration">
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
<code_scheme name="Project" version="173">
|
<code_scheme name="Project" version="173">
|
||||||
<Objective-C-extensions>
|
<codeStyleSettings language="XML">
|
||||||
<file>
|
<arrangement>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
<rules>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
<section>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
<rule>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
<match>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
<AND>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
<NAME>xmlns:android</NAME>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
<XML_ATTRIBUTE />
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
</AND>
|
||||||
</file>
|
</match>
|
||||||
<class>
|
</rule>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
</section>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
<section>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
<rule>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
<match>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
<AND>
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
<NAME>xmlns:.*</NAME>
|
||||||
</class>
|
<XML_ATTRIBUTE />
|
||||||
<extensions>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
<pair source="cpp" header="h" fileNamingConvention="NONE" />
|
</AND>
|
||||||
<pair source="c" header="h" fileNamingConvention="NONE" />
|
</match>
|
||||||
</extensions>
|
<order>BY_NAME</order>
|
||||||
</Objective-C-extensions>
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*:id</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*:name</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>name</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>style</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
</rules>
|
||||||
|
</arrangement>
|
||||||
|
</codeStyleSettings>
|
||||||
</code_scheme>
|
</code_scheme>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
|
|
@ -3,6 +3,9 @@
|
||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
|
<compositeConfiguration>
|
||||||
|
<compositeBuild compositeDefinitionSource="SCRIPT" />
|
||||||
|
</compositeConfiguration>
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
|
|
@ -12,6 +15,7 @@
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveModulePerSourceSet" value="false" />
|
<option name="resolveModulePerSourceSet" value="false" />
|
||||||
|
<option name="testRunner" value="PLATFORM" />
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||||
<option name="myNullables">
|
<option name="myNullables">
|
||||||
<value>
|
<value>
|
||||||
<list size="7">
|
<list size="12">
|
||||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
|
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
|
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
|
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
|
||||||
|
|
@ -13,23 +13,33 @@
|
||||||
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
|
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
|
||||||
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
|
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
|
||||||
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
|
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
|
||||||
|
<item index="7" class="java.lang.String" itemvalue="android.annotation.Nullable" />
|
||||||
|
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
|
||||||
|
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
|
||||||
|
<item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
|
||||||
|
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
|
||||||
</list>
|
</list>
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="myNotNulls">
|
<option name="myNotNulls">
|
||||||
<value>
|
<value>
|
||||||
<list size="6">
|
<list size="11">
|
||||||
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
|
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
|
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
|
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
|
||||||
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
|
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
|
||||||
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
|
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
|
||||||
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
|
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
|
||||||
|
<item index="6" class="java.lang.String" itemvalue="android.annotation.NonNull" />
|
||||||
|
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
|
||||||
|
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
|
||||||
|
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
|
||||||
|
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
|
||||||
</list>
|
</list>
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -182,7 +182,11 @@ public class MhtActivity extends IUnityPlayerActivity {
|
||||||
// 调起登录
|
// 调起登录
|
||||||
public void Login() {
|
public void Login() {
|
||||||
|
|
||||||
PSDKUser.getInstance().login(MhtActivity.this);
|
MhtActivity.this.runOnUiThread(new Runnable() {
|
||||||
|
public void run() {
|
||||||
|
PSDKUser.getInstance().login(MhtActivity.this);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
public void SwitchLogin() {
|
public void SwitchLogin() {
|
||||||
if (PSDKUser.getInstance().isSupport("switchLogin")) {
|
if (PSDKUser.getInstance().isSupport("switchLogin")) {
|
||||||
|
|
@ -248,25 +252,30 @@ public class MhtActivity extends IUnityPlayerActivity {
|
||||||
final String extension){
|
final String extension){
|
||||||
|
|
||||||
|
|
||||||
Map<String, String> map2 = new HashMap<>();
|
MhtActivity.this.runOnUiThread(new Runnable() {
|
||||||
//必传
|
public void run() {
|
||||||
// map2.put("consumerId", roleID);//用户ID
|
Map<String, String> map2 = new HashMap<>();
|
||||||
// map2.put("consumerName", roleName);//玩家昵称
|
//必传
|
||||||
map2.put("mhtCurrency", String.valueOf(coinNum));//充值50元宝(数量)
|
// map2.put("consumerId", roleID);//用户ID
|
||||||
map2.put("vipLevel", vip);// vip等级
|
// map2.put("consumerName", roleName);//玩家昵称
|
||||||
map2.put("playerName",guildlD);// 工会,帮派
|
map2.put("mhtCurrency", String.valueOf(coinNum));//充值50元宝(数量)
|
||||||
map2.put("roleName", roleName);// 角色名称
|
map2.put("vipLevel", vip);// vip等级
|
||||||
map2.put("roleId", roleID);// 角色ID
|
map2.put("playerName",guildlD);// 工会,帮派
|
||||||
map2.put("roleLevel", String.valueOf(roleLevel));//用户等级
|
map2.put("roleName", roleName);// 角色名称
|
||||||
///////////////////以下是订单参数////////////////////////
|
map2.put("roleId", roleID);// 角色ID
|
||||||
map2.put("orderDec", productDesc);//订单描述(必)
|
map2.put("roleLevel", String.valueOf(roleLevel));//用户等级
|
||||||
map2.put("amount", String.valueOf(price));// 购买金额(必)//以分为单位
|
///////////////////以下是订单参数////////////////////////
|
||||||
map2.put("balance", "100");// 用户余额
|
map2.put("orderDec", productDesc);//订单描述(必)
|
||||||
map2.put("goodDec", productName);//商品描述
|
map2.put("amount", String.valueOf(price));// 购买金额(必)//以分为单位
|
||||||
map2.put("count", String.valueOf(buyNum));//商品数量
|
map2.put("balance", "100");// 用户余额
|
||||||
map2.put("goodsId", productId);//商品编号(三星必传)
|
map2.put("goodDec", productName);//商品描述
|
||||||
map2.put("ext", extension);//透传 传递给sdk sdk传递给后端
|
map2.put("count", String.valueOf(buyNum));//商品数量
|
||||||
PSDKPay.getInstance().pay(MhtActivity.this, map2);
|
map2.put("goodsId", productId);//商品编号(三星必传)
|
||||||
|
map2.put("ext", extension);//透传 传递给sdk sdk传递给后端
|
||||||
|
PSDKPay.getInstance().pay(MhtActivity.this, map2);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -311,7 +311,7 @@ MonoBehaviour:
|
||||||
tokens:
|
tokens:
|
||||||
- appid: debug-appid
|
- appid: debug-appid
|
||||||
serverUrl: http://thinkingdata.18183g.com
|
serverUrl: http://thinkingdata.18183g.com
|
||||||
mode: 2
|
mode: 1
|
||||||
timeZone: 0
|
timeZone: 0
|
||||||
timeZoneId:
|
timeZoneId:
|
||||||
--- !u!1 &3471622135844523394
|
--- !u!1 &3471622135844523394
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ function this.Initialize()
|
||||||
|
|
||||||
SDKMgr.onLoginCallback = function(loginResp)
|
SDKMgr.onLoginCallback = function(loginResp)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,loginResp)
|
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,loginResp)
|
||||||
ThinkingAnalyticsManager.Track("app_login")
|
-- ThinkingAnalyticsManager.Track("app_login")
|
||||||
end
|
end
|
||||||
|
|
||||||
SDKMgr.onSwitchAccountCallback = function(resp)
|
SDKMgr.onSwitchAccountCallback = function(resp)
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ function this:AddListener()
|
||||||
Game.GlobalEvent:AddEvent(Protocal.Connect, this.OnConnect)
|
Game.GlobalEvent:AddEvent(Protocal.Connect, this.OnConnect)
|
||||||
Game.GlobalEvent:AddEvent(Protocal.Disconnect, this.OnDisconnect)
|
Game.GlobalEvent:AddEvent(Protocal.Disconnect, this.OnDisconnect)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLogout, this.RefreshLoginStatus)
|
Game.GlobalEvent:AddEvent(GameEvent.LoginSuccess.OnLogout, this.OnLogout)
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
|
|
@ -125,11 +125,12 @@ function this:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(Protocal.Connect, this.OnConnect)
|
Game.GlobalEvent:RemoveEvent(Protocal.Connect, this.OnConnect)
|
||||||
Game.GlobalEvent:RemoveEvent(Protocal.Disconnect, this.OnDisconnect)
|
Game.GlobalEvent:RemoveEvent(Protocal.Disconnect, this.OnDisconnect)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLoginSuccess, this.RefreshLoginStatus)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLogout, this.RefreshLoginStatus)
|
Game.GlobalEvent:RemoveEvent(GameEvent.LoginSuccess.OnLogout, this.OnLogout)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnLogout()
|
function this:OnLogout()
|
||||||
if IsSDKLogin then
|
if IsSDKLogin then
|
||||||
|
this.SetLoginPart(false)
|
||||||
this.sdkLoginBtn:SetActive(false)
|
this.sdkLoginBtn:SetActive(false)
|
||||||
this.inputField.gameObject:SetActive(false)
|
this.inputField.gameObject:SetActive(false)
|
||||||
this.UserBtn:SetActive(false)
|
this.UserBtn:SetActive(false)
|
||||||
|
|
@ -172,6 +173,7 @@ function this:OnOpen(...)
|
||||||
end
|
end
|
||||||
|
|
||||||
if IsSDKLogin then
|
if IsSDKLogin then
|
||||||
|
this.SetLoginPart(false)
|
||||||
this.sdkLoginBtn:SetActive(false)
|
this.sdkLoginBtn:SetActive(false)
|
||||||
this.inputField.gameObject:SetActive(false)
|
this.inputField.gameObject:SetActive(false)
|
||||||
this.UserBtn:SetActive(false)
|
this.UserBtn:SetActive(false)
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ function this.LoginRequest(openId, pt_pid, pt_gid, func)
|
||||||
data.operator_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetOperatorName() or ""
|
data.operator_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetOperatorName() or ""
|
||||||
data.network_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetNetworkType() or ""
|
data.network_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetNetworkType() or ""
|
||||||
data.ip_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetLocalIpAddress() or ""
|
data.ip_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetLocalIpAddress() or ""
|
||||||
data.distinct_id = AppConst.isSDK and App.TAMgr:GetDistinctId() or ""
|
data.distinct_id = AppConst.isSDK and openId or ""
|
||||||
data.openId = openId
|
data.openId = openId
|
||||||
data.channel_s = pt_pid.."#"..pt_gid
|
data.channel_s = pt_pid.."#"..pt_gid
|
||||||
data.platform_s = AppConst.isSDK and "ADR" or "PC"
|
data.platform_s = AppConst.isSDK and "ADR" or "PC"
|
||||||
|
|
@ -65,10 +65,12 @@ function this.LoginRequest(openId, pt_pid, pt_gid, func)
|
||||||
AppConst.Token = msg.newToken
|
AppConst.Token = msg.newToken
|
||||||
|
|
||||||
-- 打点
|
-- 打点
|
||||||
ThinkingAnalyticsManager.Login(openId)
|
ThinkingAnalyticsManager.SetDistinctId(AppConst.OpenId)
|
||||||
ThinkingAnalyticsManager.SetSuperProperties({
|
ThinkingAnalyticsManager.SetSuperProperties({
|
||||||
server_id = LoginManager.ServerId,
|
server_id = LoginManager.ServerId,
|
||||||
account = AppConst.OpenId
|
account = AppConst.OpenId,
|
||||||
|
["Bundle-id"] = "123",
|
||||||
|
xx_id = AppConst.isSDK and "ADR" or "PC"
|
||||||
})
|
})
|
||||||
TapDBManager.SetUser(openId)
|
TapDBManager.SetUser(openId)
|
||||||
TapDBManager.SetServer(LoginManager.ServerId)
|
TapDBManager.SetServer(LoginManager.ServerId)
|
||||||
|
|
@ -118,6 +120,7 @@ function this.PlayerInfoRequest(func)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 数据打点
|
-- 数据打点
|
||||||
|
ThinkingAnalyticsManager.Login(PlayerManager.uid)
|
||||||
ThinkingAnalyticsManager.SetSuperProperties({
|
ThinkingAnalyticsManager.SetSuperProperties({
|
||||||
role_id = PlayerManager.uid,
|
role_id = PlayerManager.uid,
|
||||||
role_name = PlayerManager.nickName,
|
role_name = PlayerManager.nickName,
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,2 @@
|
||||||
|
key:mhthwtest
|
||||||
|
password:lingdong
|
||||||
|
|
@ -13,7 +13,7 @@ PlayerSettings:
|
||||||
useOnDemandResources: 0
|
useOnDemandResources: 0
|
||||||
accelerometerFrequency: 60
|
accelerometerFrequency: 60
|
||||||
companyName: Test
|
companyName: Test
|
||||||
productName: "\u6D4B\u8BD5\u5305"
|
productName: "\u592A\u521D\u884C\u6D4B\u8BD5\u5305"
|
||||||
defaultCursor: {fileID: 0}
|
defaultCursor: {fileID: 0}
|
||||||
cursorHotspot: {x: 0, y: 0}
|
cursorHotspot: {x: 0, y: 0}
|
||||||
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
|
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
|
@ -155,7 +155,7 @@ PlayerSettings:
|
||||||
androidSupportedAspectRatio: 1
|
androidSupportedAspectRatio: 1
|
||||||
androidMaxAspectRatio: 2.1
|
androidMaxAspectRatio: 2.1
|
||||||
applicationIdentifier:
|
applicationIdentifier:
|
||||||
Android: com.mht.tcxcsb.test
|
Android: com.mht.tcxcsb.project
|
||||||
Standalone: com.doudou.dwc
|
Standalone: com.doudou.dwc
|
||||||
Tizen: com.junfine.luaframework
|
Tizen: com.junfine.luaframework
|
||||||
iOS: com.doudou.dwc
|
iOS: com.doudou.dwc
|
||||||
|
|
@ -251,8 +251,8 @@ PlayerSettings:
|
||||||
AndroidTargetArchitectures: 1
|
AndroidTargetArchitectures: 1
|
||||||
AndroidSplashScreenScale: 2
|
AndroidSplashScreenScale: 2
|
||||||
androidSplashScreen: {fileID: 0}
|
androidSplashScreen: {fileID: 0}
|
||||||
AndroidKeystoreName:
|
AndroidKeystoreName: E:/Git/JL/KeyStore/mhthw_test.keystore
|
||||||
AndroidKeyaliasName:
|
AndroidKeyaliasName: mhthwtest
|
||||||
AndroidBuildApkPerCpuArchitecture: 0
|
AndroidBuildApkPerCpuArchitecture: 0
|
||||||
AndroidTVCompatibility: 0
|
AndroidTVCompatibility: 0
|
||||||
AndroidIsGame: 1
|
AndroidIsGame: 1
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue