Commit Graph

3172 Commits (58d20c0bd34ea60f6b0d69e70df342e9289d4ac4)

Author SHA1 Message Date
ZhangBiao 58d20c0bd3 【限时活动】没东西有红点 2021-04-07 11:05:26 +08:00
zhangqiang 132e4c1260 【bug】奖励排行拉不到底部 2021-04-07 10:30:47 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
gaoxin d90b9145b8 Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b 2021-04-06 15:24:46 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
gaoxin fc28c2c0a3 Merge branch 'china/dev' into gx/china/dev_tr 2021-04-06 15:21:49 +08:00
gaoxin 08c5c7b423 【本地化】导出文本 2021-04-06 15:21:38 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
zhangqiang 0b85a85e18 【大闹天宫】 间隔阶段重登提示有问题 2021-04-06 15:11:29 +08:00
jiaoyangna 75feb507d1 【ID1008659】
【图鉴优化】图鉴添加排序规则,按照神将由强至弱进行排序
2021-04-06 14:51:26 +08:00
ZhangBiao 119c499da3 【好友】删除后停留在原位 2021-04-06 14:26:47 +08:00
jiaoyangna fd08211e30 主题活动图标修改 2021-04-06 13:52:27 +08:00
jiaoyangna b260d2d583 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 11:52:48 +08:00
jiaoyangna f1a8a740c7 【ID1008091】
【活动优化】超值基金购买后,主城超值基金入口倒计时消失
2021-04-06 11:52:44 +08:00
zhangqiang a9d77de2b2 【十绝阵】未产生宝箱时显示的领取截止时间错误 2021-04-06 11:38:25 +08:00
ZhangBiao 5ab1295c10 【好友】赠送好友友情点,每点一下都会播放动画 2021-04-06 11:17:22 +08:00
zhangqiang 86a99f3344 【无尽副本】一键上阵修改 2021-04-02 21:11:37 +08:00
ZhangBiao 53f095011e 【牛气冲天】特效层级修改
(cherry picked from commit 53308beca2)
(cherry picked from commit 672b5acd10caeca26906c4c9ddfb840fd3b121df)
2021-04-02 19:29:39 +08:00
zhangqiang 855c7159b8 【巅峰赛】尝试修改去掉注释 2021-04-02 16:01:26 +08:00
zhangqiang c45d20f9da 【巅峰赛】尝试修改 2021-04-02 15:47:07 +08:00
zhangqiang 7bea1cf11a 【巅峰赛】尝试修改 2021-04-02 15:42:36 +08:00
wangzhenxing ef374b841a [战斗]======破盾,清除提示文字修改 2021-04-02 15:02:14 +08:00
gaoxin b8c845b6f5 【表删除】BeginnerTask 2021-04-02 14:50:34 +08:00
gaoxin 1de64d1492 【表删除】AdventureReward 2021-04-02 14:49:00 +08:00
gaoxin 28ca69e078 【表删除】AdventureConfig 2021-04-02 14:48:12 +08:00
gaoxin 472829239e 【表删除】AccomplishmentConfig 2021-04-02 14:46:31 +08:00
gaoxin 1dc2b05f04 【表删除】EquipTalismanaRankup 2021-04-02 14:40:02 +08:00
jiaoyangna 57604c4c76 成长礼包提交 2021-04-02 11:41:50 +08:00
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
jiaoyangna c9a3a40acf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 11:25:04 +08:00
jiaoyangna 640c866388 成长礼包 红点修改 2021-04-02 11:24:59 +08:00
ZhangBiao 8cf3c62bbf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:53:49 +08:00
ZhangBiao 2688f37d72 【牛气冲天】增加特效
(cherry picked from commit f8b01c8e8d)
2021-04-02 10:53:29 +08:00
jiaoyangna 223afd4c57 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:45:54 +08:00
jiaoyangna 6de42f5b43 限时兑换红点提交 2021-04-02 10:45:11 +08:00
zhangqiang fc95cfb52c 【巅峰赛 bug】 三局两胜 第三场不刷新bug 3 2021-04-02 09:55:55 +08:00
zhangqiang 881cc1717b 【巅峰赛 bug】 三局两胜 第三场不刷新bug +2 2021-04-02 09:55:32 +08:00
zhangqiang 3d8fd5a748 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 20:26:56 +08:00
zhangqiang e4da98bff6 【bug修改】 2021-04-01 20:26:43 +08:00
ZhangBiao 4927a85f01 【自选宝箱】无特效修改 2021-04-01 20:22:15 +08:00
jiaoyangna 28c8ee841d 每日礼包加锁修改 提交 2021-04-01 19:05:43 +08:00
jiaoyangna c18b59502a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 19:04:13 +08:00
jiaoyangna 053f890498 成长礼包修改提交 2021-04-01 19:04:01 +08:00
zhangqiang abe9d67927 十绝阵奖励】领奖阶段,未被领取的箱子可以查看到奖励 2021-04-01 19:02:47 +08:00
jiaoyangna 8884dd4920 文本导出 2021-04-01 18:54:28 +08:00
jiaoyangna a81c48c533 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
2021-04-01 18:52:58 +08:00
jiaoyangna cff04dc520 签到 修改 2021-04-01 18:50:06 +08:00
gaoxin 68493d2b60 【本地化】还原文本 2021-04-01 18:45:39 +08:00
ZhangBiao 54870cd601 【牛气冲天】动画修改
(cherry picked from commit 6e62ebd50a)
2021-04-01 18:42:52 +08:00