jiaoyangna
|
18803bfc29
|
东海寻仙提交
|
2022-03-18 13:25:09 +08:00 |
gaoxin
|
81f76cc4dc
|
【限时折扣】主界面按钮资源修改添加特效
|
2022-03-15 13:37:13 +08:00 |
jiaoyangna
|
9de941b911
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-03-10 13:45:32 +08:00 |
jiaoyangna
|
e5dde41cda
|
【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
|
2022-03-10 13:45:12 +08:00 |
张彪
|
b120f5ccd5
|
【主城】修改右侧条状态
|
2022-03-08 14:05:24 +08:00 |
jiaoyangna
|
6b4cf31c3c
|
【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
|
2022-03-02 17:48:52 +08:00 |
jiaoyangna
|
5fcee7571c
|
【ID1011199】
超值返利图标位置调整
|
2022-03-02 15:06:13 +08:00 |
gaoxin
|
be34fccc5c
|
【至尊降世】修复领取前三个奖励后入口消失的问题
|
2022-03-01 18:35:16 +08:00 |
张彪
|
b51c7b7780
|
【战力冲刺】提交
|
2022-02-18 17:02:27 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
张彪
|
d1bb3391ac
|
【超值基金】提交
|
2022-01-24 17:09:55 +08:00 |
jiaoyangna
|
4bd7512ade
|
节日修改提交
|
2022-01-22 16:05:55 +08:00 |
jiaoyangna
|
5cea36a143
|
节日修改提交
|
2022-01-22 11:37:59 +08:00 |
jiaoyangna
|
a544abe9cc
|
众志成城
|
2022-01-19 17:47:07 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
gaoxin
|
dfb04baf75
|
【限时升星】添加可选择的升星有礼活动
|
2022-01-08 18:40:04 +08:00 |
jiaoyangna
|
31147f3c0a
|
Revert "幸运探宝没开不需要隐藏修改"
This reverts commit 7c44812439 .
|
2022-01-07 10:31:02 +08:00 |
jiaoyangna
|
7c44812439
|
幸运探宝没开不需要隐藏修改
|
2022-01-07 10:29:36 +08:00 |
jiaoyangna
|
082fb392d5
|
探索主城异常提交
|
2022-01-07 10:13:14 +08:00 |
jiaoyangna
|
b740f2abb7
|
探索引导提交
|
2022-01-06 18:25:28 +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
|
4133605f55
|
【家园】引导提交
|
2022-01-06 15:28:41 +08:00 |
jiaoyangna
|
c8b604bde4
|
【ID1011007】
【优化】功能开启增加新条件类型
|
2022-01-06 11:30:35 +08:00 |
jiaoyangna
|
6ca1e17d52
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 15:38:02 +08:00 |
ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
ZhangBiao
|
bd2d5ccd50
|
【家园】提交
|
2021-12-30 20:24:59 +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 |
jiaoyangna
|
b46a62c25a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-29 17:11:09 +08:00 |
jiaoyangna
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
jiaoyangna
|
b40bd10a32
|
主城修改提交
|
2021-12-28 15:07:42 +08:00 |
jiaoyangna
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +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 |
jiaoyangna
|
b9a86b402c
|
探索提交
|
2021-12-27 14:53:55 +08:00 |
gaoxin
|
dc431e3f4d
|
【首充收缩框】需要每次登陆后展开,当前是打开主城时展开
|
2021-12-27 12:05:43 +08:00 |
gaoxin
|
89f8af19c4
|
【主城】竖条改为初始打开
|
2021-12-31 01:53:05 +08:00 |
gaoxin
|
9c22dfc990
|
【提审】不再显示充值竖条,也不再触发相关引导
|
2021-12-30 23:28:55 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +08:00 |
gaoxin
|
9a1350e8d3
|
【超值基金】语法错误
|
2021-12-21 18:27:15 +08:00 |
jiaoyangna
|
89fdc69afd
|
添加拍脸提交
|
2021-12-21 17:21:10 +08:00 |
ZhangBiao
|
d189833b3f
|
【超值基金】提交
|
2021-12-21 11:35:56 +08:00 |
jiaoyangna
|
2c2d6a5e56
|
添加竞技试炼提交
|
2021-12-20 22:11:33 +08:00 |
jiaoyangna
|
c6f99b2eab
|
竞技试炼修改提交
|
2021-12-20 22:05:18 +08:00 |