wangzhenxing
|
09b57fd635
|
【疯体iOS】=====添加按钮
|
2022-07-15 16:00:33 +08:00 |
yuanshuai
|
92b971ad82
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-07-11 15:43:11 +08:00 |
yuanshuai
|
d952b9a44c
|
数字游戏模块提交
|
2022-07-11 15:43:04 +08:00 |
wangzhenxing
|
47f407fad6
|
[跳转]======添加跳转108类型
|
2022-07-11 15:21:28 +08:00 |
wangzhenxing
|
91bf4423f9
|
[主程排行榜]======排行榜红点,列表显示修改
|
2022-06-20 15:14:35 +08:00 |
wangzhenxing
|
1cc17d4e4b
|
[装备合成]=======装备详情显示修改
|
2022-06-14 17:32:32 +08:00 |
wangzhenxing
|
5d41ecc114
|
【装备】======添加蓝白装备
|
2022-06-14 15:58:18 +08:00 |
wangzhenxing
|
ee3fecc198
|
[主题活动累充有礼]=====红点修改
|
2022-06-09 15:51:44 +08:00 |
wangzhenxing
|
e7df09c284
|
[寻仙招募]======修改提交
|
2022-05-23 11:29:10 +08:00 |
wangzhenxing
|
3b4e771d16
|
[神将信息展示]======神将信息修改
|
2022-05-19 16:38:52 +08:00 |
yuanshuai
|
d39933b48d
|
红点提交
|
2022-05-18 20:06:18 +08:00 |
yuanshuai
|
9c9018b1da
|
终身卡功能提交
|
2022-05-18 19:39:19 +08:00 |
wangzhenxing
|
8eec6cb793
|
【关卡排行】=====关卡界面关卡排行榜修改
|
2022-05-18 13:48:03 +08:00 |
wangzhenxing
|
05b20af01f
|
[排行榜]=======主界面排行榜显示修改
|
2022-05-17 17:46:39 +08:00 |
wangzhenxing
|
a6f1b4b53f
|
【神印】=====圆圈品质框i修改
|
2022-05-06 22:28:25 +08:00 |
yuanshuai
|
9e0e197a2b
|
商店代币页签红点修改
|
2022-04-28 17:12:25 +08:00 |
yuanshuai
|
4e70fc5113
|
限时活动红点修改
|
2022-04-28 14:26:35 +08:00 |
yuanshuai
|
d1111be7eb
|
化身卡升级升星红点提交
|
2022-04-27 18:08:55 +08:00 |
yuanshuai
|
bce1445a77
|
神印商店红点添加
|
2022-04-26 19:08:26 +08:00 |
wangzhenxing
|
81122369c6
|
bug修改提交
|
2022-04-26 16:09:21 +08:00 |
yuanshuai
|
8a7c4160f0
|
背包页签修改
|
2022-04-26 11:56:20 +08:00 |
yuanshuai
|
f0cb395539
|
背包页签修改
|
2022-04-26 11:45:13 +08:00 |
yuanshuai
|
55833325bf
|
跨服相关修改
|
2022-04-25 17:57:31 +08:00 |
yuanshuai
|
4e5ccff820
|
身外化身界面调整
|
2022-04-25 14:42:17 +08:00 |
wangzhenxing
|
3678f78c75
|
神印币添加跳转
|
2022-04-24 21:26:32 +08:00 |
wangzhenxing
|
e498661919
|
神印添加背包分解
|
2022-04-24 16:36:27 +08:00 |
wangzhenxing
|
7cdf302e90
|
神印修改提交
|
2022-04-24 14:20:11 +08:00 |
yuanshuai
|
c3919b7e82
|
变身卡强化相关代码提交
|
2022-04-22 18:24:33 +08:00 |
wangzhenxing
|
f49bb38f8f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-20 16:20:41 +08:00 |
wangzhenxing
|
3021107155
|
globaldefine提交
|
2022-04-20 16:20:24 +08:00 |
yuanshuai
|
50683260c7
|
挑战副本红点提交
|
2022-04-20 13:23:08 +08:00 |
wangzhenxing
|
0cad07009a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-19 17:24:53 +08:00 |
wangzhenxing
|
53e7c44e2a
|
[战斗]=======战斗提交
|
2022-04-19 17:23:37 +08:00 |
yuanshuai
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
wangzhenxing
|
f442f6df70
|
globaldefine提交
|
2022-04-06 13:56:39 +08:00 |
jiaoyangna
|
7a1ccac3cd
|
【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
|
2022-04-02 14:45:12 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
jiaoyangna
|
5348a49256
|
Revert "冲突提交"
This reverts commit b5a29c9152 .
|
2022-03-22 11:06:54 +08:00 |
jiaoyangna
|
c93b9e3f04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 18:29:21 +08:00 |
jiaoyangna
|
b5a29c9152
|
冲突提交
|
2022-03-21 18:29:03 +08:00 |
wangzhenxing
|
def9ca5701
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-21 17:38:57 +08:00 |
wangzhenxing
|
47a9fc98e3
|
globaldefine常量提交
|
2022-03-21 17:38:27 +08:00 |
jiaoyangna
|
18803bfc29
|
东海寻仙提交
|
2022-03-18 13:25:09 +08:00 |
jiaoyangna
|
31b1721510
|
探索提交
|
2022-03-17 15:21:08 +08:00 |
gaoxin
|
de178b9875
|
【锻器阁】未解锁的功能显示未解锁提示
|
2022-03-11 16:36:47 +08:00 |
张彪
|
4d97370a24
|
【车迟斗法】跨服
|
2022-03-03 16:52:08 +08:00 |
张彪
|
51196cf150
|
【灵兽宝阁】新增几档灵兽特惠礼包界面提交
|
2022-02-18 15:14:25 +08:00 |
张彪
|
7083b34f51
|
【战力冲刺】提交
|
2022-02-18 14:05:59 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
jiaoyangna
|
7e62f47ca8
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 11:26:34 +08:00 |
张彪
|
d1bb3391ac
|
【超值基金】提交
|
2022-01-24 17:09:55 +08:00 |
jiaoyangna
|
90c21e5a73
|
协议提交
|
2022-01-20 16:17:26 +08:00 |
jiaoyangna
|
1c24a85612
|
添加红点
|
2022-01-20 11:22:39 +08:00 |
jiaoyangna
|
a797e80b39
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-19 17:47:28 +08:00 |
jiaoyangna
|
a544abe9cc
|
众志成城
|
2022-01-19 17:47:07 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
ZhangBiao
|
4e00c5e9c3
|
【名望礼包】红点
|
2022-01-17 14:10:08 +08:00 |
wangzhenxing
|
3311a00b91
|
【飞升】=======globadefine修改
|
2022-01-15 13:25:48 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
jiaoyangna
|
0323c50be5
|
法宝角标修改
|
2022-01-14 11:31:33 +08:00 |
jiaoyangna
|
e4ea506ed1
|
神将情报修改提交
|
2022-01-14 10:17:19 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
gaoxin
|
0ee930c550
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:01:01 +08:00 |
gaoxin
|
5d2838554d
|
Merge branch '0活动/新大圣升星' into china/dev
|
2022-01-14 14:00:20 +08:00 |
jiaoyangna
|
041f21d530
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 12:02:20 +08:00 |
ZhangBiao
|
f94e79b6e2
|
【百宝商会】新增跳转
|
2022-01-11 11:29:43 +08:00 |
jiaoyangna
|
40e37473dc
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 11:09:44 +08:00 |
gaoxin
|
ee60ae6c9a
|
【限时升星】显示优化,红点添加,条件屏蔽添加
|
2022-01-10 11:44:39 +08:00 |
gaoxin
|
dfb04baf75
|
【限时升星】添加可选择的升星有礼活动
|
2022-01-08 18:40:04 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# 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/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
ZhangBiao
|
499e1d2d49
|
【家园】界面微调
|
2022-01-06 10:56:59 +08:00 |
ZhangBiao
|
893e33d920
|
【家园】提交
|
2022-01-06 10:33:08 +08:00 |
ZhangBiao
|
b45f74781c
|
【家园】提交
|
2022-01-05 17:06:34 +08:00 |
jiaoyangna
|
6ca1e17d52
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 15:38:02 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
gaoxin
|
c07ba438a0
|
【职业筛选】颜色修改
|
2022-01-04 14:07:15 +08:00 |
gaoxin
|
9b2057bede
|
【山河筛选】添加职业呼吸效果
|
2022-01-03 02:17:03 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
ZhangBiao
|
bd2d5ccd50
|
【家园】提交
|
2021-12-30 20:24:59 +08:00 |
jiaoyangna
|
80263f61f0
|
探索优化提交
|
2021-12-30 13:50:39 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
ZhangBiao
|
44aa663ab0
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-30 11:24:38 +08:00 |
ZhangBiao
|
630d56c810
|
【家园】装备强化升级
|
2021-12-29 20:17:45 +08:00 |
jiaoyangna
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
ZhangBiao
|
a1301a4a22
|
【家园】任务
|
2021-12-29 14:03:16 +08:00 |
jiaoyangna
|
978689d9a7
|
探索提交
|
2021-12-28 17:52:28 +08:00 |
wangzhenxing
|
73d92664de
|
[飞升]=======飞升逻辑提交
|
2021-12-28 16:20:07 +08:00 |
jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.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/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
wangzhenxing
|
380b0bdb78
|
[飞升]=============飞升代码提交
|
2021-12-27 16:39:38 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
ZhangBiao
|
078c3a1f96
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 17:48:20 +08:00 |