xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
PC-202302260912\Administrator
|
02a2374c53
|
主城=======洞府,跨服战入口屏蔽,灵兽山位置修改
|
2023-07-12 18:23:39 +08:00 |
wangzhenxing
|
f4aeeacc4d
|
主城屏蔽gm修改器
|
2023-05-29 17:17:24 +08:00 |
wangzhenxing
|
6d3fe931d3
|
[神兵]==============修改提交
|
2023-04-12 11:31:04 +08:00 |
yuanshuai
|
a7ccff7ff1
|
神兵功能优化
|
2023-04-06 18:13:54 +08:00 |
yuanshuai
|
31f51cca80
|
神兵红点提交
|
2023-04-04 18:21:14 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
wangzhenxing
|
d9baf95138
|
主城添加每日好礼
|
2023-01-16 16:33:28 +08:00 |
wangzhenxing
|
260db13451
|
超值基金,热榜红点提交
|
2023-01-16 14:37:14 +08:00 |
wangzhenxing
|
286e8c0839
|
我是gm 红点提交
|
2022-12-30 15:08:22 +08:00 |
yuanshuai
|
22ca5ed37b
|
锻器阁未开启飘字
|
2022-12-23 18:23:15 +08:00 |
wangzhenxing
|
7109e86706
|
英雄热榜提交
|
2022-12-13 16:06:12 +08:00 |
wangzhenxing
|
e1ee0827c0
|
【主城】========鸿蒙阵按钮new状态修改
|
2022-12-06 17:23:35 +08:00 |
wangzhenxing
|
669de51788
|
主城界面修改提交
|
2022-12-06 17:12:03 +08:00 |
wangzhenxing
|
214b316ac9
|
[bt]========主城鸿蒙镇修改提交
|
2022-12-01 14:24:05 +08:00 |
wangzhenxing
|
5c49a471da
|
[gm]====送10万充提交
|
2022-11-28 18:40:45 +08:00 |
yuanshuai
|
4b10be80c9
|
主城神尊名望特权添加特效
|
2022-11-17 14:21:56 +08:00 |
wangzhenxing
|
e7f973409e
|
主城屏蔽天书密卷入口
|
2022-11-14 16:16:50 +08:00 |
yuanshuai
|
551ed6c64f
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-11-10 13:53:01 +08:00 |
yuanshuai
|
83df159d3f
|
神尊红点bug修改
|
2022-11-10 13:52:48 +08:00 |
wangzhenxing
|
d6ada9958a
|
gm购买提示修改
|
2022-11-10 13:45:03 +08:00 |
wangzhenxing
|
3c1e1c389d
|
添加名望特权红点
|
2022-11-08 18:33:09 +08:00 |
wangzhenxing
|
119c186c34
|
[主城]=======按钮修改提交
|
2022-11-08 14:51:51 +08:00 |
yuanshuai
|
45ad268ee8
|
神尊特权 幸运转盘 GM刷冲礼包功能优化
|
2022-11-03 10:57:45 +08:00 |
wangzhenxing
|
1e62991c2c
|
[gm]=====开服冲榜提交
|
2022-10-31 18:13:41 +08:00 |
wangzhenxing
|
8d63d391a6
|
[gm]==============声望特权提交
|
2022-10-20 17:48:00 +08:00 |
wangzhenxing
|
480ae21f30
|
[gm]=====主程界面添加名望入口
|
2022-10-19 15:34:41 +08:00 |
wangzhenxing
|
fdaec2ac28
|
[gm修改器]=====提交
|
2022-09-20 17:04:48 +08:00 |
wangzhenxing
|
db1d64d70f
|
[主城]=====显示神尊按钮
|
2022-09-16 14:07:30 +08:00 |
wangzhenxing
|
3029e1c054
|
[主城]======神尊特权入口屏蔽
|
2022-09-13 18:58:05 +08:00 |
yuanshuai
|
d42106b07e
|
神尊特权提交
|
2022-09-09 18:09:45 +08:00 |
yuanshuai
|
cd0d9bad9e
|
添加八日登陆红点
|
2022-07-21 13:43:03 +08:00 |
wangzhenxing
|
2e85ea786f
|
[探索]========探索入口代码屏蔽
|
2022-06-08 14:25:41 +08:00 |
wangzhenxing
|
dd7a256469
|
[周卡]======红点修改提交
|
2022-06-01 14:50:08 +08:00 |
wangzhenxing
|
6925105782
|
[周卡]======周卡提交
|
2022-06-01 09:34:41 +08:00 |
yuanshuai
|
c9dfe177e6
|
百抽派送活动提交
|
2022-05-17 13:23:15 +08:00 |
yuanshuai
|
4e70fc5113
|
限时活动红点修改
|
2022-04-28 14:26:35 +08:00 |
jiaoyangna
|
c66ce27a88
|
主城特效修改提交
|
2022-03-22 15:43:16 +08:00 |
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 |
ZhangBiao
|
078c3a1f96
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 17:48:20 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
926e0a4fbd
|
【命石】一键合成修改
|
2021-12-23 16:17:35 +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 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +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 |
jiaoyangna
|
b60d319083
|
竞技试炼修改提交
|
2021-12-20 22:03:08 +08:00 |
jiaoyangna
|
a19e1d1b7d
|
返回主城打开竞技试炼
|
2021-12-20 21:59:33 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
jiaoyangna
|
ffd7d0ecbe
|
超值返利修改提交
|
2021-12-17 16:41:08 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
jiaoyangna
|
50927b9ac5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 16:55:46 +08:00 |
jiaoyangna
|
1ae167efb5
|
至尊降世修改提交
|
2021-12-16 16:55:30 +08:00 |