diff --git a/AndroidSDK/.idea/caches/build_file_checksums.ser b/AndroidSDK/.idea/caches/build_file_checksums.ser index 2c408fca8e..6bf82f0ad9 100644 Binary files a/AndroidSDK/.idea/caches/build_file_checksums.ser and b/AndroidSDK/.idea/caches/build_file_checksums.ser differ diff --git a/AndroidSDK/.idea/caches/gradle_models.ser b/AndroidSDK/.idea/caches/gradle_models.ser new file mode 100644 index 0000000000..e8b2f8f3ba Binary files /dev/null and b/AndroidSDK/.idea/caches/gradle_models.ser differ diff --git a/AndroidSDK/.idea/codeStyles/Project.xml b/AndroidSDK/.idea/codeStyles/Project.xml index 30aa626c23..ae78c113ff 100644 --- a/AndroidSDK/.idea/codeStyles/Project.xml +++ b/AndroidSDK/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+
+
+
\ No newline at end of file diff --git a/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml b/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..79ee123c2b --- /dev/null +++ b/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/AndroidSDK/.idea/gradle.xml b/AndroidSDK/.idea/gradle.xml index 7ac24c777f..ee635a314d 100644 --- a/AndroidSDK/.idea/gradle.xml +++ b/AndroidSDK/.idea/gradle.xml @@ -3,6 +3,9 @@ diff --git a/AndroidSDK/.idea/misc.xml b/AndroidSDK/.idea/misc.xml index eb655f9fae..10118312f2 100644 --- a/AndroidSDK/.idea/misc.xml +++ b/AndroidSDK/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/AndroidSDK/.idea/vcs.xml b/AndroidSDK/.idea/vcs.xml new file mode 100644 index 0000000000..6c0b863585 --- /dev/null +++ b/AndroidSDK/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 7940c5c2e0..7f9d58d048 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 @@ -182,7 +182,11 @@ public class MhtActivity extends IUnityPlayerActivity { // 调起登录 public void Login() { - PSDKUser.getInstance().login(MhtActivity.this); + MhtActivity.this.runOnUiThread(new Runnable() { + public void run() { + PSDKUser.getInstance().login(MhtActivity.this); + } + }); } public void SwitchLogin() { if (PSDKUser.getInstance().isSupport("switchLogin")) { @@ -248,25 +252,30 @@ public class MhtActivity extends IUnityPlayerActivity { final String extension){ - Map map2 = new HashMap<>(); - //必传 -// 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);// 工会,帮派 - map2.put("roleName", roleName);// 角色名称 - map2.put("roleId", roleID);// 角色ID - map2.put("roleLevel", String.valueOf(roleLevel));//用户等级 - ///////////////////以下是订单参数//////////////////////// - map2.put("orderDec", productDesc);//订单描述(必) - map2.put("amount", String.valueOf(price));// 购买金额(必)//以分为单位 - map2.put("balance", "100");// 用户余额 - map2.put("goodDec", productName);//商品描述 - map2.put("count", String.valueOf(buyNum));//商品数量 - map2.put("goodsId", productId);//商品编号(三星必传) - map2.put("ext", extension);//透传 传递给sdk sdk传递给后端 - PSDKPay.getInstance().pay(MhtActivity.this, map2); + MhtActivity.this.runOnUiThread(new Runnable() { + public void run() { + Map map2 = new HashMap<>(); + //必传 +// 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);// 工会,帮派 + map2.put("roleName", roleName);// 角色名称 + map2.put("roleId", roleID);// 角色ID + map2.put("roleLevel", String.valueOf(roleLevel));//用户等级 + ///////////////////以下是订单参数//////////////////////// + map2.put("orderDec", productDesc);//订单描述(必) + map2.put("amount", String.valueOf(price));// 购买金额(必)//以分为单位 + map2.put("balance", "100");// 用户余额 + map2.put("goodDec", productName);//商品描述 + map2.put("count", String.valueOf(buyNum));//商品数量 + map2.put("goodsId", productId);//商品编号(三星必传) + map2.put("ext", extension);//透传 传递给sdk sdk传递给后端 + PSDKPay.getInstance().pay(MhtActivity.this, map2); + } + }); + } diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index 51dc360e33..db2d514c33 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -311,7 +311,7 @@ MonoBehaviour: tokens: - appid: debug-appid serverUrl: http://thinkingdata.18183g.com - mode: 2 + mode: 1 timeZone: 0 timeZoneId: --- !u!1 &3471622135844523394 diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 36ee3bb977..e53c9d90e8 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -83,6 +83,7 @@ FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_TEAMSKILLLIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD = protobuf.FieldDescriptor(); FIGHTTEAMINFO_SPECIALPASSIVE_FIELD = protobuf.FieldDescriptor(); +FIGHTTEAMINFO_FIRSTCAMP_FIELD = protobuf.FieldDescriptor(); EVENTBEHAVIORVALUES = protobuf.Descriptor(); EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD = protobuf.FieldDescriptor(); EVENTBEHAVIORCOMMON = protobuf.Descriptor(); @@ -1328,11 +1329,21 @@ FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.default_value = "" FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.type = 9 FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.cpp_type = 9 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.name = "firstCamp" +FIGHTTEAMINFO_FIRSTCAMP_FIELD.full_name = ".com.ljsd.jieling.protocols.FightTeamInfo.firstCamp" +FIGHTTEAMINFO_FIRSTCAMP_FIELD.number = 5 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.index = 4 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.label = 1 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.has_default_value = false +FIGHTTEAMINFO_FIRSTCAMP_FIELD.default_value = 0 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.type = 5 +FIGHTTEAMINFO_FIRSTCAMP_FIELD.cpp_type = 1 + FIGHTTEAMINFO.name = "FightTeamInfo" FIGHTTEAMINFO.full_name = ".com.ljsd.jieling.protocols.FightTeamInfo" FIGHTTEAMINFO.nested_types = {} FIGHTTEAMINFO.enum_types = {} -FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_TEAMSKILLLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD} +FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_TEAMSKILLLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD, FIGHTTEAMINFO_FIRSTCAMP_FIELD} FIGHTTEAMINFO.is_extendable = false FIGHTTEAMINFO.extensions = {} EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.name = "behaviorValues" diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 1283f1c4ea..7e052bdd9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -214,10 +214,14 @@ end ---参数2 isFightPlayer 0和怪物对战 1和玩家对战 function this.GetBattleServerData(msg, isFightPlayer) local fightData = { - playerData = { teamSkill = {}, teamPassive = {} }, - enemyData = {}, + playerData = { teamSkill = {}, teamPassive = {}, firstCamp = 0, }, + enemyData = { }, } isFightPlayer = isFightPlayer == 1 + + -- 判断是否先手 + fightData.playerData.firstCamp = msg.fightData.heroFightInfos.firstCamp or 0 + -- local data = msg.fightData.heroFightInfos for i = 1, #data.fightUnitList do local rid = tonumber(data.fightUnitList[i].unitId) @@ -277,10 +281,19 @@ function this.GetBattleServerData(msg, isFightPlayer) fightData.playerData.outData = data.specialPassive LogRed(Language[10221]..data.specialPassive) + + + -- 敌方 + + -- for i = 1, #msg.fightData.monsterList do local data2 = msg.fightData.monsterList[i] - fightData.enemyData[i] = { teamSkill = {}, teamPassive = {} } + fightData.enemyData[i] = { teamSkill = {}, teamPassive = {} , firstCamp = 0, } + -- 判断是否先手 + fightData.enemyData[i].firstCamp = data2.firstCamp or 0 + + -- for j = 1, #data2.fightUnitList do local skills, propertys, role if not isFightPlayer then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua index e8c3d947e1..368e1a7f7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogManager.lua @@ -100,8 +100,25 @@ function this.WriteFile() os.date("%H"), os.date("%M"), os.date("%S")) - local file = io.open("BattleRecord/log-"..time..".txt", "a") - + local file + local platform + -- linux + if not file then + file = io.open("../luafight/BattleRecord/log-"..time..".txt", "a") + platform = "Linux" + end + -- local window server + if not file then + file = io.open("luafight/BattleRecord/log-"..time..".txt", "a") + platform = "Local Windows Server" + end + -- local + if not file then + file = io.open("BattleRecord/log-"..time..".txt", "a") + platform = "Local" + end + + file:write(platform..":\n\n\n") for i = 1, #this.logList do file:write(this.logList[i].."\n") end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 7021321e21..0c05822ebf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -84,6 +84,20 @@ function BattleLogic.Init(data, optionData, maxRound) BattleLogManager.Init(fightData) end +-- 检测先手阵营 +function BattleLogic.CheckFirstCamp() + -- 默认我方先手 + BattleLogic.FirstCamp = 0 + -- 数据不存在时,兼容老战斗数据 + if not fightData.playerData.firstCamp and not fightData.enemyData[BattleLogic.CurOrder].firstCamp then + return + end + -- 敌方先手 + if fightData.playerData.firstCamp == 0 and fightData.enemyData[BattleLogic.CurOrder].firstCamp == 1 then + BattleLogic.FirstCamp = 1 + end +end + function BattleLogic.StartOrder() -- BattleLogic.CurOrder = BattleLogic.CurOrder + 1 @@ -104,7 +118,8 @@ function BattleLogic.StartOrder() RoleManager.AddRole(orderList[i], orderList[i].position) end end - + -- 检测先后手 + BattleLogic.CheckFirstCamp() -- 开始战斗,延时一帧执行,避免战斗还没开始就释放了技能 BattleLogic.TurnRoundNextFrame() end @@ -158,7 +173,7 @@ function BattleLogic.TurnRound(debugTurn) -- 第一次进入 或者 本轮结束 初始化流程状态 if CurRound == 0 or (CurSkillPos[0] == 6 and CurSkillPos[1] == 6) then CurRound = CurRound + 1 - CurCamp = 0 + CurCamp = BattleLogic.FirstCamp -- 判断先手阵营 CurSkillPos[0] = 0 CurSkillPos[1] = 0 LogGreen(Language[10228]..CurRound) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index a9cfd59531..4d3f862ba0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -23,7 +23,7 @@ function this.Initialize() SDKMgr.onLoginCallback = function(loginResp) Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,loginResp) - ThinkingAnalyticsManager.Track("app_login") + -- ThinkingAnalyticsManager.Track("app_login") end SDKMgr.onSwitchAccountCallback = function(resp) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 621e958a3c..a78114f909 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -116,7 +116,7 @@ function this:AddListener() Game.GlobalEvent:AddEvent(Protocal.Connect, this.OnConnect) Game.GlobalEvent:AddEvent(Protocal.Disconnect, this.OnDisconnect) 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 --移除事件监听(用于子类重写) @@ -125,11 +125,12 @@ function this:RemoveListener() Game.GlobalEvent:RemoveEvent(Protocal.Connect, this.OnConnect) Game.GlobalEvent:RemoveEvent(Protocal.Disconnect, this.OnDisconnect) 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 function this:OnLogout() if IsSDKLogin then + this.SetLoginPart(false) this.sdkLoginBtn:SetActive(false) this.inputField.gameObject:SetActive(false) this.UserBtn:SetActive(false) @@ -172,6 +173,7 @@ function this:OnOpen(...) end if IsSDKLogin then + this.SetLoginPart(false) this.sdkLoginBtn:SetActive(false) this.inputField.gameObject:SetActive(false) this.UserBtn:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 161be364ec..2dc684764d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -41,7 +41,7 @@ function this.LoginRequest(openId, pt_pid, pt_gid, func) data.operator_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetOperatorName() or "" data.network_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetNetworkType() 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.channel_s = pt_pid.."#"..pt_gid 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 -- 打点 - ThinkingAnalyticsManager.Login(openId) + ThinkingAnalyticsManager.SetDistinctId(AppConst.OpenId) ThinkingAnalyticsManager.SetSuperProperties({ 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.SetServer(LoginManager.ServerId) @@ -118,6 +120,7 @@ function this.PlayerInfoRequest(func) end -- 数据打点 + ThinkingAnalyticsManager.Login(PlayerManager.uid) ThinkingAnalyticsManager.SetSuperProperties({ role_id = PlayerManager.uid, role_name = PlayerManager.nickName, diff --git a/Assets/Plugins/Android/libs/PSDK/mhtsdk.aar b/Assets/Plugins/Android/libs/PSDK/mhtsdk.aar index 538a91f899..a3039fae71 100644 Binary files a/Assets/Plugins/Android/libs/PSDK/mhtsdk.aar and b/Assets/Plugins/Android/libs/PSDK/mhtsdk.aar differ diff --git a/Assets/Plugins/Android/libs/main.jar b/Assets/Plugins/Android/libs/main.jar index b93ea30143..d69f051633 100644 Binary files a/Assets/Plugins/Android/libs/main.jar and b/Assets/Plugins/Android/libs/main.jar differ diff --git a/BuildABs/Android/files.unity3d b/BuildABs/Android/files.unity3d index f722cd9da3..9bdca1da8b 100644 Binary files a/BuildABs/Android/files.unity3d and b/BuildABs/Android/files.unity3d differ diff --git a/BuildABs/Android/lzma/luabytes.unity3d b/BuildABs/Android/lzma/luabytes.unity3d index 0ce6979f38..4f46e913ca 100644 Binary files a/BuildABs/Android/lzma/luabytes.unity3d and b/BuildABs/Android/lzma/luabytes.unity3d differ diff --git a/KeyStore/mhthw_test.keystore b/KeyStore/mhthw_test.keystore new file mode 100644 index 0000000000..7947ff1f23 Binary files /dev/null and b/KeyStore/mhthw_test.keystore differ diff --git a/KeyStore/readme.txt b/KeyStore/readme.txt new file mode 100644 index 0000000000..6ca06c027d --- /dev/null +++ b/KeyStore/readme.txt @@ -0,0 +1,2 @@ +key:mhthwtest +password:lingdong \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de2025a7d2..59e0b83757 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: Test - productName: "\u6D4B\u8BD5\u5305" + productName: "\u592A\u521D\u884C\u6D4B\u8BD5\u5305" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} @@ -155,7 +155,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.mht.tcxcsb.test + Android: com.mht.tcxcsb.project Standalone: com.doudou.dwc Tizen: com.junfine.luaframework iOS: com.doudou.dwc @@ -251,8 +251,8 @@ PlayerSettings: AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 2 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: E:/Git/JL/KeyStore/mhthw_test.keystore + AndroidKeyaliasName: mhthwtest AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 diff --git a/ReadMe!/SDK接入相关文档/【戒灵】猕猴桃出包需求2020.7.8/猕猴桃SDK&参数/最新libs-请使用这里面的/mhtsdk.aar b/ReadMe!/SDK接入相关文档/【戒灵】猕猴桃出包需求2020.7.8/猕猴桃SDK&参数/最新libs-请使用这里面的/mhtsdk.aar new file mode 100644 index 0000000000..a3039fae71 Binary files /dev/null and b/ReadMe!/SDK接入相关文档/【戒灵】猕猴桃出包需求2020.7.8/猕猴桃SDK&参数/最新libs-请使用这里面的/mhtsdk.aar differ