Commit Graph

83 Commits (607104b4caa407a91c769eec050ba4ca4ab0e537)

Author SHA1 Message Date
gaoxin 0b1b24bbc2 【策划】添加灵兽立绘位置调整 2020-12-02 17:07:49 +08:00
gaoxin ef682f80a4 【sdk】添加自定义事件上传接口,并将所有的按钮点击事件上传 2020-11-25 17:09:35 +08:00
gaoxin 1c25e4e21a Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scenes/LogoHwRelease_IOS.unity.meta
#	Assets/LuaFramework/Scenes/LogoHwTest_IOS.unity.meta
#	Assets/LuaFramework/Scripts/Framework/App.cs
#	Assets/LuaFramework/Scripts/Manager/NetworkManager.cs
#	Assets/LuaFramework/Scripts/Network/SocketClient.cs
#	Assets/ManagedResources/Atlas/DemonSlayerAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_banner.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_zi.png.meta
#	Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta
#	Assets/ManagedResources/Audio/UI/common/UI_shaizi.mp3
#	Assets/ManagedResources/DynamicAtlas/ArtFont/g_gonghui_banner.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao1.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao3.png.meta
#	Assets/ManagedResources/DynamicAtlas/Skill/l_ls_11.png.meta
#	Assets/ManagedResources/EffectResSkill.meta
#	Assets/ManagedResources/EffectResUI.meta
#	Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_BaiHu.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_Lanlong.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_QingLong.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer.meta
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/SoundData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua.meta
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-11-04 16:18:35 +08:00
gaoxin a107de4ebe 删除新增的打点事件 2020-10-13 12:44:15 +08:00
gaoxin c3e94843c6 打点事件新增 2020-10-13 11:35:32 +08:00
wangxiaolong 209ba84534 添加冗余代码调用 + 修改私有方法名称 2020-09-16 14:45:10 +08:00
wangxiaolong 46d5904af0 添加冗余代码 2020-09-16 14:43:52 +08:00
gaoxin 17f241564f ios添加获取底部高度的接口 2020-09-10 20:20:19 +08:00
gaoxin c3fc01d249 回滚网络连接修改,废物操作 2020-09-10 19:35:58 +08:00
gaoxin 41aa573c68 再次尝试修复同时连接两个socket的问题 2020-09-10 18:09:30 +08:00
seanlong 3840edc366 优化版本更新流程 2020-09-09 09:47:59 +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 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
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