Commit Graph

170 Commits (82dc9fac739a1fd90d38b90559098238fca9a97e)

Author SHA1 Message Date
zhangqiang 3a7ff72e45 【特权商城】 前端加等级限制 有表!!! 2020-11-05 16:44:58 +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
jiaoyangna 0a610313a6 主题活动图片资源修改提交,累计重置红点检测修改提交 2020-10-29 10:12:47 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna 14b7b6f4cf 累计充值修改 2020-11-04 03:51:04 +08:00
jiaoyangna a595c770a1 累计充值修改 2020-11-04 00:57:23 +08:00
jiaoyangna 12967078f0 限时召唤修改提交 2020-11-04 00:15:26 +08:00
jiaoyangna b93bef6237 剔除id为0 的礼包 2020-10-22 11:26:00 +08:00
ZhangBiao 23f4b9c65d 【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
2020-10-20 14:59:25 +08:00
jiaoyangna cae421024a 积天豪礼添加动画 2020-09-25 14:59:05 +08:00
jiaoyangna 2269c50897 【活动需求】百宝商会,免费礼包红点 2020-09-23 16:56:06 +08:00
jiaoyangna e3a34ea941 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 18:38:42 +08:00
ZhangBiao 7e099596d3 限时商市 其珍宝阁 多期机制增加 2020-09-25 16:42:25 +08:00
jiaoyangna a9389ec427 免费礼包修改 2020-09-22 18:38:22 +08:00
zhangqiang 7332783723 音效修改 2020-09-16 10:26:34 +08:00
jiaoyangna f0f744602e 【累计充值】达成页签没红点 2020-09-15 11:21:55 +08:00
ZhangBiao 44f6f55d19 月卡增加动效 2020-09-17 00:09:06 +08:00
ZhangBiao 72601bff4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 23:30:29 +08:00
ZhangBiao 6aebe6f49e 周月卡 点将台动效添加 2020-09-16 23:30:21 +08:00
jiaoyangna 9846aebcf2 图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠 2020-09-14 15:31:33 +08:00
gaoxin bdacc0c703 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 18:47:23 +08:00
jiaoyangna 89f937e9ac 破阵诛仙提交 2020-09-10 18:08:21 +08:00
jiaoyangna e492dc6813 破阵诛仙提交 2020-09-10 15:28:19 +08:00
gaoxin 64f382c54d 充值接口修改,sdk和本地走同一套接口 2020-09-09 18:47:17 +08:00
gaoxin b9481babee 部分界面音效添加 2020-09-09 13:59:22 +08:00
jiaoyangna 18ec0b7b20 限时召唤提交 2020-09-10 10:55:29 +08:00
ZhangBiao f56be71560 主题活动修改 2020-09-08 17:16:08 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
zhangqiang 6b55198f12 周月礼包替图 2020-09-04 18:35:30 +08:00
gaoxin ad2ec00881 成长基金的显隐加入礼包是否存在的判断 2020-08-28 15:29:57 +08:00
gaoxin a7fea145f6 修复日周月礼包不显示的问题 2020-08-27 21:40:01 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
ZhangBiao 42b0ffe95d 月基金价格修改 2020-08-26 18:29:02 +08:00
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +08:00
gaoxin b175890bc3 累充活动金额处理 2020-08-26 11:11:14 +08:00
JieLing fcc9a5eb2a 修复打开限时活动界面报错的问题 2020-08-25 21:55:13 +08:00
JieLing b1774c3853 累充界面金额转换为美元显示 2020-08-25 21:21:34 +08:00
ZhangBiao d37af43f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:35:19 +08:00
ZhangBiao 617cb53270 森罗回春散星星、升级礼包调整 2020-08-25 18:35:04 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
jiaoyangna d1ab290cf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
2020-08-25 16:26:13 +08:00
jiaoyangna 87cc8867c7 宝物 commit 2020-08-25 16:23:41 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao e3b872d31a 元-》$ 2020-08-25 14:37:28 +08:00
ZhangBiao 6f6758bf14 元—>$的替换 2020-08-25 13:57:21 +08:00
JieLing 43a370f5a8 报错提交 2020-10-26 10:56:46 +08:00
jiaoyangna 68af385814 冲突提交 2020-10-29 10:29:14 +08:00
jiaoyangna 6d79dcab9a 活动修改提交 2020-10-29 09:50:47 +08:00