Commit Graph

178 Commits (0fa7c718ed1957822db629ec5ab93e30fdde7f87)

Author SHA1 Message Date
JLIOSM1 7285c52be1 【IOS】新增打开网页的接口 2021-07-15 23:09:58 +08:00
zhangqiang e4469de1c3 【游心】场景提交 2021-07-14 16:01:05 +08:00
JLIOSM1 63dc0dc0c2 合并zf_test到iOS 2021-07-13 18:55:21 +08:00
JLIOSM1 d94dd117e4 【场景】添加国内正式服打包场景 2021-07-13 18:28:00 +08:00
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
JieLing 9a3c8508c4 Merge branch '0功能/用户协议' into china/quick
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-06-30 09:35:51 +08:00
zhangqiang 35508a2c8d 【太初行渠道quick】场景提交 2021-06-28 15:54:17 +08:00
gaoxin 3b6c4c279f 【打包】quick打包场景提交 2021-06-28 14:21:55 +08:00
zhangqiang 8bc03131ee 【太初行渠道quick】场景提交 2021-06-26 13:52:28 +08:00
gaoxin 5cf66021e2 【打包】quick打包场景提交 2021-06-24 13:47:44 +08:00
ZhangBiao 57426134aa 【Android】登录界面调整 2021-06-24 09:50:55 +08:00
JieLing 7783e0723e 【Android】打开网页功能 2021-06-23 19:39:46 +08:00
gaoxin 7fe73cca9e Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-18 16:04:33 +08:00
gaoxin 74c5cd04c4 【配置】开启高帧率 2021-06-18 11:17:11 +08:00
gaoxin 562b57db73 【场景】新增猕猴桃商务出包场景 2021-06-17 10:59:20 +08:00
JieLing 0f0ba0dfc2 【包配置】灵动正式服数数appid修改 2021-06-10 22:53:46 +08:00
JieLing f25cd6531c 【包配置】灵动包相关参数配置 2021-06-09 15:33:19 +08:00
zhangqiang 4e91eda734 【弥核桃专服场景】 2021-06-09 09:39:37 +08:00
zhangqiang a0526542cf 【猕猴桃专服配置添加】 2021-06-08 21:01:59 +08:00
gaoxin 498bc9a9b5 【称号】显示再优化,老包也能正常显示 2021-06-08 14:06:12 +08:00
gaoxin 1b55441abc 【配置】新增草花渠道相关配置 2021-06-07 16:49:58 +08:00
gaoxin 45351466ed 【log】删除一些无用log 2021-06-03 18:50:58 +08:00
gaoxin 2f0208ec73 【工具】添加c-v2测试包配置 2021-06-03 14:39:36 +08:00
gaoxin 8ec2d60c3f 【粒子特效】缩放接口不再对gameobject进行缩放 2021-06-01 18:08:40 +08:00
gaoxin 6b0ff9668d 【配置】包配置添加 2021-05-31 17:31:31 +08:00
gaoxin 3645d39b93 【场景】添加喜扑入口场景 2021-05-31 15:29:10 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
jiaoyangna 9662b5f236 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
#	Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
2021-05-15 16:37:00 +08:00
jiaoyangna 58b2beb015 文字曲线提交 2021-05-15 15:39:53 +08:00
gaoxin 0f4e90d585 【场景】添加特效制作的场景 2021-05-12 17:18:16 +08:00
gaoxin 3775b6ae86 【网络】消息id打印位置修改 2021-04-27 16:46:02 +08:00
gaoxin 67ddcedfa2 【网络】socket 报错 2021-04-27 16:25:09 +08:00
gaoxin ef856fd534 【网络】当后端推送未注册的indication时,进行错误提示 2021-04-27 16:17:58 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
zhangqiang 6bb5aeefe8 【混淆】工具添加 2021-04-19 21:15:53 +08:00
JLIOSM1 a0b705a841 【ios】接口修改 2021-04-19 10:09:32 +08:00
gaoxin 5105747314 【配置】异步获取配置文件 2021-04-16 15:22:35 +08:00
JLIOSM1 47a6118d81 【adjust】添加创建角色事件 2021-04-10 19:17:41 +08:00
gaoxin 145eb02c06 【策划场景】灵兽战斗中添加名字显示 2021-03-23 15:04:33 +08:00
gaoxin c40b734145 【策划场景】灵兽立绘调整界面添加 2021-03-23 14:42:14 +08:00
JieLing 905e60e306 【场景】测试服场景上传 2021-03-20 22:11:33 +08:00
gaoxin cd87dff0a7 【网络】http请求添加错误lua回调 2021-03-20 15:01:55 +08:00
gaoxin e9968d8517 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
gaoxin 40bfa7c586 【配置】国内相关修改 2021-03-17 17:30:13 +08:00
gaoxin ee6fde0370 【策划场景】修改战斗中立绘的配置方式 2021-03-10 11:53:07 +08:00
gaoxin d3a1cba41c 【管理】包配置管理加入 2021-03-04 19:29:15 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
jiaoyangna ae9c306ee6 字体修改优化提交 2021-03-02 11:40:07 +08:00
jiaoyangna f07c4c3952 字体修改提交 2021-03-01 17:06:03 +08:00
jiaoyangna db9f456676 没有翻译图片显示中文 2021-02-25 15:10:44 +08:00
gaoxin cd4a1e8c89 配置文件结构修改 2021-02-24 13:53:11 +08:00
jiaoyangna f15fa6f1f9 越南语图片提交 2021-02-18 17:21:14 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 1dafda4b44 【热更配置】结构搭建 2021-01-22 14:17:08 +08:00
gaoxin 606b98aadd 【数数】尝试使用数数的设备id 2021-01-20 15:34:33 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
JieLing 6d8b00b5af IOS场景添加 2020-09-21 17:07:04 +08:00
wangxiaolong 385bfdbf20 添加日志输出 2020-09-16 20:45:41 +08:00
JieLing 2ee3e8f2c5 android打包脚本修改提交 2020-09-14 20:04:06 +08:00
gaoxin d05b5d43f1 android p 以上机型屏幕适配添加 2020-09-05 15:21:41 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
JieLing 86feac0023 Merge branch 'master_develop' into master_tishen_hw
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2020-09-04 15:08:23 +08:00
zhangqiang 4d6a9afa63 场景提交 2020-09-04 15:01:59 +08:00
zhangqiang 82b1d2595a Merge branch 'master_develop' into master_tishen_hw 2020-09-04 13:47:12 +08:00
gaoxin 95460eff7e 删除无用log 2020-09-02 10:30:37 +08:00
gaoxin a0535ffc12 lujit添加对64位代码的支持 2020-08-29 15:11:01 +08:00
gaoxin 492a3ebc73 lujit添加对64位代码的支持 2020-08-29 15:10:01 +08:00
JieLing a5b334a47d 海外正式服logo配置 2020-08-28 17:00:20 +08:00
JieLing f9d4330524 提审服配置添加 2020-08-28 16:56:34 +08:00
JieLing 1d34b2f754 Merge branch 'master_develop' into master_tishen_hw 2020-08-28 16:09:57 +08:00
JieLing 6da8bdb3ae 打包配置提交 2020-08-28 16:09:41 +08:00
gaoxin 62eb488628 尝试修复应用退出时会报错的问题 2020-08-28 12:34:19 +08:00
ljsd ad74c26b48 强制转换为int 2020-08-27 20:18:36 +08:00
gaoxin 2e74f05f60 海外工程相关修改 2020-08-27 19:18:31 +08:00
zhangqiang d452d76d05 显示活动选中修改 替换出包图片资源 2020-08-27 16:54:26 +08:00
JieLing 2ef85759a1 无敌盾,眩晕效果添加 2020-08-25 15:49:52 +08:00
zhangqiang f0c1ad1b71 首冲 2020-08-25 15:09:53 +08:00
JieLing 28cc0fde3e 修复sdk事件系统,未初始化数据的问题 2020-08-24 18:01:58 +08:00
gaoxin 74951cedd8 修复登录界面错误,修复战斗背景音乐缺失的问题 2020-08-24 14:35:45 +08:00
gaoxin 4f8026425d sdk添加上传新手数据的接口 2020-08-22 19:14:58 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
gaoxin d256a6da7c 符号错误 2020-08-15 15:21:56 +08:00
gaoxin dc1188b886 修复非Android和Ios版本会报错的问题 2020-08-15 15:20:02 +08:00
jl_ios 7dbd376327 Merge branch '0功能/iOS-sdk' into master_develop 2020-08-15 11:45:59 +08:00
jl_ios e5015da253 添加iossdk接口 2020-08-15 10:13:32 +08:00
JieLing 700f396a6b 资源加密添加,防止使用工具获得资源 2020-08-13 19:30:16 +08:00
jl_ios 14645cb184 iOS 打包修复无法生成luabytes文件的问题 2020-08-12 11:58:12 +08:00
jl_ios 02b7e07d20 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +08:00
gaoxin e79d5ce4db 删除bugl配置 2020-07-30 11:01:41 +08:00
JieLing f5d0cc001c 添加打点数据类型 2020-07-27 16:41:38 +08:00
JieLing 9465fbd6e4 删除bug初始化的位置 2020-07-27 15:31:11 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
gaoxin 1af2ee96f4 修复打点静态数据保存不完全的问题 2020-07-26 18:37:31 +08:00
JieLing cd43d2417f 内网测试 0.16.1 2020-07-25 15:13:59 +08:00
JieLing 2164aacc49 内网包配置修改 2020-07-25 14:52:41 +08:00
JieLing 2899bb433c 猕猴桃 测试服 0.1.1 2020-07-23 21:32:12 +08:00
gaoxin c8c06b9493 判断错误 2020-07-23 21:26:03 +08:00
gaoxin 95cbec95e0 添加包名获取,添加账号创建打点。 2020-07-23 20:04:25 +08:00
gaoxin 6f2a3c1c6c 新出包需求添加,sdk结构修改 2020-07-23 17:16:47 +08:00
JieLing 13fd2b45a5 一些相关配置文件提交 2020-07-22 22:21:18 +08:00