Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
c2f905940b
|
@ -26,4 +26,4 @@ Material:
|
|||
m_Floats:
|
||||
- _InvFade: 1
|
||||
m_Colors:
|
||||
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
||||
- _TintColor: {r: 0.6226415, g: 0.5012328, b: 0.23202206, a: 0.5019608}
|
||||
|
|
|
@ -148,6 +148,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1399205022525211762
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8018801407814597797}
|
||||
- component: {fileID: 6436426854285322771}
|
||||
- component: {fileID: 8871751318743663811}
|
||||
m_Layer: 5
|
||||
m_Name: Image (4)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8018801407814597797
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1399205022525211762}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6361193509961736898}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 57}
|
||||
m_SizeDelta: {x: 512, y: 512}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6436426854285322771
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1399205022525211762}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8871751318743663811
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1399205022525211762}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: e58858f1b1ab3a7458d9d47baf18a9fa, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: db22a7aa0cabda647bc0284b80246bb8, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1606432551381439893
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -478,6 +552,7 @@ RectTransform:
|
|||
- {fileID: 5367728379246610282}
|
||||
- {fileID: 5894301615642667041}
|
||||
- {fileID: 7610283183577423566}
|
||||
- {fileID: 8018801407814597797}
|
||||
- {fileID: 5531222548493163716}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
|
@ -1061,7 +1136,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e,
|
||||
type: 3}
|
||||
|
|
|
@ -4652,7 +4652,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534190128304
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -9417,7 +9417,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534398472809
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14183,7 +14183,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534435668158
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -18948,7 +18948,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534450209971
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -23713,7 +23713,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534619458174
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -28478,7 +28478,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534741814842
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -33244,7 +33244,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534848615861
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -38010,7 +38010,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086534911569893
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -42775,7 +42775,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535142922346
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -47473,7 +47473,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535199694531
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -52171,7 +52171,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535281454448
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -56870,7 +56870,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535292549113
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -61626,7 +61626,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535324031562
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -66382,7 +66382,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535355478197
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -71147,7 +71147,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535674928818
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -75913,7 +75913,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535719110089
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -80611,7 +80611,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535748455003
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -85377,7 +85377,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535782171297
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -90143,7 +90143,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535919702147
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -94899,7 +94899,7 @@ ParticleSystem:
|
|||
--- !u!199 &1502086535990888684
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -94975,7 +94975,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!4 &6941918884040322754
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -95073,7 +95073,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 1
|
||||
scalar: 0.99
|
||||
minScalar: 1.5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
@ -96311,7 +96311,7 @@ ParticleSystem:
|
|||
m_RotationOrder: 4
|
||||
separateAxes: 0
|
||||
ColorModule:
|
||||
enabled: 1
|
||||
enabled: 0
|
||||
gradient:
|
||||
serializedVersion: 2
|
||||
minMaxState: 1
|
||||
|
@ -99655,7 +99655,7 @@ ParticleSystem:
|
|||
--- !u!199 &1088076127499487974
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -34,8 +34,8 @@ TextureImporter:
|
|||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
|
@ -51,7 +51,7 @@ TextureImporter:
|
|||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
|
@ -91,6 +91,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -167,6 +167,7 @@ BattleEventName = {
|
|||
RoleBeExile = indexAdd(),--角色被放逐
|
||||
RoleExileEnd = indexAdd(),--角色放逐结束
|
||||
RoleAddBuffFail = indexAdd(),--角色添加buff失败
|
||||
RecordRageChange = indexAdd(), -- 怒气改变时
|
||||
}
|
||||
|
||||
BattleMaxFrame = 1000000
|
||||
|
|
|
@ -177,7 +177,19 @@ function TimeLimitUpHero:RefreshHeroData()
|
|||
end
|
||||
lastLiveName=GetResourcePath(curConfig.Live)
|
||||
heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar)
|
||||
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
|
||||
local totalTimes = 0
|
||||
for i = 1, #wishConfig.UpList do
|
||||
if wishConfig.UpList[i][1]==curHeroId then
|
||||
totalTimes=wishConfig.UpList[i][4]
|
||||
end
|
||||
end
|
||||
reMaintimes = totalTimes - reMaintimes
|
||||
if reMaintimes <= 0 then
|
||||
reMaintimes = 1
|
||||
end
|
||||
|
||||
self.callTimeTxt.text=reMaintimes
|
||||
|
||||
end
|
||||
local freeTime = 0
|
||||
|
@ -252,19 +264,6 @@ function TimeLimitUpHero:RefreshGetHeroTimes()
|
|||
end
|
||||
Util.AddOnceClick(m.btn,sureFunc)
|
||||
end
|
||||
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
|
||||
local totalTimes = 0
|
||||
for i = 1, #wishConfig.UpList do
|
||||
if wishConfig.UpList[i][1]==curHeroId then
|
||||
totalTimes=wishConfig.UpList[i][4]
|
||||
end
|
||||
end
|
||||
reMaintimes = totalTimes - reMaintimes
|
||||
if reMaintimes == 0 then
|
||||
reMaintimes = totalTimes
|
||||
end
|
||||
|
||||
self.callTimeTxt.text=reMaintimes
|
||||
end
|
||||
|
||||
function TimeLimitUpHero:Recruit(actId,type,itemId)
|
||||
|
|
|
@ -123,7 +123,7 @@ function this:ShowUpItem(config,actId)
|
|||
end
|
||||
end
|
||||
hero:OnOpen(false,{config.Id,1},1.1,true)
|
||||
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (num/100000)*100) .."%</color>"
|
||||
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", 5 ).."%</color>"
|
||||
hero.gameObject:SetActive(true)
|
||||
|
||||
for k,v in ipairs(this.ratePreList) do
|
||||
|
@ -134,11 +134,11 @@ function this:ShowUpItem(config,actId)
|
|||
-- return a.GetRate>b.GetRate
|
||||
-- end)
|
||||
local rateList={}
|
||||
local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1}
|
||||
local hero={tag="5星神将UP",name=config.ReadingName,value=0.05,Color=1}
|
||||
for key, value in ConfigPairs(pool) do
|
||||
local id=value.ItemId[1]
|
||||
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
|
||||
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0,sort=value.Sort}
|
||||
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.FakeRate,Color=0,sort=value.Sort}
|
||||
table.insert(rateList,data)
|
||||
end
|
||||
table.sort(rateList,function(a,b)
|
||||
|
@ -165,7 +165,7 @@ function this:ShowUpItem(config,actId)
|
|||
this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1)
|
||||
end
|
||||
this.ratePreList[n].name.text=m.name
|
||||
this.ratePreList[n].rate.text=string.format((m.value/100000)*100).."%"
|
||||
this.ratePreList[n].rate.text=(m.value*100).."%"
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue