Commit Graph

147 Commits (4c7b379ce78a7db68eb8cccf9d249ffffb20c151)

Author SHA1 Message Date
gaoxin 25c9e3472a 【场景】quick新母包场景创建 2021-11-30 11:23:31 +08:00
gaoxin 2a5c5962e8 【开天专服】打包场景添加 2021-11-16 16:31:12 +08:00
gaoxin da07b59ad8 【蓝鲸商务包场景提交】 2021-11-09 11:52:28 +08:00
gaoxin 20b685f694 Merge branch '0功能/用户隐私协议' into china/dev 2021-10-29 16:50:20 +08:00
gaoxin 30ecb20689 【隐私协议】方法报错优化 2021-10-27 18:21:46 +08:00
gaoxin 2b74430e61 【隐私协议】修改隐私协议的配置方式,查看协议的连接由GM协议配置的母包配置 2021-10-27 16:22:24 +08:00
gaoxin 7822274c0c 【出包场景】新增游心的第二个包的出包场景 2021-10-21 13:48:43 +08:00
gaoxin 5d0d24066a 【数数】关闭崩溃上报事件 2021-09-22 18:03:07 +08:00
gaoxin f1dc1dd49a 【sdk】修改获取channel时返回的默认值 2021-09-02 13:43:58 +08:00
gaoxin 6d2253347a 【icon】添加新的出包ICon 2021-08-31 15:42:25 +08:00
gaoxin 2da3f4b8e5 【Logo】删除SDKConfig 2021-08-30 15:35:14 +08:00
gaoxin 3a8fac4f87 【修复数数SDK升级导致本地报错】 2021-08-30 12:29:13 +08:00
gaoxin a6e93212d0 【数数】修改部分数据到进入游戏时上报 2021-08-25 19:38:49 +08:00
gaoxin fe43c56647 【出包场景】所有线上包关闭日志打印 2021-08-24 17:29:19 +08:00
gaoxin a8e7641ca7 【网络通信】当后端发送未监听的推送消息也要回复 2021-08-02 15:56:28 +08:00
jiaoyangna 4d8bf852d4 Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
2021-07-19 14:10:11 +08:00
jiaoyangna 01b3f79c43 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40 2021-07-19 14:09:40 +08:00
zhangqiang baf39fc1a3 【动游】场景 2021-07-19 11:02:25 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
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