Merge branch 'china/dev' into 0功能/silingshilian

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
dev_chengFeng
jiaoyangna 2021-09-02 19:33:48 +08:00
commit 4d5876eb28
43 changed files with 24615 additions and 125486 deletions

View File

@ -15,7 +15,7 @@ public class AutoPack : EditorWindow
// 专服
new string[]{ "C轮v2", "Logo_gm_nosdk", "TCX_TEST_C_V2", "china/zf_test"},
new string[]{ "灵动专服-测试", "Logo_gn_zf_test", "MHT_GN_ZF_TEST" , "china/zf_test"},
new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE" , "china/zf_test"},
new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE3" , "china/zf_test"},
new string[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU", "china/zf_test"},
new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"},
new string[]{ "游心", "Logo_cn_youxin", "MHT_CN_YOUXIN", "china/zf_test"},

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9518359082444204aa4eec0a754c0605
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 86b542de7de32fe4d94235ff76daef51
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -201,7 +201,7 @@ namespace SDK
string channel = proxy.GetChannel();
if (channel != null && channel != "")
return channel;
return "unknown";
return "";
}
//sdk获取支付订单号
public string GetSubChannel()
@ -219,7 +219,7 @@ namespace SDK
return packId;
}
}
return "unknown";
return "";
}
/// <summary>
/// ///////// sdk层回调

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

View File

