zhangqiang
|
855c7159b8
|
【巅峰赛】尝试修改去掉注释
|
2021-04-02 16:01:26 +08:00 |
zhangqiang
|
a73924a275
|
【称号坐骑时装】取消注释
|
2021-04-02 15:47:40 +08:00 |
zhangqiang
|
c45d20f9da
|
【巅峰赛】尝试修改
|
2021-04-02 15:47:07 +08:00 |
zhangqiang
|
7bea1cf11a
|
【巅峰赛】尝试修改
|
2021-04-02 15:42:36 +08:00 |
gaoxin
|
528f2cdc51
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-02 15:12:59 +08:00 |
gaoxin
|
53912b5384
|
【屏幕适配】CanvasScaler添加到config
|
2021-04-02 15:12:39 +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
|
db5a0557ea
|
签到界面宝箱弹出框修改
|
2021-04-02 14:04:21 +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 |
ZhangBiao
|
26b1480da9
|
【牛气冲天】奖励图标大小修改
(cherry picked from commit 02d431c4f6)
(cherry picked from commit cd40a6172dbdd86439ba395d791fbba796c5e8e9)
|
2021-04-02 10:15:21 +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 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
wangzhenxing
|
acfe38c973
|
[战斗]==========被动263 被动168修改
|
2021-04-01 17:11:54 +08:00 |
zhangqiang
|
2497735700
|
【关卡】在25级关卡和27级关卡,卡等级的时候,“挑战关卡”按钮是置灰的
|
2021-04-01 16:21:35 +08:00 |
jiaoyangna
|
0e752b76a6
|
每日礼包 换天自动刷新修改
|
2021-04-01 16:12:20 +08:00 |
jiaoyangna
|
a71f489265
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 15:43:20 +08:00 |
gaoxin
|
335d2cb7ec
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 15:43:00 +08:00 |
jiaoyangna
|
b21ed5a44e
|
礼包修改提交
|
2021-04-01 15:42:59 +08:00 |
gaoxin
|
4cfda03826
|
【音频】音效更新
|
2021-04-01 15:26:36 +08:00 |
jiaoyangna
|
b663c351b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 14:56:50 +08:00 |
jiaoyangna
|
ae17483a8e
|
灵兽 修改提交
|
2021-04-01 14:56:47 +08:00 |
zhangqiang
|
1d4c446c33
|
【大闹天宫】复活节点无法复活助战神将
|
2021-04-01 14:46:07 +08:00 |
zhangqiang
|
aa17c175b7
|
【无尽副本】阵亡神将可以一键上阵
|
2021-04-01 14:05:21 +08:00 |
jiaoyangna
|
a6428eaaed
|
红点 修改提交
|
2021-04-01 13:44:05 +08:00 |
jiaoyangna
|
9bfd85bb0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 12:30:59 +08:00 |
jiaoyangna
|
c70343585a
|
主题活动 修改
|
2021-04-01 12:30:37 +08:00 |
zhangqiang
|
a20dc99f99
|
【大闹天宫】挑战失败后显示两个可挑战图标,点击另一个未挑战过的怪没反应,退出重进显示正常
|
2021-04-01 10:39:03 +08:00 |
zhangqiang
|
264a682b4b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 22:40:35 +08:00 |
zhangqiang
|
872b779aff
|
【日常任务】日常任务活跃奖励 点的过快第二个宝箱就会没反应
|
2021-03-31 22:40:07 +08:00 |
gaoxin
|
01aacccfaf
|
【红点】修复方法名错误
|
2021-03-31 22:31:36 +08:00 |
zhangqiang
|
987179041c
|
【创建名字】boy
|
2021-03-31 22:25:54 +08:00 |
jiaoyangna
|
784ace13b5
|
红点提交
|
2021-03-31 22:22:53 +08:00 |
zhangqiang
|
e05a69f3a4
|
【福利保箱】
|
2021-03-31 21:51:14 +08:00 |
jiaoyangna
|
618e3a5014
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 21:46:18 +08:00 |
jiaoyangna
|
7d055c4e3a
|
红点提交
|
2021-03-31 21:46:14 +08:00 |
zhangqiang
|
957aff00a5
|
【放生灵兽白片】
|
2021-03-31 21:19:56 +08:00 |
jiaoyangna
|
56605c0ab7
|
购买特权 刷新礼包 修改
|
2021-03-31 19:56:31 +08:00 |
jiaoyangna
|
02fde882a8
|
妖晶不足跳转修改
|
2021-03-31 19:33:12 +08:00 |
jiaoyangna
|
85c09e3094
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:30:56 +08:00 |
jiaoyangna
|
104f52f61b
|
特权礼包滑动位置 修改
|
2021-03-31 19:30:45 +08:00 |
zhangqiang
|
4698fc6dbf
|
【福利签到】bug
|
2021-03-31 19:26:44 +08:00 |
jiaoyangna
|
61426fba07
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:08:04 +08:00 |
jiaoyangna
|
e73cf4533b
|
报错修改
|
2021-03-31 19:07:50 +08:00 |
gaoxin
|
5f16021a0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:06:34 +08:00 |
gaoxin
|
9c080a0cac
|
【激素探索】按钮扫光光效修改
|
2021-03-31 19:06:16 +08:00 |
ZhangBiao
|
762e257982
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:57:43 +08:00 |
ZhangBiao
|
87863f89f8
|
【适配】巅峰赛对战纪录
|
2021-03-31 18:57:31 +08:00 |
jiaoyangna
|
c16ac5d054
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:54:56 +08:00 |
ZhangBiao
|
5dc50c34da
|
【适配】天枢密卷 鸿蒙阵
|
2021-03-31 18:54:01 +08:00 |
jiaoyangna
|
292515e12e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:41:47 +08:00 |
ZhangBiao
|
2204717b5a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:40:34 +08:00 |
ZhangBiao
|
c521889e83
|
【适配】达人活动 逍遥游
|
2021-03-31 18:40:22 +08:00 |
jiaoyangna
|
4365e8afff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:39:02 +08:00 |
jiaoyangna
|
f8245898b0
|
特权礼包修改提交
|
2021-03-31 18:38:57 +08:00 |
zhangqiang
|
c2df1a807b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:29:00 +08:00 |
zhangqiang
|
d131bdbadd
|
【适配】
|
2021-03-31 18:28:46 +08:00 |
jiaoyangna
|
5574c4bdac
|
灵兽特权 显示光效修改
|
2021-03-31 18:02:37 +08:00 |
jiaoyangna
|
0c43f05161
|
灵兽秘卷修改
|
2021-03-31 18:00:44 +08:00 |
ZhangBiao
|
9b533a698b
|
【适配】
|
2021-03-31 17:55:47 +08:00 |
jiaoyangna
|
39b457f544
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:55:39 +08:00 |
jiaoyangna
|
29d8059755
|
特效修改
|
2021-03-31 17:55:33 +08:00 |
ZhangBiao
|
c280b85426
|
【适配】
|
2021-03-31 17:49:06 +08:00 |
zhangqiang
|
60353d6dbd
|
【归元优化】bug
|
2021-03-31 17:40:51 +08:00 |
ZhangBiao
|
e3d9b0b140
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:30:26 +08:00 |
ZhangBiao
|
afb3bb7cf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:30:07 +08:00 |
zhangqiang
|
c6425d9fe9
|
【称号坐骑时装】三界降魔
|
2021-03-31 17:30:05 +08:00 |
ZhangBiao
|
ab7d045495
|
【适配】法宝 竞技场
|
2021-03-31 17:29:51 +08:00 |
jiaoyangna
|
d5c743e302
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:25:16 +08:00 |
jiaoyangna
|
c8dd5845ac
|
成长礼包修改提交
|
2021-03-31 17:25:11 +08:00 |
ZhangBiao
|
d970a91c95
|
【三界除魔】入口消失修复
(cherry picked from commit 31f1354b19)
|
2021-03-31 17:01:50 +08:00 |
zhangqiang
|
319ba45193
|
【称号坐骑时装】修改
|
2021-03-31 16:45:55 +08:00 |
zhangqiang
|
399c79391d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 16:18:44 +08:00 |
zhangqiang
|
4b7bed573c
|
【称号坐骑时装】小人立绘替换
|
2021-03-31 16:18:31 +08:00 |
JieLing
|
2c69a55939
|
【配置】保存一个luabytes文件防止buildconfig中luabytes文件丢失
|
2021-03-31 16:17:08 +08:00 |
jiaoyangna
|
14e2e0dd2a
|
挑战特权商店特效显示
|
2021-03-31 16:09:15 +08:00 |
zhangqiang
|
7102efae35
|
【车迟斗法】当前排名奖励箱子和奖励列表箱子内容不一样
|
2021-03-31 15:58:47 +08:00 |
zhangqiang
|
c5a233df09
|
【称号坐骑时装】逍遥游
|
2021-03-31 15:39:40 +08:00 |
jiaoyangna
|
c029a643ec
|
超值基金文字错乱修改
|
2021-03-31 15:24:05 +08:00 |
zhangqiang
|
5d407765a2
|
【适配】森罗幻境
|
2021-03-31 15:06:41 +08:00 |
jiaoyangna
|
ce617c94be
|
累计充值修改提交
|
2021-03-31 14:50:11 +08:00 |
jiaoyangna
|
fbe2dc4769
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:43:11 +08:00 |
jiaoyangna
|
2fa125f70e
|
特权礼包特效修改
|
2021-03-31 14:43:08 +08:00 |
ZhangBiao
|
5142db7d00
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:33:11 +08:00 |
ZhangBiao
|
c287216995
|
【适配】限时神装
|
2021-03-31 14:33:01 +08:00 |
gaoxin
|
50fcc0e03b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:29:26 +08:00 |
gaoxin
|
35ed5c2854
|
【挂机】修复关卡未解锁时按钮状态显示错误的问题
|
2021-03-31 14:28:57 +08:00 |
jiaoyangna
|
6af6f89c18
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:25:47 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
gaoxin
|
ce91bc1ee8
|
【音频】新增音频资源导入
|
2021-03-31 14:09:52 +08:00 |
gaoxin
|
b8c2935b96
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:06:22 +08:00 |
gaoxin
|
00cb202049
|
【屏幕适配】修复1080*1920报错
|
2021-03-31 14:06:11 +08:00 |
zhangqiang
|
2bfccba248
|
【适配】魂印分解...
|
2021-03-31 14:03:18 +08:00 |
ZhangBiao
|
94714c1ce4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 13:32:44 +08:00 |
ZhangBiao
|
beee0ed0b3
|
【适配】无尽副本
|
2021-03-31 13:32:23 +08:00 |
gaoxin
|
1daabfd2e0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 12:07:30 +08:00 |
gaoxin
|
041d00baa7
|
【屏幕适配】宽屏适配方案修改(需要换包)
|
2021-03-31 12:07:06 +08:00 |
zhangqiang
|
3b7b310c8b
|
【适配】
|
2021-03-31 12:00:55 +08:00 |
jiaoyangna
|
4095d2e67e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:55:27 +08:00 |
jiaoyangna
|
9350e899f9
|
特权礼包倒计时修改提交
|
2021-03-31 11:55:16 +08:00 |
zhangqiang
|
7da79393e5
|
【适配】
|
2021-03-31 11:51:27 +08:00 |
gaoxin
|
64ca85735c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:40:09 +08:00 |
jiaoyangna
|
c2f1f923ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:27:09 +08:00 |
jiaoyangna
|
8c87d221fb
|
活动 动态加载改名
|
2021-03-31 11:26:55 +08:00 |
gaoxin
|
2ea4d35ab9
|
【屏幕适配】vip界面适配修改
|
2021-03-31 11:23:26 +08:00 |
zhangqiang
|
d2ab50c096
|
【特权优化】公会漏提
|
2021-03-31 11:20:45 +08:00 |
zhangqiang
|
04543dd9bb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:06:01 +08:00 |
zhangqiang
|
9806a56460
|
修改提交
|
2021-03-31 11:05:20 +08:00 |
ZhangBiao
|
116ab83a04
|
【福星高照】适配
|
2021-03-31 10:45:36 +08:00 |
ZhangBiao
|
18dc0e7d0f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 10:37:50 +08:00 |
ZhangBiao
|
210a2069a5
|
【福星高照】拍脸修改
|
2021-03-31 10:28:48 +08:00 |
jiaoyangna
|
d3adb8d753
|
冲突提交
|
2021-03-31 10:24:06 +08:00 |
jiaoyangna
|
0cb75f9128
|
逍遥游图片提交
|
2021-03-31 10:21:57 +08:00 |
zhangqiang
|
81c7353e3e
|
【特权优化】vip漏提
|
2021-03-31 10:17:36 +08:00 |
zhangqiang
|
4c7bd53d20
|
【称号坐骑时装】战力向后的发送请求
|
2021-03-31 10:16:52 +08:00 |
jiaoyangna
|
f30b4ea7eb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:59:05 +08:00 |
jiaoyangna
|
965f9c19e9
|
特权添加时间
|
2021-03-30 22:59:01 +08:00 |
ZhangBiao
|
6a89c381f1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:42:30 +08:00 |
ZhangBiao
|
afcfa71db7
|
【福星高照】不关闭修复
|
2021-03-30 22:42:17 +08:00 |
zhangqiang
|
8bff7d2ab9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:37:57 +08:00 |
zhangqiang
|
d9e3aa939d
|
【称号坐骑时装】
|
2021-03-30 22:37:45 +08:00 |
jiaoyangna
|
dea7c12ded
|
层级报错 修改
|
2021-03-30 22:36:31 +08:00 |
jiaoyangna
|
3684b8fec1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:29:07 +08:00 |
jiaoyangna
|
e9803f2760
|
文字错乱修改
|
2021-03-30 22:28:56 +08:00 |
zhangqiang
|
0370fb5610
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:22:13 +08:00 |