Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-11-30 13:23:44 +08:00
commit bd379c4114
21 changed files with 1519 additions and 1071 deletions

View File

@ -0,0 +1,362 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!1 &2
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 16}
- component: {fileID: 42}
- component: {fileID: 44}
- component: {fileID: 43}
- component: {fileID: 5}
- component: {fileID: 3}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!81 &5
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_Enabled: 1
--- !u!4 &16
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!104 &22
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &24
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 10
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!114 &42
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 50
--- !u!114 &43
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ForceModuleActive: 0
--- !u!114 &44
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!1 &1013149005
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1013149006}
- component: {fileID: 1013149007}
- component: {fileID: 1013149008}
m_Layer: 0
m_Name: GameStart
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1013149006
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013149005}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1013149007
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013149005}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1013149008
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013149005}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3}
m_Name:
m_EditorClassIdentifier:
settingInfo:
logLevel: 6
isDebug: 0
bundleMode: 1
luaBundleMode: 1
isUpdate: 1
isSDK: 1
isSDKLogin: 1
isGuide: 1
isOpenGM: 0
--- !u!4 &57277738265262265
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3471622135844523394}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1362306110787991495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3471622135844523394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3}
m_Name:
m_EditorClassIdentifier:
enableLog: 1
networkType: 3
tokens:
- appid: be60c9cab3a34bec96ba900d4dc4f470
serverUrl: https://thinkingdata.18183g.com
mode: 0
timeZone: 0
timeZoneId:
--- !u!1 &3471622135844523394
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 57277738265262265}
- component: {fileID: 1362306110787991495}
- component: {fileID: 3471622135844523395}
- component: {fileID: 3471622135844523396}
m_Layer: 0
m_Name: SDKConfig
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &3471622135844523395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3471622135844523394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
m_Name:
m_EditorClassIdentifier:
appid: o9k4oaqyenwz7hin
channel: "\u4E07\u5408\u5C0F\u7C73"
--- !u!114 &3471622135844523396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3471622135844523394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
m_Name:
m_EditorClassIdentifier:
appid: 1fc5a543ea

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 96bd280f145c76948921d518e43bcbe3
timeCreated: 1496386600
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because it is too large Load Diff

View File

@ -427,6 +427,12 @@ function BattleUtil.ChooseTarget(role, chooseId)
return BattleUtil.GetHpPctLessThanPctHero(arr,0.40)
elseif chooseWeight ==13 then --剩余血量百分比低于50%且生命绝对值最小
return BattleUtil.GetHpPctLessThanPctHero(arr,0.50)
elseif chooseWeight ==14 then --我方战位最靠前的单位 的对位及相邻
local list=nil
list=RoleManager.Query(function (r) return r.camp == role.camp end)
if list and #list>0 then
arr=RoleManager.GetNeighbor(list[1], chooseType)
end
end
local finalArr = {}
if num == 0 then

View File

@ -169,6 +169,8 @@ function MonsterView:OnSkillCastStart(skill)
end
end
end
local offset = self.camp == 0 and self.offset or self.outOffset
self.RoleLiveGO2:GetComponent("RectTransform").anchoredPosition = Vector2.New(offset[1], offset[2])
if name then
self.RoleLiveGO3=nil
local aaa1=Util.GetGameObject(self.skillCastRoot.gameObject.transform.parent,name)

View File

@ -230,12 +230,12 @@ end
function this.SaveNewChatListToLocal()
local str = table.concat(this.NewChatFriendList, "|")
PlayerPrefs.SetString("NewChatList" .. PlayerManager.uid, str)
Log("信息存储到本地:"..str)
Log("好友信息存储到本地:"..str)
end
function this.LoadNewChatListFromLocal()
local str = PlayerPrefs.GetString("NewChatList" .. PlayerManager.uid)
Log("读取本地信息:"..str)
Log("读取本地好友信息:"..str)
local list = string.split(str, "|")
this.NewChatFriendList = {}
-- 字符串转数字