@ -0,0 +1,131 @@
fileFormatVersion: 2
guid: 6fe251e728c2f9641a0cf58f034c35b7
TextureImporter:
fileIDToRecycleName:
21300000: c_zn_lh_001_t3
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_zn_lh_001_t3
rect:
serializedVersion: 2
x: 0
y: 0
width: 178
height: 426
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 38f9d3241bdd1ee45a7e532d86ce106b
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: fc51206fc2ebbb64989a3bd989bdf2b2
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 1378a23791bffea408161a0adcf52a5e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: df579a01f952d934a80cb4b7880e6ed4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7585405711807808609
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8799996609319202500}
- component: {fileID: 8945618217895825078}
- component: {fileID: 691580497476082165}
m_Layer: 0
m_Name: live2d_c_zn_001
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8799996609319202500
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7585405711807808609}
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: 0
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8945618217895825078
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7585405711807808609}
m_CullTransparentMesh: 0
--- !u!114 &691580497476082165
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7585405711807808609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
skeletonDataAsset: {fileID: 11400000, guid: edc0f44c5a9dbc14596e7d9bedf4185f, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation:
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 42ab4fc346c037447a25ed489f6c9ff4
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: lz4/prefabs/live2d/live2d_c_0003
assetBundleVariant: unity3d

View File

@ -2673,7 +2673,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3254902, g: 0.29803923, b: 0.23529413, a: 1}
m_Color: {r: 0.99607843, g: 0.6745098, b: 0.26666668, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2693,7 +2693,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5269\u4F59\u65F6\u95F4\n"
m_Text: "\u8D5B\u5B63\u5269\u4F59\u65F6\u95F4\n"
LanguageIndex: 10057
--- !u!1 &1569047852161328
GameObject:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c77d6e125b70b2045bccbd361ee2c23b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,468 @@
c_zn_001.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
bao_1
rotate: false
xy: 388, 2
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
bao_2
rotate: true
xy: 336, 2
size: 44, 32
orig: 44, 32
offset: 0, 0
index: -1
bao_3
rotate: false
xy: 337, 48
size: 76, 81
orig: 76, 81
offset: 0, 0
index: -1
bao_34
rotate: true
xy: 680, 354
size: 18, 82
orig: 18, 82
offset: 0, 0
index: -1
bao_4
rotate: false
xy: 876, 462
size: 14, 83
orig: 14, 83
offset: 0, 0
index: -1
biyan_15
rotate: false
xy: 419, 227
size: 14, 12
orig: 14, 12
offset: 0, 0
index: -1
biyan_16
rotate: false
xy: 370, 2
size: 16, 10
orig: 16, 10
offset: 0, 0
index: -1
fazan_60
rotate: true
xy: 194, 237
size: 95, 119
orig: 95, 119
offset: 0, 0
index: -1
fazan_61
rotate: false
xy: 777, 385
size: 26, 51
orig: 26, 51
offset: 0, 0
index: -1
fazan_62
rotate: true
xy: 600, 357
size: 23, 78
orig: 23, 78
offset: 0, 0
index: -1
jiao_57
rotate: false
xy: 516, 129
size: 45, 92
orig: 45, 92
offset: 0, 0
index: -1
piaodai_37
rotate: false
xy: 842, 437
size: 32, 108
orig: 32, 108
offset: 0, 0
index: -1
piaodai_38
rotate: false
xy: 315, 366
size: 121, 285
orig: 121, 285
offset: 0, 0
index: -1
piaodai_39
rotate: false
xy: 194, 334
size: 119, 312
orig: 119, 312
offset: 0, 0
index: -1
piaodai_40
rotate: true
xy: 585, 660
size: 60, 274
orig: 60, 274
offset: 0, 0
index: -1
piaodai_41
rotate: true
xy: 438, 347
size: 63, 160
orig: 63, 160
offset: 0, 0
index: -1
piaodai_58
rotate: false
xy: 435, 295
size: 166, 50
orig: 166, 50
offset: 0, 0
index: -1
qunzi_47
rotate: true
xy: 254, 763
size: 79, 398
orig: 79, 398
offset: 0, 0
index: -1
qunzi_54
rotate: false
xy: 2, 250
size: 190, 396
orig: 190, 396
offset: 0, 0
index: -1
qunzi_55
rotate: true
xy: 254, 844
size: 178, 378
orig: 178, 378
offset: 0, 0
index: -1
shanzi_31
rotate: false
xy: 315, 241
size: 118, 123
orig: 118, 123
offset: 0, 0
index: -1
shenti_46
rotate: true
xy: 654, 722
size: 120, 261
orig: 120, 261
offset: 0, 0
index: -1
sijin_65
rotate: true
xy: 634, 844
size: 178, 274
orig: 178, 274
offset: 0, 0
index: -1
sijin_66
rotate: false
xy: 254, 653
size: 329, 108
orig: 329, 108
offset: 0, 0
index: -1
tou_17
rotate: false
xy: 861, 660
size: 43, 60
orig: 43, 60
offset: 0, 0
index: -1
toufa_10
rotate: false
xy: 516, 73
size: 36, 54
orig: 36, 54
offset: 0, 0
index: -1
toufa_11
rotate: false
xy: 821, 393
size: 15, 43
orig: 15, 43
offset: 0, 0
index: -1
toufa_12
rotate: true
xy: 563, 135
size: 12, 40
orig: 12, 40
offset: 0, 0
index: -1
toufa_13
rotate: false
xy: 286, 117
size: 40, 118
orig: 40, 118
offset: 0, 0
index: -1
toufa_14
rotate: false
xy: 495, 56
size: 19, 72
orig: 19, 72
offset: 0, 0
index: -1
toufa_18
rotate: true
xy: 193, 10
size: 44, 109
orig: 44, 109
offset: 0, 0
index: -1
toufa_42
rotate: true
xy: 600, 382
size: 33, 83
orig: 33, 83
offset: 0, 0
index: -1
toufa_5
rotate: false
xy: 516, 58
size: 31, 13
orig: 31, 13
offset: 0, 0
index: -1
toufa_59
rotate: false
xy: 419, 130
size: 95, 91
orig: 95, 91
offset: 0, 0
index: -1
toufa_6
rotate: false
xy: 641, 327
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
toufa_63
rotate: false
xy: 603, 319
size: 36, 36
orig: 36, 36
offset: 0, 0
index: -1
toufa_64
rotate: false
xy: 2, 648
size: 250, 374
orig: 250, 374
offset: 0, 0
index: -1
toufa_7
rotate: true
xy: 286, 56
size: 59, 49
orig: 59, 49
offset: 0, 0
index: -1
toufa_8
rotate: false
xy: 2, 2
size: 15, 8
orig: 15, 8
offset: 0, 0
index: -1
toufa_9
rotate: false
xy: 636, 725
size: 16, 36
orig: 16, 36
offset: 0, 0
index: -1
xiuzi_l_45
rotate: true
xy: 687, 374
size: 84, 88
orig: 84, 88
offset: 0, 0
index: -1
xiuzi_l_48
rotate: false
xy: 597, 417
size: 88, 241
orig: 88, 241
offset: 0, 0
index: -1
xiuzi_l_50
rotate: false
xy: 783, 438
size: 57, 220
orig: 57, 220
offset: 0, 0
index: -1
xiuzi_l_56
rotate: false
xy: 193, 56
size: 91, 179
orig: 91, 179
offset: 0, 0
index: -1
xiuzi_r_26
rotate: true
xy: 328, 131
size: 108, 89
orig: 108, 89
offset: 0, 0
index: -1
xiuzi_r_27
rotate: true
xy: 2, 12
size: 236, 189
orig: 236, 189
offset: 0, 0
index: -1
xiuzi_r_28
rotate: false
xy: 687, 460
size: 94, 198
orig: 94, 198
offset: 0, 0
index: -1
xiuzi_r_35
rotate: false
xy: 917, 827
size: 105, 195
orig: 105, 195
offset: 0, 0
index: -1
xiuzi_r_36
rotate: true
xy: 438, 412
size: 239, 157
orig: 239, 157
offset: 0, 0
index: -1
xiuzi_r_52
rotate: false
xy: 415, 58
size: 78, 70
orig: 78, 70
offset: 0, 0
index: -1
xiuzi_r_53
rotate: false
xy: 604, 236
size: 28, 28
orig: 28, 28
offset: 0, 0
index: -1
xiuzizhuangshi_l_44
rotate: true
xy: 370, 14
size: 32, 45
orig: 32, 45
offset: 0, 0
index: -1
xiuzizhuangshi_r_19
rotate: false
xy: 563, 149
size: 41, 73
orig: 41, 73
offset: 0, 0
index: -1
xiuzizhuangshi_r_20
rotate: false
xy: 805, 383
size: 14, 53
orig: 14, 53
offset: 0, 0
index: -1
xiuzizhuangshi_r_21
rotate: false
xy: 889, 560
size: 24, 98
orig: 24, 98
offset: 0, 0
index: -1
xiuzizhuangshi_r_22
rotate: false
xy: 304, 6
size: 30, 48
orig: 30, 48
offset: 0, 0
index: -1
xiuzizhuangshi_r_23
rotate: false
xy: 842, 547
size: 45, 111
orig: 45, 111
offset: 0, 0
index: -1
xiuzizhuangshi_r_24
rotate: true
xy: 435, 223
size: 70, 124
orig: 70, 124
offset: 0, 0
index: -1
xiuzizhuangshi_r_25
rotate: false
xy: 917, 690
size: 103, 135
orig: 103, 135
offset: 0, 0
index: -1
youshou_29
rotate: false
xy: 603, 295
size: 39, 22
orig: 39, 22
offset: 0, 0
index: -1
youshou_32
rotate: false
xy: 838, 415
size: 34, 20
orig: 34, 20
offset: 0, 0
index: -1
youshou_33
rotate: true
xy: 561, 224
size: 69, 41
orig: 69, 41
offset: 0, 0
index: -1
zuoshou_30
rotate: false
xy: 604, 266
size: 31, 27
orig: 31, 27
offset: 0, 0
index: -1
zuoshou_43
rotate: false
xy: 838, 391
size: 31, 22
orig: 31, 22
offset: 0, 0
index: -1
zuoshou_49
rotate: false
xy: 675, 332
size: 22, 20
orig: 22, 20
offset: 0, 0
index: -1
zuoshou_51
rotate: false
xy: 585, 722
size: 49, 39
orig: 49, 39
offset: 0, 0
index: -1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1ba097cb7660e954f91f76341c0ba009
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 609 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: ce69d911f9a242f4abb58494c2f36f35
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 49
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ae560b58c4a7b2d448526e5cc0ff0729
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 42a9b77f61fee514e96b90dd2c8a9d53
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: c_zn_001_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 1ba097cb7660e954f91f76341c0ba009, type: 3}
materials:
- {fileID: 2100000, guid: d5e33f35566098b41b3d8188daa80ca2, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ca4c7df76da4bfe4895c1dd427ae70a5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: c_zn_001_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: ce69d911f9a242f4abb58494c2f36f35, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d5e33f35566098b41b3d8188daa80ca2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: c_zn_001_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: ca4c7df76da4bfe4895c1dd427ae70a5, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 42a9b77f61fee514e96b90dd2c8a9d53, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: edc0f44c5a9dbc14596e7d9bedf4185f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -33,7 +33,7 @@ end
-- 获取包名
function PackageManager.GetPackageID()
-- 优先使用sdk自带的
if LoginManager.SdkSubChannel then
if LoginManager.SdkSubChannel and LoginManager.SdkSubChannel ~= "" then
return LoginManager.SdkSubChannel
end
-- 否则使用配置的

View File

@ -1741,7 +1741,7 @@ local passivityList = {
end
if skill.type == BattleSkillType.Special then
role.Event:RemoveEvent(BattleEventName.RoleHit, OnHit)
local arr = RoleManager.Query(function (r) return r.camp == role.camp and r.deadFilter end)
local arr = RoleManager.NoOrder(function (r) return r.camp == role.camp and r.deadFilter end)
BattleUtil.SortByHpFactor(arr, 1)
-- 检测技能伤害<E4BCA4><E5AEB3><EFBFBD>疗加成
local f = BattleUtil.CheckSkillDamageHeal(f1, role, arr[1])
@ -2052,6 +2052,9 @@ local passivityList = {
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
end
local function onRoleDamageBefore(target, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -2247,6 +2250,15 @@ local passivityList = {
local i1 = args[4]
-- 释放技能后
local onSkillEnd = function(skill)
BattleLogManager.Log(
"Passive 119",
"camp", role.camp,
"pos", role.position,
"isSkill", tostring(skill ~= nil),
"isTriggerJudge", tostring(skill.isTriggerJudge),
"type", tostring(skill.type),
"judge", tostring(judge)
)
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -2905,6 +2917,9 @@ local passivityList = {
local index, tran
local OnRoleDamageBefore = function(target, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -2914,6 +2929,9 @@ local passivityList = {
end
end
local OnRoleDamageAfter = function(defRole,damageFunc,fixDamage,skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -5742,6 +5760,9 @@ local passivityList = {
local round=args[1]
local pro=args[2]
local onRoleDamageBefore=function(defRole, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -5749,7 +5770,7 @@ local passivityList = {
if BattleLogic.GetCurRound() ~= round then
return
end
if defRole and defRole.camp~=role.camp and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) then
if defRole and defRole.camp~=role.camp and skill and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) then
BattleUtil.RandomAction(pro, function()
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
--之前写的 buff.immuneType == 2 不知道为什么清除免疫燃烧 改成==1 了 by:王振兴 2021/06/09
@ -5913,6 +5934,9 @@ local passivityList = {
local curBuff=nil
local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill)
if not skill then
return
end
if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then
--curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune)
-- role:AddBuff(curBuff)
@ -6056,6 +6080,9 @@ local passivityList = {
local curBuff=nil
local immuneState=false
local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill)
if not skill then
return
end
if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then
--curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune)
-- role:AddBuff(curBuff)
@ -6971,7 +6998,7 @@ local passivityList = {
-- end
-- LogYellow("307 1")
if skill and (skill.type==BattleSkillType.Special or skill.type== BattleSkillType.Extra or skill.type== BattleSkillType.Monster) then --技能造成的直接伤害
local list = RoleManager.Query(function(v) return v.camp == role.camp end)
local list = RoleManager.NoOrder(function(v) return v.camp == role.camp end)
BattleUtil.SortByHpFactor(list, 1)
-- LogYellow("307 2")
if list[1] then
@ -7830,6 +7857,9 @@ local passivityList = {
end
end
local function onRoleDamageBefore(skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end

View File

@ -202,6 +202,16 @@ function BattleUtil.SortByHpFactorAndHp(arr, sort)
end)
return arr
end
--移除队列有不灭的单位
function BattleUtil.RemoveNoDeadRole(arr)
for i = 1, #arr do
local role=arr[i]
if BattleLogic.BuffMgr:HasBuff(role,BuffName.NoDead) then
table.removebyvalue(arr,role)
end
end
end
--按怒气排序
function BattleUtil.SortByRage(arr, sort)
BattleUtil.Sort(arr, function(a, b)
@ -352,6 +362,8 @@ function BattleUtil.ChooseTarget(role, chooseId)
BattleUtil.SortByProp(arr, RoleDataName.Hp, sort)
elseif chooseWeight == 2 then -- 血量百分比
BattleUtil.SortByHpFactor(arr, sort)
--选血量百分比最低的 不选择有不灭的,如果伤害要选有不灭的 需处理
BattleUtil.RemoveNoDeadRole(arr)
elseif chooseWeight == 3 then -- 攻击力
BattleUtil.SortByProp(arr, RoleDataName.Attack, sort)
elseif chooseWeight == 4 then -- 防御

View File

@ -98,6 +98,14 @@ function RoleLogic:Init(uid, data, position)
end
if BattleUtil.Passivity[id] then
BattleUtil.Passivity[id](self, args,passivityId,judge)
BattleLogManager.Log(
"Add Passive",
"id", tostring(id),
"camp", tostring(self.camp),
"pos", tostring(self.position),
"passivityId", tostring(passivityId),
"judge", tostring(judge)
)
-- 加入被动列表
table.insert(self.passiveList, {id, args,passivityId})
end
@ -424,15 +432,6 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets)
end
SkillManager.AddSkill(self, effectData, type, targets, isAdd, isRage,isTriggerJudge)
--
BattleLogManager.Log(
"Add Skill",
"camp", self.camp,
"pos", self.position,
"type", type,
"isRage", tostring(isRage),
"isAdd", tostring(isAdd),
"targets", targets and #targets or "0"
)
end
--加入额外技能,用于额外释放技能 by:王振兴
@ -450,15 +449,6 @@ function RoleLogic:InsertExtraSkill(id,type)
end
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,isTrigger)
BattleLogManager.Log(
"Insert Extra Skill",
"camp", self.camp,
"pos", self.position,
"type", skillType,
"isRage", tostring(false),
"isAdd", tostring(true),
"targets", targets and #targets or "0"
)
end
end
@ -468,16 +458,6 @@ function RoleLogic:InsertSkill(type, isRage, isAdd, targets)
if not self.IsCanAddSkill and isAdd then return end
local effectData = type == BattleSkillType.Normal and self.skill or self.superSkill
SkillManager.InsertSkill(self, effectData, type, targets, isAdd, isRage)
--
BattleLogManager.Log(
"Insert Skill",
"camp", self.camp,
"pos", self.position,
"type", type,
"isRage", tostring(isRage),
"isAdd", tostring(isAdd),
"targets", targets and #targets or "0"
)
end
-- 设置是否可以追加技能
function RoleLogic:SetIsCanAddSkill(isCan)

View File

@ -49,6 +49,16 @@ function this.AddSkill(caster, effectData, type, targets, isAdd, isRage,isTrigge
if not this.CheckMaxCount() then
return
end
BattleLogManager.Log(
"Add Skill",
"camp", caster.camp,
"pos", caster.position,
"type", type,
"isRage", tostring(isRage),
"isAdd", tostring(isAdd),
"isTriggerJudge", tostring(isTriggerJudge),
"targets", targets and #targets or "0"
)
local skill = skillPool:Get()
skill:Init(caster, effectData, type, targets, isAdd, isRage,isTriggerJudge)
if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列
@ -64,6 +74,18 @@ function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage,isTri
if not this.CheckMaxCount() then
return
end
BattleLogManager.Log(
"Insert Skill",
"camp", caster.camp,
"pos", caster.position,
"type", type,
"isRage", tostring(isRage),
"isAdd", tostring(isAdd),
"isTriggerJudge", tostring(isTriggerJudge),
"isLoop", tostring(isLoop),
"targets", targets and #targets or "0"
)
local skill = skillPool:Get()
--角色被混乱后

View File

@ -521,7 +521,8 @@ function EnemyView:OnDead()
end
self.hpSlider.fillAmount = 0
self.hpPassSlider.fillAmount = 0
self.rageSlider.fillAmount = 0
--死亡后不把怒气条显示清空,处理触发不灭怒气不足四点 怒气条清空 2021/09/01
--self.rageSlider.fillAmount = 0
self.rageText.text = ""
end

View File

@ -563,7 +563,8 @@ function PlayerView:OnDead()
end
self.hpSlider.fillAmount = 0
self.hpPassSlider.fillAmount = 0
self.rageSlider.fillAmount = 0
--死亡后不把怒气条显示清空,处理触发不灭怒气不足四点 怒气条清空 2021/09/01
--self.rageSlider.fillAmount = 0
self.rageText.text = ""
end

View File

@ -6,6 +6,10 @@ local activityId
--live2D位置和大小
local NamePosSize = {
[10040] = {name = "live2d_c_yj_00040" , size = Vector3.one*0.8 , pos = Vector2.New(231,-333)},
[10086] = {name = "live2d_c_0001" , size = Vector3.one*0.8 , pos = Vector2.New(174,-926)},
[10090] = {name = "live2d_c_0001" , size = Vector3.one*0.8 , pos = Vector2.New(174,-926)},
[10091] = {name = "live2d_c_bgj_00091" , size = Vector3.one*0.8 , pos = Vector2.New(137,-769)},
[10092] = {name = "live2d_c_gy_00092" , size = Vector3.one*0.8 , pos = Vector2.New(171,-1060)},
}
function ShengXingYouLi:New(gameObject)

View File

@ -206,9 +206,9 @@ function this.SetCardSingleData(o,monsterId, _pos)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId)
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[heroConfig.Star])
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[monsterconfig.Star])
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroConfig.Star])
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterconfig.Star])
-- local live=Util.GetGameObject(o,"Mask/Live")
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
@ -217,7 +217,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
local starGrid=Util.GetGameObject(o,"StarGrid")
SetCardStars(starGrid,heroConfig.Star)
SetCardStars(starGrid,monsterconfig.Star)
local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text")
name.text=heroConfig.ReadingName
@ -231,7 +231,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
live.transform.localPosition = Vector3.zero
local zs = Util.GetGameObject(o, "zs")
local zsName = GetHeroCardStarZs[heroConfig.Star]
local zsName = GetHeroCardStarZs[monsterconfig.Star]
if zsName == "" then
zs:SetActive(false)
else
@ -239,19 +239,18 @@ function this.SetCardSingleData(o,monsterId, _pos)
zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName)
end
if heroConfig.Star > 9 then
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
end
local effect = Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai")
effect.gameObject:SetActive(monsterconfig.Star > 9)
Util.SetParticleSortLayer(effect.gameObject, sortingOrder + 1)
end
function this:OnClose()
sortingOrder = 0
rewardData = {}
end
function this:OnDestroy()
sortingOrder = 0
this.spLoader:Destroy()
end

View File

@ -500,6 +500,9 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
end
end
end
--因为后端无法区分是否为PVP所以前端处理把PVP伤害加成和减免从伤害加成和减免中去除
heroData.allAddProVal[51] = heroData.allAddProVal[51] - heroData.allAddProVal[69]
heroData.allAddProVal[52] = heroData.allAddProVal[52] - heroData.allAddProVal[70]
heroData.skinId = _msgHeroData.skinId
if heroData.skinId == 0 then

View File

@ -44,25 +44,32 @@ function this.Initialize()
AppConst.SdkChannel = result[5] or ""
this.extData = result[6] or ""
this.p_appId = result[7] or ""
this.SdkSubChannel = result[8]
this.SdkSubChannel = result[8] or ""
AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName()
end
-- 判断是否是注册并登录
if this.isRegister then
this.isRegister = false
-- 触发创建账户的事件
this.TrackCreateAccount()
-- 发送登录成功事件
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,result[1])
else
this.CheckIsRegister(AppConst.OpenId, function(isRegister)
if isRegister then
-- 触发创建账户的事件
this.TrackCreateAccount()
end
-- 判断是否是注册并登录
if this.isRegister then
this.isRegister = false
-- 触发创建账户的事件
this.TrackCreateAccount()
-- 发送登录成功事件
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,result[1])
end)
else
this.CheckIsRegister(AppConst.OpenId, function(isRegister)
if isRegister then
-- 触发创建账户的事件
this.TrackCreateAccount()
end
-- 发送登录成功事件
Game.GlobalEvent:DispatchEvent(GameEvent.LoginSuccess.OnLoginSuccess,result[1])
end)
end
else
local errCode = result[2]
if not errCode then
PopupTipPanel.ShowTip("登录失败")
elseif errCode == "101" then
MsgPanel.ShowOne("根据国家防沉迷相关规定,我们将不再向未成年人提供服务,敬请谅解!")
end
end
end

View File

@ -678,7 +678,7 @@ function this.RefreshBtnCountDown()
if BagManager.GetItemCountById(63)>0 then
--显示免费刷新
this.SetRefreshBtnShowState(true)
this.freeRefreshTime.text=" 0:00:00"
this.freeRefreshTime.text=" "
else
--显示道具刷新
this.SetRefreshBtnShowState(false)

View File

@ -210,6 +210,7 @@ end
--界面打开时调用(用于子类重写)
function MonsterCampNewPanel:OnShow()
this.sortingOrder = self.sortingOrder
this.OnShowPanel()
end
function this.OnShowPanel()
@ -229,7 +230,7 @@ function this.SingleDataShow(go, data)
local singledata = MonsterCampSingleWave:New(go)
go:GetComponent("RectTransform").sizeDelta=Vector2.New(screenwidth,380)
singledata:InitComponent(go,data)
singledata:OnOpen()
singledata:OnOpen(this.sortingOrder)
return singledata
end

View File

@ -194,7 +194,9 @@ function this.HongMengIndication(buffer)
local msg = HeroInfoProto_pb.HongmengInfoIndication()
msg:ParseFromString(data)
if msg.hongmengTabletMax ~= 0 then
local data = ConfigManager.GetConfigData(ConfigName.SpecialConfig,101).Value
local d = string.split(data,"#")
if msg.hongmengTabletMax >= tonumber(d[2]) then
-- body
-- LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax)
HarmonyManager:SetHongMengTowerUpLimit(msg.hongmengTabletMax)

