Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
4af617da49
Binary file not shown.
Binary file not shown.
|
@ -1,29 +1,113 @@
|
|||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<Objective-C-extensions>
|
||||
<file>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
||||
</file>
|
||||
<class>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
||||
</class>
|
||||
<extensions>
|
||||
<pair source="cpp" header="h" fileNamingConvention="NONE" />
|
||||
<pair source="c" header="h" fileNamingConvention="NONE" />
|
||||
</extensions>
|
||||
</Objective-C-extensions>
|
||||
<codeStyleSettings language="XML">
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</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>
|
||||
</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">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<compositeConfiguration>
|
||||
<compositeBuild compositeDefinitionSource="SCRIPT" />
|
||||
</compositeConfiguration>
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
|
@ -12,6 +15,7 @@
|
|||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
<option name="testRunner" value="PLATFORM" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
<option name="myNullables">
|
||||
<value>
|
||||
<list size="7">
|
||||
<list size="12">
|
||||
<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="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="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
|
||||
<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>
|
||||
</value>
|
||||
</option>
|
||||
<option name="myNotNulls">
|
||||
<value>
|
||||
<list size="6">
|
||||
<list size="11">
|
||||
<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="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="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
|
||||
<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>
|
||||
</value>
|
||||
</option>
|
||||
</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" />
|
||||
</component>
|
||||
<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() {
|
||||
|
||||
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<String, String> 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<String, String> 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);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -311,7 +311,7 @@ MonoBehaviour:
|
|||
tokens:
|
||||
- appid: debug-appid
|
||||
serverUrl: http://thinkingdata.18183g.com
|
||||
mode: 2
|
||||
mode: 1
|
||||
timeZone: 0
|
||||
timeZoneId:
|
||||
--- !u!1 &3471622135844523394
|
||||
|
|
|
@ -51,6 +51,7 @@ CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor();
|
|||
CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONGETBETRESPONSE_WINUID_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONGETBETRESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONBETREQEUST = protobuf.Descriptor();
|
||||
CHAMPIONBETREQEUST_WINUID_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONBETREQEUST_COINS_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -523,11 +524,21 @@ CHAMPIONGETBETRESPONSE_PROCESS_FIELD.default_value = 0
|
|||
CHAMPIONGETBETRESPONSE_PROCESS_FIELD.type = 5
|
||||
CHAMPIONGETBETRESPONSE_PROCESS_FIELD.cpp_type = 1
|
||||
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.name = "myBetCoins"
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse.myBetCoins"
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.number = 5
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.index = 4
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.label = 1
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.has_default_value = false
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.default_value = 0
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.type = 5
|
||||
CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.cpp_type = 1
|
||||
|
||||
CHAMPIONGETBETRESPONSE.name = "ChampionGetBetResponse"
|
||||
CHAMPIONGETBETRESPONSE.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse"
|
||||
CHAMPIONGETBETRESPONSE.nested_types = {}
|
||||
CHAMPIONGETBETRESPONSE.enum_types = {}
|
||||
CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD}
|
||||
CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD, CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD}
|
||||
CHAMPIONGETBETRESPONSE.is_extendable = false
|
||||
CHAMPIONGETBETRESPONSE.extensions = {}
|
||||
CHAMPIONBETREQEUST_WINUID_FIELD.name = "winUid"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -4399,7 +4399,19 @@ local passivityList = {
|
|||
|
||||
--
|
||||
[225] = function()
|
||||
--王振兴添加
|
||||
local f1 = args[1]
|
||||
local pro1 = args[2]
|
||||
local ct1 = args[3]
|
||||
local maxNum = args[4]
|
||||
-- 紫+橙
|
||||
local num = OutDataManager.GetOutData(role.camp, OutDataName.MisteryLiquidUsedTimes)
|
||||
|
||||
num = min(maxNum, num)
|
||||
BattleUtil.AddProp(role, pro1, f1 * num, ct1)
|
||||
|
||||
|
||||
|
||||
end,
|
||||
|
||||
-- 斩杀生命低于[a]的敌人
|
||||
|
@ -4656,6 +4668,7 @@ local passivityList = {
|
|||
|
||||
-- 紫+橙
|
||||
local num = OutDataManager.GetOutData(role.camp, OutDataName.MisteryLiquidUsedTimes)
|
||||
|
||||
num = min(maxNum, num)
|
||||
BattleUtil.AddProp(role, pro1, f1 * num, ct1)
|
||||
end,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -464,6 +464,8 @@ function ExpeditionMainPanel:SingleLayNodeShow(go,layNodeListData)
|
|||
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.Greed,layNodeListData[i],2)
|
||||
elseif layNodeListData[i].type == ExpeditionNodeType.Reward then--最后奖励节点
|
||||
NetManager.TakeExpeditionBoxRewardRequest( layNodeListData[i].sortId,function (msg)
|
||||
--加积分
|
||||
NetManager.TreasureOfHeavenScoreRequest()
|
||||
local compShowType = nil
|
||||
if #msg.leve < 1 then
|
||||
compShowType = 5
|
||||
|
|
|
@ -23,6 +23,7 @@ this.heroLvEnd = {}
|
|||
--3星=60,4=200,5=250 星级对应等级上限
|
||||
--this.heroLvBreakNum={}--3星=9000,4=60000,5=60000 星级对应突破系数
|
||||
this.heroPropertyScore = {}
|
||||
|
||||
--每个属性评分
|
||||
this.heroPosCount = 5
|
||||
this.heroQuantityCount = 6
|
||||
|
@ -74,6 +75,8 @@ end
|
|||
function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
||||
local heroData = {}
|
||||
heroData.soulPrintList = {}
|
||||
--乘减属性集合
|
||||
heroData.MLSproList={}
|
||||
heroData.heroBackData = _msgHeroData
|
||||
heroData.dynamicId = _msgHeroData.id
|
||||
local _id = _msgHeroData.heroId
|
||||
|
@ -887,7 +890,7 @@ local function CalculateHeroUpTalismanProAddVal(_heroId, _breakId, _upStarId,tea
|
|||
if skillIds and #skillIds > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
|
||||
--单体加成 --单体等级限制加成 --团体加成 --减乘
|
||||
singleHeroProVal, lvProVal, allHeroProVal, specialProVal =
|
||||
this.CalculatePassiveSkillsValList(WarPowerType.Talisman, skillIds,teamCurPropertyName)
|
||||
this.CalculatePassiveSkillsValList(WarPowerType.Talisman, skillIds,teamCurPropertyName,curHeroData)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1095,7 +1098,7 @@ local function CalculateHeroPassiveSkillProAddVal(_type, _heroId, _breakId, _upS
|
|||
end
|
||||
--单体加成 --单体等级限制加成 --团体加成 --减乘
|
||||
singleHeroProVal, lvProVal, allHeroProVal, specialProVal =
|
||||
this.CalculatePassiveSkillsValList(WarPowerType.Hero, allOpenPassiveSkillIds,teamCurPropertyName)
|
||||
this.CalculatePassiveSkillsValList(WarPowerType.Hero, allOpenPassiveSkillIds,teamCurPropertyName,curHeroData)
|
||||
end
|
||||
return singleHeroProVal, lvProVal, allHeroProVal, specialProVal
|
||||
end
|
||||
|
@ -1251,7 +1254,7 @@ end
|
|||
---
|
||||
---
|
||||
|
||||
function this.CalculatePassiveSkillsValList(index, skillids,teamCurPropertyName)
|
||||
function this.CalculatePassiveSkillsValList(index, skillids,teamCurPropertyName,curHeroData)
|
||||
for k, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.PropertyConfig)) do
|
||||
this.allProVal[index].singleHeroProVal[k] = 0
|
||||
this.allProVal[index].lvProVal[k] = 0
|
||||
|
@ -1270,7 +1273,8 @@ function this.CalculatePassiveSkillsValList(index, skillids,teamCurPropertyName)
|
|||
this.allProVal[index].specialProVal,
|
||||
curSkillData.Value[1],
|
||||
curSkillData.Value[2],
|
||||
curSkillData.Value[3]
|
||||
curSkillData.Value[3],
|
||||
curHeroData
|
||||
)
|
||||
elseif curSkillData.Type == 94 then
|
||||
this.GetProAndValByFormula(
|
||||
|
@ -1392,6 +1396,11 @@ function this.GetProAndValByFormula(proTable, specialProVal, curProId, curProVal
|
|||
elseif curProlGs == 4 then --公式 (百分比减a*(1-b))
|
||||
--目前没有
|
||||
--specialProVal
|
||||
local curProConfig = ConfigManager.GetConfigDataByKey(ConfigName.PropertyConfig, "PropertyIdInBattle", curProId)
|
||||
local singleProInfo = {proId =curProConfig.PropertyId ,value = curProVal}
|
||||
if heroPro.MLSproList then
|
||||
table.insert(heroPro.MLSproList,singleProInfo)
|
||||
end
|
||||
else --171 无公式
|
||||
local curProConfig = ConfigManager.GetConfigDataByKey(ConfigName.PropertyConfig, "PropertyIdInBattle", curProId)
|
||||
if propertyConfig[curProConfig.PropertyId].Style == 1 then
|
||||
|
@ -1702,7 +1711,18 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
|
|||
--allAddProVal[k]=math.floor(allAddProVal[k]*0.1/(curHeroData.lv+10)/100)
|
||||
end
|
||||
end
|
||||
|
||||
--目前没有 王振兴加 最后计算个属性的乘减算
|
||||
if LengthOfTable(curHeroData.MLSproList)>0 then
|
||||
for k, v in pairs(curHeroData.MLSproList) do
|
||||
local mlsPro=curHeroData.MLSproList[k]
|
||||
if allAddProVal[mlsPro.proId] then
|
||||
local aaa=1-mlsPro.value
|
||||
local value=math.floor(allAddProVal[mlsPro.proId] * (1-mlsPro.value))
|
||||
allAddProVal[mlsPro.proId]=value
|
||||
end
|
||||
end
|
||||
end
|
||||
curHeroData.MLSproList={}
|
||||
--Log("allEquipScore "..allEquipScore)
|
||||
--最后计算英雄战斗力
|
||||
if _type == 1 then
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -738,11 +738,11 @@ function this.TreasureStateIndicaion(buffer)
|
|||
local data = buffer:DataByte()
|
||||
local msg = Expedition_pb.TreasureStateIndicaion()--ExpeditionResetIndication()
|
||||
msg:ParseFromString(data)
|
||||
LogGreen("msg.score "..msg.score)
|
||||
-- LogGreen("msg.score :"..msg.score.." msg.resetTime:"..msg.resetTime)
|
||||
TreasureOfHeavenManger.SetScore(msg.score)
|
||||
TreasureOfHeavenManger.SetLimitTime(msg.resetTime)
|
||||
for i = 1, #msg.treasureRewardState do
|
||||
TreasureOfHeavenManger. SetSingleRewardState(msg.treasureRewardState[i].id,msg.treasureRewardState[i].state)
|
||||
LogGreen("msg.treasureRewardState[i].id "..msg.treasureRewardState[i].id.." "..msg.treasureRewardState[i].state)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -121,7 +121,7 @@ function RewardEquipSingleShowPopup:OnShow()
|
|||
|
||||
--装备基础信息
|
||||
LogBlue(equipData.id)
|
||||
LogBlue(tonumber(equipData.id))
|
||||
-- LogBlue(tonumber(equipData.id))
|
||||
local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(equipData.id))
|
||||
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(equipData.id))
|
||||
this.btnSure:SetActive(isShowfenjie)
|
||||
|
|
|
@ -204,7 +204,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
self.starGrid:SetActive(true)
|
||||
EquipManager.SetEquipStarShow(self.starGrid, _itemData.configData.Id)
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
|
||||
_itemData.id = _itemData.configData.Id
|
||||
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5 or _itemData.configData.Quantity == 4)
|
||||
|
|
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
|
||||
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
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue