Compare commits

...

2 Commits

Author SHA1 Message Date
zhangjiannan 56f61f5cd2 Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	ProjectSettings/ProjectSettings.asset
2024-10-12 10:25:49 +08:00
zhangjiannan 0d0dce2633 1 2024-10-12 10:22:16 +08:00
4 changed files with 24 additions and 11 deletions

View File

@ -1,12 +1,25 @@
{
"Setting":{
"ServerVersion":{"desc":"", "versionCode":"1", "isActive":"1", "value":"0"},
"ThinkAnalysis_GetDeviceID":{"desc":"", "versionCode":"1", "isActive":"1"},
"LayoutBuilderWrap":{"desc":"", "versionCode":"1", "isActive":"1"},
"LanguagePackager":{"desc":"", "versionCode":"0", "isActive":"1"},
"UI_Layout_CanvasScaler":{"desc":"", "versionCode":"2", "isActive":"0"},
"IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"},
"LanguagePackager":{"desc":"", "versionCode":"1", "isActive":"1"},
"PACKAGE_CC_CODE":{"desc":"", "value":"4001", "versionCode":"1", "isActive":"1"},
"ServerVersion":{"desc":"", "value":"0", "versionCode":"1", "isActive":"1"},
"ThinkAnalysis_GetDeviceID":{"desc":"", "versionCode":"1", "isActive":"1"},
"LayoutBuilderWrap":{"desc":"", "versionCode":"1", "isActive":"1"},
"NOTICE_CHANNEL":{"desc":"", "value":"40001", "versionCode":"1", "isActive":"1"},
"IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1","value":"1"},
"IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"0"},
"UPDATE_PANEL_BG":{"desc":"","versionCode":"1","isActive":"1","value":"loading7"},
"IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"},
"IS_SHOW_HEALTH_TIP":{"desc":"", "versionCode":"1", "isActive":"1"},
"SPRITE_LOADER":{"desc":"", "versionCode":"0", "isActive":"1"},
"SPRITE_LOADER":{"desc":"", "versionCode":"1", "isActive":"1"},
"UI_Layout_CanvasScaler":{"desc":"", "versionCode":"1", "isActive":"1"},
"PACKAGE_CONFIG":{"desc":"", "versionCode":"1", "isActive":"1","value":"ZF"},
"IS_LOAD_STREAMING":{"desc":"", "versionCode":"1", "isActive":"1"},
"CURVED_TEXT_CODE":{"desc":"", "versionCode":"1", "isActive":"1"},
"IS_NO_TALKING":{"desc":"", "versionCode":"1", "isActive":"0"},
"IS_SELECT_RESLUTION":{"desc":"","versionCode":"1","isActive":"1"},
"INNER_WEB_CONTROL":{"desc":"","versionCode":"1","isActive":"1"},
"IS_NULL":{"desc":"","versionCode":"5","isActive":"1"},
"USER_PROTO":{"desc":"", "versionCode":"1", "isActive":"1"}
}
}

View File

@ -1 +1 @@
{"EncyptKey":"", "packageVersion":"1", "buglyId":"261348dcd3", "resUrl":"http://10.2.1.12/jieling_dl/dev/assetBundles/mht_china/local/", "channel":"pc", "version":"0.1.22", "subChannel":"2000", "serverUrl":"http://154.8.193.157:8080/"}
{"EncyptKey":"", "packageVersion":"0.1", "buglyId":"261348dcd3", "resUrl":"http://10.2.1.12/jieling_dl/dev/assetBundles/mht_china/local/", "channel":"pc", "version":"0.1.22", "subChannel":"2000", "serverUrl":"http://154.8.193.157:8080/"}

View File

@ -278,5 +278,5 @@ MonoBehaviour:
isUpdate: 0
isSDK: 0
isSDKLogin: 0
isGuide: 1
isGuide: 0
isOpenGM: 1

View File

@ -76,8 +76,8 @@ Material:
- _SrcBlend: 1
- _Trans: 10
- _UVSec: 0
- _X: 0.5
- _Y: 0.5
- _X: 0.5083333
- _Y: 0.63125
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}