View File

@ -18,19 +18,17 @@ function MonsterCampSingleWave:InitComponent(go,_data)
self.hero = Util.GetGameObject(go,"bg/Hero")
self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
-- self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("Image")
self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
--self.starGrid = Util.GetGameObject(self.hero,"starGrid")
self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
self.effect = Util.GetGameObject(self.hero,"UI_Effect_jinkuang_KaPai")
self.reward = Util.GetGameObject(go,"bg/rewardRect")
self.fight = Util.GetGameObject(go,"bg/fight")
self.pass = Util.GetGameObject(go,"bg/pass"):GetComponent("Image")
-- self.title = Util.GetGameObject(go,"bg/leftLayout/title"):GetComponent("Image")
self.rewardText = Util.GetGameObject(self.reward,"Text"):GetComponent("Text")
self.fightBtnIcon = Util.GetGameObject(self.fight,"layout/icon"):GetComponent("Image")
self.fightBtnNum = Util.GetGameObject(self.fight,"layout/num"):GetComponent("Text")
@ -38,7 +36,7 @@ function MonsterCampSingleWave:InitComponent(go,_data)
self.fightBtnMask = Util.GetGameObject(self.fight,"mask"):GetComponent("Image")
self.bg = Util.GetGameObject(go,"bg"):GetComponent("Image")
self.rewardGrid = Util.GetGameObject(self.reward,"grid")
self.btn=Util.GetGameObject(go,"bg/btn")
self.data = _data
Util.GetGameObject(self.hero, "finishImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("s_silingshilian_yitongguan_zh")
@ -50,8 +48,8 @@ function MonsterCampSingleWave:InitComponent(go,_data)
end
end
function MonsterCampSingleWave:OnOpen()
self:UpdatePrivilage()
function MonsterCampSingleWave:OnOpen(_sortingOrder)
self:UpdatePrivilage()
self.Id.text = ""..self.data.Id..""
self.power.text = self.data.Force
self.bg.sprite = self.spLoader:LoadSprite("s_silingshilian_shiliandi")
@ -66,30 +64,10 @@ function MonsterCampSingleWave:OnOpen()
self.reward.gameObject:SetActive(true)
else
self.reward.gameObject:SetActive(false)
end
end
self.effect.gameObject:SetActive(false)--因为穿透,所以关闭了
Util.SetParticleSortLayer(self.effect.gameObject, _sortingOrder + 1)
-- if self.data.Id < MonsterCampManager.monsterWave then
-- self.fight.gameObject:SetActive(false)
-- self.reward.gameObject:SetActive(false)
-- else
-- self.fight.gameObject:SetActive(true)
-- self.rewardText.text = "挑战奖励"
-- self:SetIcon()
-- self.rewardData = self.data.RewardShow
-- if self.rewardData and #self.rewardData then
-- self:InitShowReward()
-- self.reward.gameObject:SetActive(true)
-- else
-- self.reward.gameObject:SetActive(false)
-- end
-- end
-- Util.AddOnceClick(self.pass.gameObject, function()
-- UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
-- end)
-- Util.AddOnceClick(self.hero, function()
-- UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
-- end)
Util.AddOnceClick(self.btn, function()
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
end)
@ -103,7 +81,7 @@ function MonsterCampSingleWave:OnOpen()
self:UpdatePrivilage()
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
end)
end)
end)
end
if self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡
LogGreen(self.freeTimes..self.buyTimes)
@ -194,7 +172,6 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
self.icon.transform.localPosition = Vector3.zero
self.lv.text = monConfig.Level
self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
--self.icon.sprite = self.spLoader:LoadSprite(heroData.painting)
SetCardStars(self.starGrid,monConfig.Star)
self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
self.name.text = heroData.ReadingName
@ -202,7 +179,6 @@ end
function MonsterCampSingleWave:UpdatePrivilage()
self.storeDataId,self.itemId,self.costNum = MonsterCampManager.MonsterCampGetCost()
-- self.freeTimes,self.buyTimes = MonsterCampManager.GetTimeTip(self.trailData.fourElementType)
self.freeTimes = MonsterCampManager.GetCanBattleCount()
self.buyTimes = MonsterCampManager.GetCanBuyBattleCount()
self:SetIcon()
@ -219,7 +195,6 @@ function MonsterCampSingleWave:SetIcon()
if self.data.Id < MonsterCampManager.monsterWave - 1 then
self.finishImage.gameObject:SetActive(true)
elseif self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡
-- self.rewardText.text = "扫荡奖励"
self.fight.gameObject:SetActive(true)
self.hero.transform.localPosition = Vector3.New(0,3,0)
if self.freeTimes > 0 then
@ -235,8 +210,8 @@ function MonsterCampSingleWave:SetIcon()
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
if self.buyTimes < 1 then
Util.SetGray(self.fight,true)
end
end
end
end
elseif self.data.Id == MonsterCampManager.monsterWave then--挑战
self.fight.gameObject:SetActive(true)
self.hero.transform.localPosition = Vector3.New(0,3,0)

