gaoxin
|
5ab9688089
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 16:46:33 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
gaoxin
|
5a6b83ebe6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Language.lua
|
2020-11-10 10:41:02 +08:00 |
zhangqiang
|
b113f94a6d
|
【幻境达人】 排行奖励显示问题
|
2020-11-07 15:20:44 +08:00 |
zhangqiang
|
98d4b3b024
|
【达人奖励排行】 显示问题修复
|
2020-11-06 17:18:17 +08:00 |
zhangqiang
|
2ed3fc9fc5
|
【达人奖励排行】 显示问题修复
|
2020-11-06 17:19:14 +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 |
zhangqiang
|
ff68e3d0bc
|
【达人排行榜】 达人排行榜底部显示问题
|
2020-11-02 12:55:00 +08:00 |
zhangqiang
|
148b068c79
|
【达人排行榜】 达人排行榜底部显示问题
|
2020-11-02 12:54:36 +08:00 |
jiaoyangna
|
8b86e3e270
|
累计充值修改
|
2020-08-25 13:48:42 +08:00 |
jiaoyangna
|
205340e73a
|
累计充值修改
|
2020-11-04 04:05:20 +08:00 |
jiaoyangna
|
d555d983ea
|
累计充值修改提交, 灵兽提交
|
2020-10-21 16:05:33 +08:00 |
ZhangBiao
|
23f4b9c65d
|
【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
|
2020-10-20 14:59:25 +08:00 |
jiaoyangna
|
2d4ce422da
|
monterr gift patface
|
2020-10-19 21:59:07 +08:00 |
jiaoyangna
|
1d8ac73a44
|
拍脸commit
|
2020-10-19 21:57:56 +08:00 |
ZhangBiao
|
2e57796328
|
礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
|
2020-10-13 19:12:24 +08:00 |
ZhangBiao
|
e063c2c23d
|
推送礼包。。。。
|
2020-10-13 18:39:55 +08:00 |
ZhangBiao
|
63a1588f66
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-13 13:51:11 +08:00 |
zhangqiang
|
2c9d7c7224
|
线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错
|
2020-10-12 14:02:17 +08:00 |
gaoxin
|
285a41ae05
|
修改bug 限时活动itemView报错
|
2020-10-12 11:28:20 +08:00 |
jiaoyangna
|
25d4148059
|
【丹心碧血】限时兑换活动界面黑屏
|
2020-10-12 11:00:31 +08:00 |
zhangqiang
|
cfb6870a31
|
线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3
|
2020-10-10 19:37:50 +08:00 |
zhangqiang
|
d2f9ffd2db
|
线上活动 森罗幻境达人前端显示
|
2020-10-10 14:51:50 +08:00 |
zhangqiang
|
c2677fe193
|
限时升级活动打开后 退出一段时间再返回报错
|
2020-10-10 14:13:30 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
zhangqiang
|
89a7256077
|
线上活动 : 四周活动 天宫达人 问题
|
2020-09-25 09:49:44 +08:00 |
zhangqiang
|
121901c06e
|
线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-23 15:49:48 +08:00 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
ZhangBiao
|
e13026857d
|
限时兑换onhide function增加
|
2020-09-17 09:49:43 +08:00 |
ZhangBiao
|
5cd8e621dc
|
限时活动,限时兑换、礼包抢购增加动效
|
2020-09-16 14:09:31 +08:00 |
ZhangBiao
|
dd4c91a46c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 16:53:23 +08:00 |
ZhangBiao
|
ca65ebbe49
|
限时兑换添加到叱咤风云中
|
2020-09-10 16:53:06 +08:00 |
gaoxin
|
70a575cbb3
|
部分界面不再常驻内存
|
2020-09-10 14:25:02 +08:00 |
gaoxin
|
64f382c54d
|
充值接口修改,sdk和本地走同一套接口
|
2020-09-09 18:47:17 +08:00 |
gaoxin
|
b9481babee
|
部分界面音效添加
|
2020-09-09 13:59:22 +08:00 |
zhangqiang
|
4bcb51e164
|
添加寻宝排行榜 和 巅峰赛赛季更新修改
|
2020-09-09 11:20:29 +08:00 |
zhangqiang
|
bf541ed4b0
|
寻宝达人替换资源
|
2020-09-09 10:36:55 +08:00 |
jiaoyangna
|
53524225f9
|
动画添加提交
|
2020-09-08 10:09:21 +08:00 |
ZhangBiao
|
40266d1120
|
删除一些log、修复升级豪礼红点bug
|
2020-08-31 16:32:27 +08:00 |
ZhangBiao
|
d1e0e6e133
|
升级豪礼红点显示错误修复
|
2020-08-31 14:35:35 +08:00 |
zhangqiang
|
d452d76d05
|
显示活动选中修改 替换出包图片资源
|
2020-08-27 16:54:26 +08:00 |
zhangqiang
|
47a16583ee
|
达人排行点击事件修复
|
2020-08-26 23:07:04 +08:00 |
ZhangBiao
|
d644b64450
|
删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵
|
2020-08-26 15:14:27 +08:00 |
JieLing
|
fcc9a5eb2a
|
修复打开限时活动界面报错的问题
|
2020-08-25 21:55:13 +08:00 |
JieLing
|
5a89f52577
|
充值商品价格改为按配置显示
|
2020-08-25 17:59:34 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
ZhangBiao
|
6f6758bf14
|
元—>$的替换
|
2020-08-25 13:57:21 +08:00 |
jiaoyangna
|
c6ab978e40
|
限时活动里累计充值页面入口修改
|
2020-08-25 12:23:48 +08:00 |
jiaoyangna
|
2d7197298e
|
累计充值修改
|
2020-10-24 19:26:23 +08:00 |
jiaoyangna
|
c134dabe49
|
[累计充值]提交
|
2020-10-24 19:19:03 +08:00 |