View File

@ -113,7 +113,7 @@ end
function this.AddUIList(jumpId)
table.insert(this.OpenUIList,jumpId)
for i,v in ipairs(this.OpenUIList) do
Log("AddUIList:"..v)
-- Log("AddUIList:"..v)
end
end
function this.RemoveUIList()
@ -121,7 +121,7 @@ function this.RemoveUIList()
table.remove(this.OpenUIList,#this.OpenUIList)
end
for i,v in ipairs(this.OpenUIList) do
Log("RemoveUIList:"..v)
-- Log("RemoveUIList:"..v)
end
end
function this.ChangeUIList(jumpId)
@ -131,7 +131,7 @@ function this.ChangeUIList(jumpId)
this.OpenUIList[#this.OpenUIList] = jumpId
end
for i,v in ipairs(this.OpenUIList) do
Log("ChangeUIList:"..v)
-- Log("ChangeUIList:"..v)
end
end

View File

@ -125,7 +125,7 @@ function this.RefreshAccumRechargeValue(goodsId)
end
function this.SetAccumRechargeValue(value, flag)
Log("充值金额:"..value)
-- Log("充值金额:"..value)
if flag then
AccumRechargeValue = AccumRechargeValue + value
CheckRedPointStatus(RedPointType.FirstRecharge)

View File

@ -55,10 +55,7 @@ function this.LoginRequest(openId, func)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.LoginResponse()
msg:ParseFromString(data)
Log("resultCode : " .. msg.resultCode)
Log("newToken : " .. msg.newToken)
Log("resultCode:"..tostring(msg.resultCode).." newToken:"..tostring(msg.newToken))
if msg.resultCode == 0 then
--成功登录
Log("成功登录!!!!!!")

View File

@ -716,10 +716,17 @@ function this:ChangeCurentHeroSkinLive(herodata)
end
if herodata then
this.curLiveObj=HeroManager.LoadHerolive1(herodata,this.curObj)
if herodata.heroConfig then
SetHEeroLiveToward(this.curLiveObj,herodata.heroConfig.Toward,herodata.position)
local toward=0
local pos=nil
if herodata.Type~=0 then
local roleCon=ConfigManager.TryGetConfigData(ConfigName.RoleConfig,herodata.Type)
if roleCon then
toward=roleCon.Toward
end
else
toward=herodata.heroConfig.Toward
end
SetHEeroLiveToward(this.curLiveObj,toward,herodata.Position)
-- 临时保存皮肤位置
curHeroPosition = herodata.Position
else

View File

@ -90,7 +90,6 @@ function this.RefreshChargeMoney(chargedNum, isLogin)
lastCharged = chargedNum
--刷新下签到红点
CheckRedPointStatus(RedPointType.CumulativeSignIn)
Log("已充值金额" .. chargedNum)
end
-- 获得累充数量
@ -100,7 +99,7 @@ end
-- 根据充值数量设置Vip等级
function this.SetLevelByCost(cost)
Log("花费:" .. cost)
-- Log("花费:" .. cost)
local level = minLevel
if cost <= vipLevelConfig[minLevel].MoneyLimit then
level = minLevel
@ -116,12 +115,8 @@ function this.SetLevelByCost(cost)
end
end
end
Log("vip等级:" .. level)
level = level > maxLevel and maxLevel or level
Log(string.format("累充数:%s对应的Vip等级:%s", cost, level))
Log(string.format("已充值金额:%s 对应的Vip等级:%s", cost, level))
return level
end
@ -183,7 +178,7 @@ end
--五点刷新数据
function this.FiveAMRefreshLocalData(hadTakeDailyBox)
Log("5点刷新数据")
Log("Vip,5点刷新数据")
VipManager.SetTakeDailyBoxStatus(hadTakeDailyBox)
--通知Vip界面刷新数据
MapTrialManager.RefreshAttachVipData()