View File

@ -32,9 +32,7 @@ using UnityEngine;
#if UNITY_EDITOR
using UnityEditor;
using UnityEditor.Callbacks;
#endif
#if UNITY_IOS
using UnityEditor.iOS.Xcode;
//using UnityEditor.iOS.Xcode;
#endif
using System.IO;
using ThinkingAnalytics.TaException;
@ -290,42 +288,40 @@ namespace ThinkingAnalytics
[PostProcessBuildAttribute(88)]
public static void onPostProcessBuild(BuildTarget target, string targetPath)
{
#if EDITOR_IOS
if (target != BuildTarget.iOS)
{
Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run");
return;
}
// if (target != BuildTarget.iOS)
// {
// Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run");
// return;
// }
string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj";
// string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj";
UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject();
proj.ReadFromFile(projPath);
#if UNITY_2019_3_OR_NEWER
string targetGuid = proj.GetUnityFrameworkTargetGuid();
#else
string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName());
#endif
// UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject();
// proj.ReadFromFile(projPath);
//#if UNITY_2019_3_OR_NEWER
// string targetGuid = proj.GetUnityFrameworkTargetGuid();
//#else
// string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName());
//#endif
//Build Property
proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO
proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions
// //Build Property
// proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO
// proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions
string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" };
proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths
// string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" };
// proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths
//Add Frameworks
proj.AddFrameworkToProject(targetGuid, "WebKit.framework", true);
proj.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", true);
proj.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", true);
proj.AddFrameworkToProject(targetGuid, "Security.framework", true);
// //Add Frameworks
// proj.AddFrameworkToProject(targetGuid, "WebKit.framework", true);
// proj.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", true);
// proj.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", true);
// proj.AddFrameworkToProject(targetGuid, "Security.framework", true);
//Add Lib
proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk));
proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk));
// //Add Lib
// proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk));
// proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk));
proj.WriteToFile(projPath);
#endif
// proj.WriteToFile(projPath);
}
#endif

View File

@ -419,7 +419,7 @@ PlayerSettings:
m_APIs: 02000000
m_Automatic: 1
- m_BuildTarget: AndroidPlayer
m_APIs: 150000000b00000008000000
m_APIs: 0b0000001500000008000000
m_Automatic: 0
- m_BuildTarget: iOSSupport
m_APIs: 1000000008000000