xiejun
|
c47462c5d8
|
Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-09-20 18:57:44 +08:00 |
wangzhenxing
|
551579ca39
|
星际显示添加空判断
(cherry picked from commit fd5cd6836c )
|
2023-09-15 18:02:50 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
55f0c6d3e6
|
魂印图鉴修改 ,命石修改
|
2023-09-01 18:04:52 +08:00 |
wangzhenxing
|
2b93776f7c
|
命格修改提交
|
2023-09-01 17:36:15 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +08:00 |
xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
wangzhenxing
|
34834da938
|
心愿法宝开启文字提示修改
|
2023-08-08 17:21:11 +08:00 |
xiejun
|
43d80275b9
|
神将部分UI替换
|
2023-08-04 18:58:14 +08:00 |
wangzhenxing
|
c32b71d3fc
|
变身卡无法升星修改,法宝超过10级显示修改
|
2023-08-02 14:46:18 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
PC-202302260912\Administrator
|
15cce82e7a
|
法宝抽卡添加开启限制
|
2023-07-17 14:27:56 +08:00 |
PC-202302260912\Administrator
|
b5bcce6eab
|
抽卡道具显示修改
|
2023-07-13 17:52:56 +08:00 |
PC-202302260912\Administrator
|
18691fb97e
|
法宝技能信息显示修改
|
2023-07-11 13:48:33 +08:00 |
PC-202302260912\Administrator
|
22122de56a
|
心愿法宝抽卡入口改成开服n天后显示
|
2023-07-10 17:09:33 +08:00 |
PC-202302260912\Administrator
|
8bae77bd5b
|
[法宝]====================法宝特性描述修改
|
2023-07-07 10:27:42 +08:00 |
PC-202302260912\Administrator
|
5838089889
|
七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f )
|
2023-06-28 15:50:22 +08:00 |
wangzhenxing
|
53625b9dc0
|
资源条去除仙晶显示
|
2023-06-08 14:19:46 +08:00 |
wangzhenxing
|
ebfddaad60
|
法宝心愿修改提交
|
2023-06-06 15:57:53 +08:00 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
wangzhenxing
|
ac172339ae
|
心愿抽卡修改提交
|
2023-05-27 19:04:30 +08:00 |
wangzhenxing
|
1f94c3d234
|
变身卡添加职业
|
2023-04-21 13:24:26 +08:00 |
wangzhenxing
|
3f8a00cb14
|
[神兵]==================修改提交
|
2023-04-11 14:41:36 +08:00 |
yuanshuai
|
0b3e5511b2
|
神兵帮助
|
2023-04-07 11:13:15 +08:00 |
yuanshuai
|
a7ccff7ff1
|
神兵功能优化
|
2023-04-06 18:13:54 +08:00 |
yuanshuai
|
31f51cca80
|
神兵红点提交
|
2023-04-04 18:21:14 +08:00 |
wangzhenxing
|
12e2cecaa1
|
神兵属性,神兵羁绊,神兵分解提交
|
2023-04-04 11:15:32 +08:00 |
yuanshuai
|
a176bca619
|
神兵相关修改提交
|
2023-03-31 17:52:12 +08:00 |
wangzhenxing
|
c370823e04
|
神兵常量提交
|
2023-03-24 11:08:03 +08:00 |
wangzhenxing
|
04a84da290
|
多队塔红点提交
|
2023-03-22 14:58:19 +08:00 |
wangzhenxing
|
614ec0b6e1
|
多队塔排行榜显示修改提交
|
2023-03-22 10:45:26 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5 .
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
2985c1f5a2
|
法相装备修改提交
|
2023-02-21 14:20:46 +08:00 |
wangzhenxing
|
d84f374bf2
|
法相修改提交
|
2023-02-19 20:08:48 +08:00 |
yuanshuai
|
c2f2f9255b
|
法相修改提交
|
2023-02-18 15:52:52 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |
wangzhenxing
|
895b577935
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/ConfigData.lua
|
2023-02-16 18:37:01 +08:00 |
wangzhenxing
|
a713a185cf
|
法相常量提交
|
2023-02-16 18:34:04 +08:00 |
yuanshuai
|
d13e485b05
|
神将置换功能提交
|
2023-02-16 18:11:55 +08:00 |
wangzhenxing
|
260db13451
|
超值基金,热榜红点提交
|
2023-01-16 14:37:14 +08:00 |
wangzhenxing
|
b3b95119c0
|
备战界面星级显示修改
|
2023-01-12 16:47:04 +08:00 |
wangzhenxing
|
6a2b5b8b09
|
推荐阵容调整位置 加红点
|
2023-01-10 16:39:58 +08:00 |
shihongyi
|
2f338e29a4
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-12-23 03:30:53 +08:00 |
wangzhenxing
|
286e8c0839
|
我是gm 红点提交
|
2022-12-30 15:08:22 +08:00 |