From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/test/java/org/fanli/random/ExtractGift.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/random/ExtractGift.java b/fanli/src/test/java/org/fanli/random/ExtractGift.java
index 5b20b25..81442ee 100644
--- a/fanli/src/test/java/org/fanli/random/ExtractGift.java
+++ b/fanli/src/test/java/org/fanli/random/ExtractGift.java
@@ -40,11 +40,9 @@
System.out.println("maxRange: "+maxRange);
System.out.println("minRange: "+minRange);
- if (probability != 0) {
- if (result > minRange && result <= maxRange) {
- returnobj = obj2;
- break;
- }
+ if (result > minRange && result <= maxRange) {
+ returnobj = obj2;
+ break;
}
}
@@ -53,7 +51,9 @@
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(generateAward()));
+ for (int i =0 ; i<10 ;i ++) {
+ System.out.println(1+ Math.round(Math.random() * (3)));
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0